GH-5327 added RDF 1.2 testsuite files for Turtle, TriG, NTriples, NQuads, and refactored testsuite code to run RDF 1.2 and 1.1 test suites

Author: SarahGrand

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/nquads/NQuadsParserTest.java

@@ -10,24 +10,51 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.rio.nquads;
 
+import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParser;
-import org.eclipse.rdf4j.testsuite.rio.nquads.AbstractNQuadsParserTest;
+import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
-/**
- * JUnit test for the N-Quads parser.
- *
- * @author Arjohn Kampman
- */
-public class NQuadsParserTest extends AbstractNQuadsParserTest {
+public class NQuadsParserTest {
 
 	public static Test suite() throws Exception {
-		return new NQuadsParserTest().createTestSuite();
+		final TestSuite suite = new TestSuite(NQuadsParserTest.class);
+		suite.addTest(NQuads11ParserTest.suite());
+		suite.addTest(NQuads12ParserTest.suite());
+		return suite;
 	}
 
-	@Override
-	protected RDFParser createRDFParser() {
-		return new NQuadsParser();
+	static class NQuads11ParserTest extends AbstractParserTestSuite {
+
+		private NQuads11ParserTest() {
+			super("/testcases/nquads/rdf11/", "http://www.w3.org/2013/N-QuadsTests/", RDFFormat.NQUADS, "NQuads");
+		}
+
+		public static Test suite() throws Exception {
+			return new NQuads11ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new NQuadsParser();
+		}
+	}
+
+	static class NQuads12ParserTest extends AbstractParserTestSuite {
+
+		private NQuads12ParserTest() {
+			super("/testcases/nquads/rdf12/", "http://www.w3.org/2013/N-QuadsTests/", RDFFormat.NQUADS, "NQuads");
+		}
+
+		public static Test suite() throws Exception {
+			return new NQuads12ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new NQuadsParser();
+		}
 	}
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/ntriples/NTriplesParserTest.java

@@ -10,24 +10,53 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.rio.ntriples;
 
+import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParser;
-import org.eclipse.rdf4j.testsuite.rio.ntriples.AbstractNTriplesParserTest;
+import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
-/**
- * JUnit test for the N-Triples parser.
- *
- * @author Arjohn Kampman
- */
-public class NTriplesParserTest extends AbstractNTriplesParserTest {
+public class NTriplesParserTest {
 
 	public static Test suite() throws Exception {
-		return new NTriplesParserTest().createTestSuite();
+		final TestSuite suite = new TestSuite(NTriplesParserTest.class);
+		suite.addTest(NTriples11ParserTest.suite());
+		suite.addTest(NTriples12ParserTest.suite());
+		return suite;
 	}
 
-	@Override
-	protected RDFParser createRDFParser() {
-		return new NTriplesParser();
+	static class NTriples11ParserTest extends AbstractParserTestSuite {
+
+		private NTriples11ParserTest() {
+			super("/testcases/ntriples/rdf11/", "http://www.w3.org/2013/N-TriplesTests/", RDFFormat.NTRIPLES,
+					"NTriples");
+		}
+
+		public static Test suite() throws Exception {
+			return new NTriples11ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new NTriplesParser();
+		}
+	}
+
+	static class NTriples12ParserTest extends AbstractParserTestSuite {
+
+		private NTriples12ParserTest() {
+			super("/testcases/ntriples/rdf12/", "http://www.w3.org/2013/N-TriplesTests/", RDFFormat.NTRIPLES,
+					"NTriples");
+		}
+
+		public static Test suite() throws Exception {
+			return new NTriples12ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new NTriplesParser();
+		}
 	}
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGParserTest.java

@@ -10,29 +10,67 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.rio.trig;
 
+import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParser;
 import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
 import org.eclipse.rdf4j.rio.nquads.NQuadsParser;
-import org.eclipse.rdf4j.testsuite.rio.trig.TriGParserTestCase;
+import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
 
-/**
- * JUnit test for the TriG parser.
- */
-public class TriGParserTest extends TriGParserTestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
-	public static junit.framework.Test suite() throws Exception {
-		return new TriGParserTest().createTestSuite();
+public class TriGParserTest {
+
+	public static Test suite() throws Exception {
+		final TestSuite suite = new TestSuite(TriGParserTest.class);
+		suite.addTest(TriG11ParserTest.suite());
+		suite.addTest(TriG12ParserTest.suite());
+		return suite;
 	}
 
-	@Override
-	protected RDFParser createTriGParser() {
-		TriGParser parser = new TriGParser();
-		parser.set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
-		return parser;
+	static class TriG11ParserTest extends AbstractParserTestSuite {
+		protected static final String TESTS_W3C_BASE_URL = "http://www.w3.org/2013/TriGTests/";
+		protected static final String TEST_W3C_FILE_BASE_PATH = "/testcases/trig/rdf11/";
+
+		public TriG11ParserTest() {
+			super(TEST_W3C_FILE_BASE_PATH, TESTS_W3C_BASE_URL, RDFFormat.TRIG, "Trig");
+		}
+
+		public static Test suite() throws Exception {
+			return new TriG11ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new TriGParser().set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
+		}
+
+		@Override
+		protected RDFParser createRDFBaseParser() {
+			return new NQuadsParser();
+		}
 	}
 
-	@Override
-	protected RDFParser createNQuadsParser() {
-		return new NQuadsParser();
+	static class TriG12ParserTest extends AbstractParserTestSuite {
+		protected static final String TESTS_W3C_BASE_URL = "https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-trig/";
+		protected static final String TEST_W3C_FILE_BASE_PATH = "/testcases/trig/rdf12/";
+
+		public TriG12ParserTest() {
+			super(TEST_W3C_FILE_BASE_PATH, TESTS_W3C_BASE_URL, RDFFormat.TRIG, "Trig");
+		}
+
+		public static Test suite() throws Exception {
+			return new TriG12ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new TriGParser().set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
+		}
+
+		@Override
+		protected RDFParser createRDFBaseParser() {
+			return new NQuadsParser();
+		}
 	}
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTest.java

@@ -10,32 +10,67 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.rio.turtle;
 
+import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParser;
-import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
 import org.eclipse.rdf4j.rio.ntriples.NTriplesParser;
-import org.eclipse.rdf4j.testsuite.rio.turtle.TurtleParserTestCase;
+import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
-/**
- * JUnit test for the Turtle parser that uses the tests that are available
- * <a href="https://dvcs.w3.org/hg/rdf/file/09a9da374a9f/rdf-turtle/">online</a>.
- */
-public class TurtleParserTest extends TurtleParserTestCase {
+public class TurtleParserTest {
 
 	public static Test suite() throws Exception {
-		return new TurtleParserTest().createTestSuite();
+		final TestSuite suite = new TestSuite(TurtleParserTest.class);
+		suite.addTest(Turtle11ParserTest.suite());
+		suite.addTest(Turtle12ParserTest.suite());
+		return suite;
 	}
 
-	@Override
-	protected RDFParser createTurtleParser() {
-		RDFParser result = new TurtleParser();
-		result.set(BasicParserSettings.VERIFY_DATATYPE_VALUES, true);
-		return result;
+	static class Turtle12ParserTest extends AbstractParserTestSuite {
+
+		protected static final String TESTS_W3C_BASE_URL = "https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-turtle/";
+		protected static final String TEST_W3C_FILE_BASE_PATH_RDF12 = "/testcases/turtle/rdf12/";
+
+		private Turtle12ParserTest() {
+			super(TEST_W3C_FILE_BASE_PATH_RDF12, TESTS_W3C_BASE_URL, RDFFormat.TURTLE, "Turtle");
+		}
+
+		public static Test suite() throws Exception {
+			return new Turtle12ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new TurtleParser();
+		}
+
+		@Override
+		protected RDFParser createRDFBaseParser() {
+			return new NTriplesParser();
+		}
 	}
 
-	@Override
-	protected RDFParser createNTriplesParser() {
-		return new NTriplesParser();
+	static class Turtle11ParserTest extends AbstractParserTestSuite {
+		protected static final String TESTS_W3C_BASE_URL = "https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-turtle/";
+		protected static final String TEST_W3C_FILE_BASE_PATH = "/testcases/turtle/rdf11/";
+
+		public Turtle11ParserTest() {
+			super(TEST_W3C_FILE_BASE_PATH, TESTS_W3C_BASE_URL, RDFFormat.TURTLE, "Turtle");
+		}
+
+		public static Test suite() throws Exception {
+			return new Turtle11ParserTest().createTestSuite();
+		}
+
+		@Override
+		protected RDFParser createRDFParser() {
+			return new TurtleParser();
+		}
+
+		@Override
+		protected RDFParser createRDFBaseParser() {
+			return new NTriplesParser();
+		}
 	}
 }