Fix #473: Fail on parser errors when VERIFY_DATATYPE_VALUES is true

James Leigh · James Leigh · commit f448114baa24 · 2017-08-28T13:10:51.000-04:00
Signed-off-by: James Leigh &lt;james.leigh@ontotext.com&gt;
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGParserTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGParserTest.java
@@ -8,6 +8,7 @@
 package org.eclipse.rdf4j.rio.trig;
 
 import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
 import org.eclipse.rdf4j.rio.nquads.NQuadsParser;
 import org.eclipse.rdf4j.rio.trig.TriGParser;
 import org.eclipse.rdf4j.rio.trig.TriGParserTestCase;
@@ -25,7 +26,9 @@ public static junit.framework.Test suite()
 
 	@Override
 	protected RDFParser createTriGParser() {
-		return new TriGParser();
+		TriGParser parser = new TriGParser();
+		parser.set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
+		return parser;
 	}
 
 	@Override
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTest.java
@@ -8,6 +8,7 @@
 package org.eclipse.rdf4j.rio.turtle;
 
 import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
 import org.eclipse.rdf4j.rio.ntriples.NTriplesParser;
 
 import junit.framework.Test;
@@ -27,6 +28,7 @@ public static Test suite()
 	@Override
 	protected RDFParser createTurtleParser() {
 		RDFParser result = new TurtleParser();
+		result.set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
 		return result;
 	}
 
diff --git a/core/rio/trig/src/main/java/org/eclipse/rdf4j/rio/trig/TriGParser.java b/core/rio/trig/src/main/java/org/eclipse/rdf4j/rio/trig/TriGParser.java
@@ -113,6 +113,9 @@ else if (directive.length() >= 5 && directive.substring(0, 5).equalsIgnoreCase("
 			skipWSC();
 
 			parseGraph();
+			if (getContext() == null) {
+				reportFatalError("Missing GRAPH label or subject");
+			}
 		}
 		else {
 			unread(directive);
diff --git a/testsuites/rio/src/main/java/org/eclipse/rdf4j/rio/trig/TriGParserTestCase.java b/testsuites/rio/src/main/java/org/eclipse/rdf4j/rio/trig/TriGParserTestCase.java
@@ -152,7 +152,7 @@ private void parseNegativeTriGSyntaxTests(TestSuite suite, String fileBasePath,
 			String nextBaseUrl = testBaseUrl + nextTestFile;
 
 			suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,
-					createTriGParser(), FailureMode.IGNORE_FAILURE));
+					createTriGParser(), FailureMode.DO_NOT_IGNORE_FAILURE));
 		}
 
 		queryResult.close();
@@ -244,7 +244,7 @@ private void parseNegativeTriGEvalTests(TestSuite suite, String fileBasePath, St
 			String nextBaseUrl = testBaseUrl + nextTestFile;
 
 			suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,
-					createTriGParser(), FailureMode.IGNORE_FAILURE));
+					createTriGParser(), FailureMode.DO_NOT_IGNORE_FAILURE));
 		}
 
 		queryResult.close();
diff --git a/testsuites/rio/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTestCase.java b/testsuites/rio/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTestCase.java
@@ -170,7 +170,7 @@ private void parseNegativeTurtleSyntaxTests(TestSuite suite, String fileBasePath
 			String nextBaseUrl = testBaseUrl + nextTestFile;
 
 			suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,
-					createTurtleParser(), FailureMode.IGNORE_FAILURE));
+					createTurtleParser(), FailureMode.DO_NOT_IGNORE_FAILURE));
 		}
 
 		queryResult.close();
@@ -255,7 +255,7 @@ private void parseNegativeTurtleEvalTests(TestSuite suite, String fileBasePath,
 			String nextBaseUrl = testBaseUrl + nextTestFile;
 
 			suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,
-					createTurtleParser(), FailureMode.IGNORE_FAILURE));
+					createTurtleParser(), FailureMode.DO_NOT_IGNORE_FAILURE));
 		}
 
 		queryResult.close();
@@ -328,7 +328,7 @@ private void parseNegativeNTriplesSyntaxTests(TestSuite suite, String fileBasePa
 			String nextBaseUrl = testBaseUrl + nextTestFile;
 
 			suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,
-					createNTriplesParser(), FailureMode.IGNORE_FAILURE));
+					createNTriplesParser(), FailureMode.DO_NOT_IGNORE_FAILURE));
 		}
 
 		queryResult.close();

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ else if (directive.length() >= 5 && directive.substring(0, 5).equalsIgnoreCase("`
`113`	`113`	`skipWSC();`
`114`	`114`
`115`	`115`	`parseGraph();`
	`116`	`+ if (getContext() == null) {`
	`117`	`+ reportFatalError("Missing GRAPH label or subject");`
	`118`	`+ }`
`116`	`119`	`}`
`117`	`120`	`else {`
`118`	`121`	`unread(directive);`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ private void parseNegativeTriGSyntaxTests(TestSuite suite, String fileBasePath,`
`152`	`152`	`String nextBaseUrl = testBaseUrl + nextTestFile;`
`153`	`153`
`154`	`154`	`suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,`
`155`		`- createTriGParser(), FailureMode.IGNORE_FAILURE));`
	`155`	`+ createTriGParser(), FailureMode.DO_NOT_IGNORE_FAILURE));`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`queryResult.close();`
`@@ -244,7 +244,7 @@ private void parseNegativeTriGEvalTests(TestSuite suite, String fileBasePath, St`
`244`	`244`	`String nextBaseUrl = testBaseUrl + nextTestFile;`
`245`	`245`
`246`	`246`	`suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,`
`247`		`- createTriGParser(), FailureMode.IGNORE_FAILURE));`
	`247`	`+ createTriGParser(), FailureMode.DO_NOT_IGNORE_FAILURE));`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`queryResult.close();`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private void parseNegativeTurtleSyntaxTests(TestSuite suite, String fileBasePath`
`170`	`170`	`String nextBaseUrl = testBaseUrl + nextTestFile;`
`171`	`171`
`172`	`172`	`suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,`
`173`		`- createTurtleParser(), FailureMode.IGNORE_FAILURE));`
	`173`	`+ createTurtleParser(), FailureMode.DO_NOT_IGNORE_FAILURE));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`queryResult.close();`
`@@ -255,7 +255,7 @@ private void parseNegativeTurtleEvalTests(TestSuite suite, String fileBasePath,`
`255`	`255`	`String nextBaseUrl = testBaseUrl + nextTestFile;`
`256`	`256`
`257`	`257`	`suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,`
`258`		`- createTurtleParser(), FailureMode.IGNORE_FAILURE));`
	`258`	`+ createTurtleParser(), FailureMode.DO_NOT_IGNORE_FAILURE));`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`queryResult.close();`
`@@ -328,7 +328,7 @@ private void parseNegativeNTriplesSyntaxTests(TestSuite suite, String fileBasePa`
`328`	`328`	`String nextBaseUrl = testBaseUrl + nextTestFile;`
`329`	`329`
`330`	`330`	`suite.addTest(new NegativeParserTest(nextTestUri, nextTestName, nextInputURL, nextBaseUrl,`
`331`		`- createNTriplesParser(), FailureMode.IGNORE_FAILURE));`
	`331`	`+ createNTriplesParser(), FailureMode.DO_NOT_IGNORE_FAILURE));`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`queryResult.close();`