Skip to content

GH-5327 Added RDF test data files, refactoring of test suite code to include RDF 1.2 tests #5390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: rdf12
Choose a base branch
from
Open

GH-5327 Added RDF test data files, refactoring of test suite code to include RDF 1.2 tests #5390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7b0c8f
release 5.1.4
hmottestad Jul 21, 2025
3647484
next development iteration: 5.1.5-SNAPSHOT
hmottestad Jul 21, 2025
8ca3682
set correct version
hmottestad Jul 21, 2025
e611e16
sync develop branch after release 5.1.4 (#5386)
hmottestad Jul 28, 2025
4e4f208
GH-5327 added RDF 1.2 testsuite files for Turtle, TriG, NTriples, NQu…
SarahGrand Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 20 additions & 11 deletions compliance/rio/src/test/java/org/eclipse/rdf4j/rio/nquads/NQuadsParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,33 @@
*******************************************************************************/
package org.eclipse.rdf4j.rio.nquads;

import org.eclipse.rdf4j.rio.RDFParser;
import org.eclipse.rdf4j.testsuite.rio.nquads.AbstractNQuadsParserTest;

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();
suite.addTest(NQuads11ParserTest.suite());
// suite.addTest(NQuads12ParserTest.suite());
return suite;
}

static class NQuads11ParserTest extends AbstractNQuadsParserTest {
public static Test suite() throws Exception {
return new NQuads11ParserTest().createTestSuite();
}
}

@Override
protected RDFParser createRDFParser() {
return new NQuadsParser();
static class NQuads12ParserTest extends AbstractNQuadsParserTest {
private NQuads12ParserTest() {
super("/testcases/nquads/rdf12/", "http://www.w3.org/2013/N-QuadsTests/");
}

public static Test suite() throws Exception {
return new NQuads12ParserTest().createTestSuite();
}
}
}
31 changes: 20 additions & 11 deletions compliance/rio/src/test/java/org/eclipse/rdf4j/rio/ntriples/NTriplesParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,33 @@
*******************************************************************************/
package org.eclipse.rdf4j.rio.ntriples;

import org.eclipse.rdf4j.rio.RDFParser;
import org.eclipse.rdf4j.testsuite.rio.ntriples.AbstractNTriplesParserTest;

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();
suite.addTest(NTriples11ParserTest.suite());
// suite.addTest(NTriples12ParserTest.suite());
return suite;
}

static class NTriples11ParserTest extends AbstractNTriplesParserTest {
public static Test suite() throws Exception {
return new NTriples11ParserTest().createTestSuite();
}
}

@Override
protected RDFParser createRDFParser() {
return new NTriplesParser();
static class NTriples12ParserTest extends AbstractNTriplesParserTest {
private NTriples12ParserTest() {
super("/testcases/ntriples/rdf12/", "http://www.w3.org/2013/N-TriplesTests/");
}

public static Test suite() throws Exception {
return new NTriples12ParserTest().createTestSuite();
}
}
}
41 changes: 24 additions & 17 deletions compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,36 @@
*******************************************************************************/
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.testsuite.rio.trig.TriGParserTestCase;

/**
* 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();
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 TriGParserTestCase {
public static Test suite() throws Exception {
return new TriG11ParserTest().createTestSuite();
}
}

@Override
protected RDFParser createNQuadsParser() {
return new NQuadsParser();
static class TriG12ParserTest extends TriGParserTestCase {
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);
}

public static Test suite() throws Exception {
return new TriG12ParserTest().createTestSuite();
}
}
}
38 changes: 21 additions & 17 deletions compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,36 @@
*******************************************************************************/
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 org.eclipse.rdf4j.testsuite.rio.turtle.TurtleParserTestCase;

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();
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 Turtle11ParserTest extends TurtleParserTestCase {
public static Test suite() throws Exception {
return new Turtle11ParserTest().createTestSuite();
}
}

@Override
protected RDFParser createNTriplesParser() {
return new NTriplesParser();
static class Turtle12ParserTest extends TurtleParserTestCase {
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);
}

public static Test suite() throws Exception {
return new Turtle12ParserTest().createTestSuite();
}
}
}
6 changes: 6 additions & 0 deletions core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/NTriplesUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,9 @@ public static String unescapeString(String s) {

try {
final int codePoint = Integer.parseInt(xx, 16);
if (codePoint >= 0xD800 && codePoint <= 0xDFFF) {
throw new IllegalArgumentException("Illegal Unicode escape sequence: " + s);
}
sb.append(Character.toChars(codePoint));

startIdx = backSlashIdx + 6;
Expand All @@ -846,6 +849,9 @@ public static String unescapeString(String s) {

try {
final int codePoint = Integer.parseInt(xx, 16);
if (codePoint >= 0xD800 && codePoint <= 0xDFFF) {
throw new IllegalArgumentException("Illegal Unicode escape sequence: " + s);
}
sb.append(Character.toChars(codePoint));

startIdx = backSlashIdx + 10;
Expand Down
6 changes: 6 additions & 0 deletions core/rio/turtle/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,9 @@ public static String decodeString(String s) {

try {
final int codePoint = Integer.parseInt(xx, 16);
if (codePoint >= 0xD800 && codePoint <= 0xDFFF) {
throw new IllegalArgumentException("Illegal Unicode escape sequence: " + s);
}
sb.append(Character.toChars(codePoint));

startIdx = backSlashIdx + 6;
Expand All @@ -518,6 +521,9 @@ public static String decodeString(String s) {

try {
final int codePoint = Integer.parseInt(xx, 16);
if (codePoint >= 0xD800 && codePoint <= 0xDFFF) {
throw new IllegalArgumentException("Illegal Unicode escape sequence: " + s);
}
sb.append(Character.toChars(codePoint));

startIdx = backSlashIdx + 10;
Expand Down
5 changes: 5 additions & 0 deletions testsuites/rio/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,10 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rdf4j-rio-nquads</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
Loading
Loading