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
The following commit(s) were added to refs/heads/main by this push:
new 2b445f17b6 GH-3698: Tidy up JSON-LD testing
2b445f17b6 is described below
commit 2b445f17b6ebc24f07283ee5e27d58a5bd5ba5a2
Author: Andy Seaborne <[email protected]>
AuthorDate: Thu Jan 22 09:08:14 2026 +0000
GH-3698: Tidy up JSON-LD testing
---
.../org/apache/jena/riot/lang/TestLangJsonLD.java | 35 ++++++++++--
.../org/apache/jena/riot/system/TS_RiotSystem.java | 1 +
...oTitanium.java => TestJenaTitaniumConvert.java} | 49 +++++++++--------
.../java/org/apache/jena/system/TS_System.java | 1 -
.../org/apache/jena/system/TestJenaTitanium.java | 64 ----------------------
5 files changed, 55 insertions(+), 95 deletions(-)
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java
index 6d1fcf2016..8190b1759d 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangJsonLD.java
@@ -21,6 +21,7 @@
package org.apache.jena.riot.lang;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,24 +41,46 @@ 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.core.DatasetGraph;
import org.apache.jena.sparql.sse.SSE;
import org.apache.jena.sparql.util.Context;
import org.apache.jena.vocabulary.RDF;
public class TestLangJsonLD {
- // These tests fail under some java11 (but not java17)
- // for RIOT default JSON-LD 1.1 because Titanium contacts schema.org
- // with java.net.http/HTTP2 (default version setting)
- // which fails.
-
@Test
- public final void simpleReadTest() throws IOException {
+ public final void readFromString() throws IOException {
String jsonld = someSchemaDotOrgJsonld();
Dataset ds = jsonld2dataset(jsonld, null, Lang.JSONLD);
assertJohnDoeIsOK(ds.getDefaultModel());
}
+ @Test
+ public final void readContext() {
+ DatasetGraph dsg =
RDFParser.source("testing/RIOT/jsonld11/doc-1.jsonld11").toDatasetGraph();
+ assertFalse(dsg.isEmpty());
+ // "@vocab" : "http://example.org/vocab"; -- not a prefix - does not
end in "/" "#" or ":"
+ assertEquals(0, dsg.prefixes().size());
+ }
+
+ @Test
+ public final void readContextArrayPrefixes_1() {
+ DatasetGraph dsg =
RDFParser.source("testing/RIOT/jsonld11/doc-2.jsonld11").toDatasetGraph();
+ assertTrue(dsg.prefixes().containsPrefix("foaf"));
+ assertEquals(1, dsg.prefixes().size());
+ }
+
+ @Test
+ public final void readContextArrayPrefixes_2() {
+ DatasetGraph dsg =
RDFParser.source("testing/RIOT/jsonld11/doc-3.jsonld11").toDatasetGraph();
+ assertTrue(dsg.prefixes().containsPrefix("foaf"));
+ assertEquals(3, dsg.prefixes().size());
+ assertTrue(dsg.prefixes().containsPrefix("foaf"));
+ assertTrue(dsg.prefixes().containsPrefix("foo"));
+ assertTrue(dsg.prefixes().containsPrefix(""));
+ assertFalse(dsg.prefixes().containsPrefix("bar"));
+ }
+
@Test
public void testJsonLdBase() {
// GH-1451
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
b/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
index 5d9a6c04df..a56e5d94b1 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
@@ -46,6 +46,7 @@ import org.junit.platform.suite.api.Suite;
, TestRiotLib.class
, TestAsyncParser.class
+ , TestJenaTitaniumConvert.class
})
/**
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/system/jsonld/TestJenaToTitanium.java
b/jena-arq/src/test/java/org/apache/jena/riot/system/TestJenaTitaniumConvert.java
similarity index 79%
rename from
jena-arq/src/test/java/org/apache/jena/riot/system/jsonld/TestJenaToTitanium.java
rename to
jena-arq/src/test/java/org/apache/jena/riot/system/TestJenaTitaniumConvert.java
index 7306ffae8c..0fddc27357 100644
---
a/jena-arq/src/test/java/org/apache/jena/riot/system/jsonld/TestJenaToTitanium.java
+++
b/jena-arq/src/test/java/org/apache/jena/riot/system/TestJenaTitaniumConvert.java
@@ -19,17 +19,16 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.riot.system.jsonld;
+package org.apache.jena.riot.system;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.jena.riot.system.ErrorHandlerFactory;
-import org.apache.jena.riot.system.ParserProfile;
-import org.apache.jena.riot.system.RiotLib;
-import org.apache.jena.riot.system.StreamRDF;
-import org.apache.jena.riot.system.StreamRDFLib;
+import org.apache.jena.riot.system.jsonld.JenaToTitanium;
+import org.apache.jena.riot.system.jsonld.TitaniumJsonLdOptions;
+import org.apache.jena.riot.system.jsonld.TitaniumToJena;
+
import org.junit.jupiter.api.Test;
import com.apicatalog.jsonld.JsonLdError;
@@ -46,13 +45,13 @@ import org.apache.jena.sparql.sse.SSE;
import org.apache.jena.sparql.util.Context;
import org.apache.jena.sparql.util.IsoMatcher;
-public class TestJenaToTitanium {
+public class TestJenaTitaniumConvert {
private JsonObject findInArray(JsonArray array, String key, String value) {
return array.stream()
.filter(jsonValue -> jsonValue.getValueType() ==
JsonValue.ValueType.OBJECT
- && jsonValue.asJsonObject().containsKey(key)
- &&
jsonValue.asJsonObject().getString(key).equals(value))
+ &&
jsonValue.asJsonObject().containsKey(key)
+ &&
jsonValue.asJsonObject().getString(key).equals(value))
.map(JsonValue::asJsonObject).findFirst().orElse(null);
}
@@ -63,18 +62,18 @@ public class TestJenaToTitanium {
String dsStr = StrUtils.strjoinNL
("(dataset"
- , " (_ :s :p :o)"
- , " (_ :s :p 123)"
- , " (_ :s :p 123.5)"
- , " (_ :s :p 1e10)"
- , " (_ :s :p '2021-08-10'^^xsd:date)"
- , " (_ :s :p 'foo')"
- , " (:g1 :s :p :o)"
- , " (:g1 _:x :p :o)"
- , " (:g2 _:x :p 123)"
- , " (:g2 _:x :p 'abc'@en)"
- , " (_:x _:x :p _:x)"
- ,")"
+ , " (_ :s :p :o)"
+ , " (_ :s :p 123)"
+ , " (_ :s :p 123.5)"
+ , " (_ :s :p 1e10)"
+ , " (_ :s :p '2021-08-10'^^xsd:date)"
+ , " (_ :s :p 'foo')"
+ , " (:g1 :s :p :o)"
+ , " (:g1 _:x :p :o)"
+ , " (:g2 _:x :p 123)"
+ , " (:g2 _:x :p 'abc'@en)"
+ , " (_:x _:x :p _:x)"
+ ,")"
);
DatasetGraph dsg1 = SSE.parseDatasetGraph(dsStr);
@@ -98,6 +97,10 @@ public class TestJenaToTitanium {
assertEquals(2, dateValue.size());
assertEquals(XSDDatatype.XSDdate.getURI(),
dateValue.getString("@type"));
+ // Checking g1
+ JsonObject g1 = findInArray(jsonld, "@id", "http://example/g1";);
+ assertTrue(g1.containsKey("@graph"));
+
// Checking g2
JsonObject g2 = findInArray(jsonld, "@id", "http://example/g2";);
assertTrue(g2.containsKey("@graph"));
@@ -116,6 +119,4 @@ public class TestJenaToTitanium {
TitaniumToJena.convert(document, options, output, profile);
assertTrue(IsoMatcher.isomorphic(dsg1, dsg2), "Datasets should be
isomorphic");
}
-
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/system/TS_System.java
b/jena-arq/src/test/java/org/apache/jena/system/TS_System.java
index 5dff1a8b70..cb22b2c717 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/TS_System.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/TS_System.java
@@ -32,7 +32,6 @@ import org.junit.platform.suite.api.Suite;
, TestTxnOp.class
, TestTxn.class
, TestTxnThread.class
- , TestJenaTitanium.class
, TestReadXML.class
, TestPrefixes.class
, TestPrefixLib.class
diff --git
a/jena-arq/src/test/java/org/apache/jena/system/TestJenaTitanium.java
b/jena-arq/src/test/java/org/apache/jena/system/TestJenaTitanium.java
deleted file mode 100644
index f46f6ef5a2..0000000000
--- a/jena-arq/src/test/java/org/apache/jena/system/TestJenaTitanium.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.apache.jena.system;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
-
-import org.apache.jena.riot.RDFParser;
-import org.apache.jena.sparql.core.DatasetGraph;
-import org.apache.jena.sparql.core.DatasetGraphFactory;
-
-public class TestJenaTitanium {
-
- @Test
- public final void readContext_1() {
- DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
- RDFParser.source("testing/RIOT/jsonld11/doc-1.jsonld11").parse(dsg);
- assertFalse(dsg.isEmpty());
- // "@vocab" : "http://example.org/vocab"; -- not a prefix - does not
end in "/" "#" or ":"
- assertEquals(0, dsg.prefixes().size());
- }
-
- @Test
- public final void readContextArrayPrefixes_1() {
- DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
- RDFParser.source("testing/RIOT/jsonld11/doc-2.jsonld11").parse(dsg);
- assertTrue(dsg.prefixes().containsPrefix("foaf"));
- assertEquals(1, dsg.prefixes().size());
- }
-
- @Test
- public final void readContextArrayPrefixes_2() {
- DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
- RDFParser.source("testing/RIOT/jsonld11/doc-3.jsonld11").parse(dsg);
- assertTrue(dsg.prefixes().containsPrefix("foaf"));
- assertEquals(3, dsg.prefixes().size());
- assertTrue(dsg.prefixes().containsPrefix("foaf"));
- assertTrue(dsg.prefixes().containsPrefix("foo"));
- assertTrue(dsg.prefixes().containsPrefix(""));
- assertFalse(dsg.prefixes().containsPrefix("bar"));
- }
-}
