This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit b1d9f55e8c5895f970af6c7f36aa590427163823 Author: Andy Seaborne <[email protected]> AuthorDate: Tue Mar 25 09:47:53 2025 +0000 Reorganise reader/writer tests --- .../java/org/apache/jena/riot/TS_RiotGeneral.java | 5 ----- .../java/org/apache/jena/riot/lang/TS_Lang.java | 4 ++++ .../TestLangJsonLD.java} | 9 +++++--- ...JSONLD11.java => TestLangJsonLD_DocLoader.java} | 13 +++++++---- .../org/apache/jena/riot/writer/TS_RiotWriter.java | 9 ++++++-- .../TestTrigWriter.java} | 26 +++++++++------------- .../TestTurtleFormats.java} | 11 ++++----- 7 files changed, 42 insertions(+), 35 deletions(-) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java index 54c5e4925e..49a449c396 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java @@ -35,11 +35,6 @@ import org.junit.runners.Suite.SuiteClasses ; , TestRDFParser.class , TestRDFWriter.class , TestParseURISchemeBases.class - - , TestTurtleTrigWriter.class - , TestTurtleWriterPretty.class - - , TestJsonLDReader.class }) public class TS_RiotGeneral diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java index 8fcc396cb4..b7535a68be 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java @@ -39,6 +39,10 @@ import org.junit.runners.Suite ; , TestLangTurtle.class , TestLangTrig.class , TestLangRdfJson.class + + , TestLangJsonLD.class + , TestLangJsonLD_DocLoader.class + , TestRDFXML_ReaderProperties.class , TestTriXReader.class , TestTriXBad.class diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java similarity index 96% rename from jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java rename to jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java index 3277c3049f..cd4fe1c257 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java @@ -16,13 +16,15 @@ * limitations under the License. */ -package org.apache.jena.riot; +package org.apache.jena.riot.lang; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.IOException; +import org.junit.Test; + import org.apache.jena.graph.Graph; import org.apache.jena.graph.Triple; import org.apache.jena.query.Dataset; @@ -31,13 +33,14 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.Property; import org.apache.jena.rdf.model.Resource; import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.RDFParser; import org.apache.jena.riot.system.ErrorHandlerFactory; import org.apache.jena.sparql.sse.SSE; import org.apache.jena.sparql.util.Context; import org.apache.jena.vocabulary.RDF; -import org.junit.Test; -public class TestJsonLDReader { +public class TestLangJsonLD { // These tests fail under some java11 (but not java17) // for RIOT default JSON-LD 1.1 because Titanium contacts schema.org diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJSONLD11.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD_DocLoader.java similarity index 91% rename from jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJSONLD11.java rename to jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD_DocLoader.java index c84f28f4fd..47052e3b48 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJSONLD11.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD_DocLoader.java @@ -19,7 +19,7 @@ package org.apache.jena.riot.lang; import static org.apache.jena.riot.Lang.JSONLD11; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.net.URI; @@ -31,6 +31,8 @@ import com.apicatalog.jsonld.loader.DocumentLoader; import com.apicatalog.jsonld.loader.DocumentLoaderOptions; import com.apicatalog.jsonld.loader.HttpLoader; +import org.junit.Test; + import jakarta.json.Json; import jakarta.json.JsonObject; import org.apache.jena.riot.RDFParser; @@ -38,9 +40,8 @@ import org.apache.jena.riot.RDFParserBuilder; import org.apache.jena.riot.system.StreamRDF; import org.apache.jena.riot.system.StreamRDFLib; import org.apache.jena.sparql.util.Context; -import org.junit.Test; -public class TestLangJSONLD11 { +public class TestLangJsonLD_DocLoader { // Triggers the document loader. private static final String CONTENT = "{ \"@context\": \"http://unused/\"; }"; @@ -55,7 +56,8 @@ public class TestLangJSONLD11 { .build(); parser.parse(sink); - assertEquals("Custom DocumentLoader wasn't called to handle loading", 1, TestDocumentLoader.COUNTER); + // Check called at least once. + assertTrue("Custom DocumentLoader wasn't called to handle loading", TestDocumentLoader.COUNTER > 0 ); } private final Context setupContext() { @@ -76,6 +78,9 @@ public class TestLangJSONLD11 { @Override public Document loadDocument(URI url, DocumentLoaderOptions options) throws JsonLdError { + + System.out.println(url); + DocumentLoader loader = HttpLoader.defaultInstance(); JsonObject obj = Json.createObjectBuilder() diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java index 2365db9fb1..1d0bc2243d 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java @@ -28,11 +28,16 @@ import org.junit.runners.Suite.SuiteClasses ; TestWriterRegistration.class , TestRiotWriterGraph.class , TestRiotWriterDataset.class - , TestRDFJSON.class + , TestTurtleWriter.class - , TestTriXWriter.class + , TestTrigWriter.class + , TestTurtleFormats.class + , TestWriterRDFXML.class , TestWriterRDFXML_Properties.class + + , TestTriXWriter.class + , TestRDFJSON.class }) public class TS_RiotWriter diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestTurtleTrigWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTrigWriter.java similarity index 88% rename from jena-arq/src/test/java/org/apache/jena/riot/TestTurtleTrigWriter.java rename to jena-arq/src/test/java/org/apache/jena/riot/writer/TestTrigWriter.java index b3306273e2..07b76b7de8 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestTurtleTrigWriter.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTrigWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.riot; +package org.apache.jena.riot.writer; import static org.junit.Assert.assertTrue; @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.jena.graph.Graph; +import org.apache.jena.riot.*; import org.apache.jena.sparql.graph.GraphFactory; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import org.junit.runners.Parameterized.Parameters; /** Tests for Turtle (and Trig) */ @RunWith(Parameterized.class) -public class TestTurtleTrigWriter { +public class TestTrigWriter { @Parameters(name = "{index}: {0}") public static Iterable<Object[]> data() { List<Object[]> x = new ArrayList<>() ; @@ -46,26 +47,23 @@ public class TestTurtleTrigWriter { x.add(new Object[]{"Trig/Blocks", RDFFormat.TRIG_BLOCKS}); x.add(new Object[]{"Trig/Flat", RDFFormat.TRIG_FLAT}); x.add(new Object[]{"Trig/Long", RDFFormat.TRIG_LONG}); - return x ; + return x ; } - - private static String DIR = "testing/RIOT/Writer/"; + private static String DIR = "testing/RIOT/Writer/"; private static String BASE = "http://BASE/";; private final RDFFormat format; - private final String filename; - - public TestTurtleTrigWriter(String name, RDFFormat format) { + public TestTrigWriter(String name, RDFFormat format) { this.format = format; if ( format.getLang().equals(Lang.TRIG) ) this.filename = DIR+"rdfwriter-02.trig"; else this.filename = DIR+"rdfwriter-01.ttl"; } - + // read file, with external base URI private static Graph data(String fn, String baseURI) { Graph g1 = GraphFactory.createDefaultGraph(); @@ -81,8 +79,8 @@ public class TestTurtleTrigWriter { // This has a relative URI // Not an ideal URI but legal (host is upper case). Allowed. Graph g = data(filename, BASE); - - String written = + + String written = RDFWriter.create() .base(BASE) .source(g) @@ -90,13 +88,9 @@ public class TestTurtleTrigWriter { .format(format) .base(BASE) .asString(); - + // Test BASE used. assertTrue(written.contains("<>")); assertTrue(written.contains("BASE")); } - - // Stream writer (BLOCKS and FLAT) don't print a base URI unless explicitly given one in the data. - // THis test is in TestTurtleWriterPretty - //@Test public void writer_parse_base_2() } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestTurtleWriterPretty.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleFormats.java similarity index 94% rename from jena-arq/src/test/java/org/apache/jena/riot/TestTurtleWriterPretty.java rename to jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleFormats.java index f2bd6256c1..6bec289acf 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestTurtleWriterPretty.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleFormats.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.riot; +package org.apache.jena.riot.writer; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -31,12 +31,13 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.apache.jena.graph.Graph; +import org.apache.jena.riot.*; import org.apache.jena.sparql.graph.GraphFactory; import org.apache.jena.sparql.sse.SSE; -/** Tests for Turtle and Trig pertty format */ +/** Tests for Turtle and Trig formats */ @RunWith(Parameterized.class) -public class TestTurtleWriterPretty { +public class TestTurtleFormats { @Parameters(name = "{index}: {0}") public static Iterable<Object[]> data() { List<Object[]> x = new ArrayList<>() ; @@ -55,7 +56,7 @@ public class TestTurtleWriterPretty { private final String filename; - public TestTurtleWriterPretty(String name, RDFFormat format) { + public TestTurtleFormats(String name, RDFFormat format) { this.format = format; if ( format.getLang().equals(Lang.TRIG) ) this.filename = DIR+"rdfwriter-02.trig"; @@ -115,7 +116,7 @@ public class TestTurtleWriterPretty { } } - @Test public void writer_baddata_iri_1() { + @Test public void writer_bad_data_iri_1() { // SSE allows aweful IRIs! Good for test data ... Graph g = SSE.parseGraph("(graph (:s :p <[[>))"); String x = RDFWriter.source(g).base("http://example/";).format(format).asString();
