make NQuadsParserTest pass, including always having an rdfHandler, ignoring column numbers as they are not supported, removing test for relative URL as it is not in the NQuads specification, and fixing blank node identifiers that start with a number, when the specification says they must start with a letter
Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/0b695957 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/0b695957 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/0b695957 Branch: refs/heads/ANY23-141 Commit: 0b695957607c225d505e2b0ecee7914281396d3d Parents: 34cee60 Author: Peter Ansell <[email protected]> Authored: Wed Oct 24 14:17:39 2012 +1000 Committer: Peter Ansell <[email protected]> Committed: Fri Apr 19 13:35:47 2013 +1000 ---------------------------------------------------------------------- .../apache/any23/io/nquads/NQuadsParserTest.java | 60 +++++---------- 1 files changed, 18 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/0b695957/nquads/src/test/java/org/apache/any23/io/nquads/NQuadsParserTest.java ---------------------------------------------------------------------- diff --git a/nquads/src/test/java/org/apache/any23/io/nquads/NQuadsParserTest.java b/nquads/src/test/java/org/apache/any23/io/nquads/NQuadsParserTest.java index 5a71544..1e7d545 100644 --- a/nquads/src/test/java/org/apache/any23/io/nquads/NQuadsParserTest.java +++ b/nquads/src/test/java/org/apache/any23/io/nquads/NQuadsParserTest.java @@ -56,9 +56,13 @@ public class NQuadsParserTest { private NQuadsParser parser; + private TestRDFHandler rdfHandler; + @Before public void setUp() { parser = new NQuadsParser(); + rdfHandler = new TestRDFHandler(); + parser.setRDFHandler(rdfHandler); parser.setVerifyData(true); parser.setDatatypeHandling(RDFParser.DatatypeHandling.VERIFY); parser.setStopAtFirstError(true); @@ -95,8 +99,6 @@ public class NQuadsParserTest { " \n\n\n# This is a comment\n\n#this is another comment." .getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); Assert.assertEquals(rdfHandler.getStatements().size(), 0); } @@ -111,11 +113,9 @@ public class NQuadsParserTest { @Test public void testParseBasic() throws RDFHandlerException, IOException, RDFParseException { final ByteArrayInputStream bais = new ByteArrayInputStream( - "<http://www.v/dat/4b><http://www.w3.org/20/ica#dtend><http://sin/value/2><http://sin.siteserv.org/def/>." + "<http://www.v/dat/4b> <http://www.w3.org/20/ica#dtend> <http://sin/value/2> <http://sin.siteserv.org/def/>." .getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); Assert.assertThat(rdfHandler.getStatements().size(), is(1)); final Statement statement = rdfHandler.getStatements().get(0); @@ -136,11 +136,9 @@ public class NQuadsParserTest { @Test public void testParseBasicBNode() throws RDFHandlerException, IOException, RDFParseException { final ByteArrayInputStream bais = new ByteArrayInputStream( - "_:123456768<http://www.w3.org/20/ica#dtend><http://sin/value/2><http://sin.siteserv.org/def/>." + "_:a123456768 <http://www.w3.org/20/ica#dtend> <http://sin/value/2> <http://sin.siteserv.org/def/>." .getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); Assert.assertThat(rdfHandler.getStatements().size(), is(1)); final Statement statement = rdfHandler.getStatements().get(0); @@ -161,11 +159,9 @@ public class NQuadsParserTest { @Test public void testParseBasicLiteral() throws RDFHandlerException, IOException, RDFParseException { final ByteArrayInputStream bais = new ByteArrayInputStream( - "_:123456768<http://www.w3.org/20/ica#dtend>\"2010-05-02\"<http://sin.siteserv.org/def/>." + "_:a123456768 <http://www.w3.org/20/ica#dtend> \"2010-05-02\" <http://sin.siteserv.org/def/>." .getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); Assert.assertThat(rdfHandler.getStatements().size(), is(1)); final Statement statement = rdfHandler.getStatements().get(0); @@ -186,11 +182,9 @@ public class NQuadsParserTest { @Test public void testParseBasicLiteralLang() throws RDFHandlerException, IOException, RDFParseException { final ByteArrayInputStream bais = new ByteArrayInputStream( - "<http://www.v/dat/4b2-21><http://www.w3.org/20/ica#dtend>\"2010-05-02\"@en<http://sin.siteserv.org/def/>." + "<http://www.v/dat/4b2-21> <http://www.w3.org/20/ica#dtend> \"2010-05-02\"@en <http://sin.siteserv.org/def/>." .getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); final Statement statement = rdfHandler.getStatements().get(0); Assert.assertEquals("http://www.v/dat/4b2-21";, statement.getSubject().stringValue()); @@ -213,14 +207,12 @@ public class NQuadsParserTest { @Test public void testParseBasicLiteraDatatype() throws RDFHandlerException, IOException, RDFParseException { final ByteArrayInputStream bais = new ByteArrayInputStream( - ("<http://www.v/dat/4b2-21>" + - "<http://www.w3.org/20/ica#dtend>" + - "\"2010\"^^<http://www.w3.org/2001/XMLSchema#integer>" + + ("<http://www.v/dat/4b2-21> " + + "<http://www.w3.org/20/ica#dtend> " + + "\"2010\"^^<http://www.w3.org/2001/XMLSchema#integer> " + "<http://sin.siteserv.org/def/>." ).getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); final Statement statement = rdfHandler.getStatements().get(0); Assert.assertEquals("http://www.v/dat/4b2-21";, statement.getSubject().stringValue()); @@ -244,9 +236,7 @@ public class NQuadsParserTest { public void testLiteralEscapeManagement1() throws RDFHandlerException, IOException, RDFParseException { TestParseLocationListener parseLocationListener = new TestParseLocationListener(); - TestRDFHandler rdfHandler = new TestRDFHandler(); parser.setParseLocationListener(parseLocationListener); - parser.setRDFHandler(rdfHandler); final ByteArrayInputStream bais = new ByteArrayInputStream( "<http://a> <http://b> \"\\\\\" <http://c> .".getBytes() @@ -254,7 +244,8 @@ public class NQuadsParserTest { parser.parse(bais, "http://base-uri";); rdfHandler.assertHandler(1); - parseLocationListener.assertListener(1, 40); + //parseLocationListener.assertListener(1, 40); + parseLocationListener.assertListener(1, 1); } /** @@ -268,9 +259,7 @@ public class NQuadsParserTest { public void testLiteralEscapeManagement2() throws RDFHandlerException, IOException, RDFParseException { TestParseLocationListener parseLocationListener = new TestParseLocationListener(); - TestRDFHandler rdfHandler = new TestRDFHandler(); parser.setParseLocationListener(parseLocationListener); - parser.setRDFHandler(rdfHandler); final ByteArrayInputStream bais = new ByteArrayInputStream( "<http://a> <http://b> \"Line text 1\\nLine text 2\" <http://c> .".getBytes() @@ -294,9 +283,7 @@ public class NQuadsParserTest { @Test public void testURIDecodingManagement() throws RDFHandlerException, IOException, RDFParseException { TestParseLocationListener parseLocationListener = new TestParseLocationListener(); - TestRDFHandler rdfHandler = new TestRDFHandler(); parser.setParseLocationListener(parseLocationListener); - parser.setRDFHandler(rdfHandler); final ByteArrayInputStream bais = new ByteArrayInputStream( "<http://s/\\u306F\\u3080> <http://p/\\u306F\\u3080> <http://o/\\u306F\\u3080> <http://g/\\u306F\\u3080> ." @@ -330,8 +317,6 @@ public class NQuadsParserTest { @Test public void testUnicodeLiteralManagement() throws RDFHandlerException, IOException, RDFParseException { - TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); final String INPUT_LITERAL = "[ã¯ãã¤ã®ãªã¹ããã³ã¤ã³ã°ã©ã³ãã®é¦é½ã§ãã] [æ¯å¤§ä¸åé¡ååæç¾èè¯åçååè±æ ¼èçé¦é½]"; final String INPUT_STRING = String.format( "<http://a> <http://b> \"%s\" <http://c> .", @@ -349,8 +334,6 @@ public class NQuadsParserTest { @Test public void testUnicodeLiteralDecoding() throws RDFHandlerException, IOException, RDFParseException { - TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); final String INPUT_LITERAL_PLAIN = "[ã¯]"; final String INPUT_LITERAL_ENCODED = "[\\u306F]"; final String INPUT_STRING = String.format( @@ -431,9 +414,7 @@ public class NQuadsParserTest { public void testParseRealData() throws IOException, RDFParseException, RDFHandlerException { TestParseLocationListener parseLocationListener = new TestParseLocationListener(); - TestRDFHandler rdfHandler = new TestRDFHandler(); parser.setParseLocationListener(parseLocationListener); - parser.setRDFHandler(rdfHandler); parser.parse( this.getClass().getClassLoader().getResourceAsStream("application/nquads/test2.nq"), @@ -490,8 +471,6 @@ public class NQuadsParserTest { "<http://s1> <http://p1> <http://o1> <http://g1> .\n" ).getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.setStopAtFirstError(false); parser.parse(bais, "http://base-uri";); rdfHandler.assertHandler(2); @@ -514,9 +493,9 @@ public class NQuadsParserTest { parser.parse(bais, "http://base-uri";); Assert.fail("Expected failure here."); } catch (RDFParseException e) { - Assert.assertTrue(e.getMessage().contains("expected '<'")); + Assert.assertTrue(e.getMessage().contains("Expected '<'")); Assert.assertEquals(1 , e.getLineNumber()); - Assert.assertEquals(35, e.getColumnNumber()); + //Assert.assertEquals(35, e.getColumnNumber()); } } @@ -528,8 +507,6 @@ public class NQuadsParserTest { "\"2010\"^^<http://www.w3.org/2001/XMLSchema#integer> ." ).getBytes() ); - final TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.parse(bais, "http://test.base.uri";); final Statement statement = rdfHandler.getStatements().get(0); Assert.assertEquals("http://www.v/dat/4b2-21";, statement.getSubject().stringValue()); @@ -558,8 +535,6 @@ public class NQuadsParserTest { private void verifyStatementWithInvalidDatatype(RDFParser.DatatypeHandling datatypeHandling) throws RDFHandlerException, IOException, RDFParseException { - TestRDFHandler rdfHandler = new TestRDFHandler(); - parser.setRDFHandler(rdfHandler); parser.setDatatypeHandling(datatypeHandling); final ByteArrayInputStream bais = new ByteArrayInputStream( ( @@ -584,7 +559,8 @@ public class NQuadsParserTest { private void assertListener(int row, int col) { Assert.assertEquals("Unexpected last row", row , lastRow); - Assert.assertEquals("Unexpected last col", col , lastCol); + // Column numbers are not supported by the Rio NQuadsParser currently + //Assert.assertEquals("Unexpected last col", col , lastCol); } } @@ -639,7 +615,7 @@ public class NQuadsParserTest { } if( statementIndex == 4) { - Assert.assertEquals(new URIImpl("http://test.base.uri#like";), statement.getPredicate() ); + Assert.assertEquals(new URIImpl("http://example.org/#like";), statement.getPredicate() ); } if(statementIndex == 5) {
