Add custom integration test, tweak assertion to handle null

fsteeg · fsteeg · commit 3c22c6812943 · 2020-03-18T13:14:33.000+01:00
Add test using a full document with base and relative IDs based on the original report by @ebremer on the users@jena.apache.org list See #279
diff --git a/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java b/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java
@@ -1,12 +1,14 @@
 package com.github.jsonldjava.core;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -55,4 +57,25 @@ public void testMixedLocalRemoteBaseLocalContextFirst() throws Exception {
         assertEquals(expanded, output);
     }
 
+    @Test
+    public void testUriResolveWhenExpandingBase() throws Exception {
+
+        final Reader reader = new BufferedReader(new InputStreamReader(
+                this.getClass().getResourceAsStream("/custom/base-0003-in.jsonld"),
+                Charset.forName("UTF-8")));
+        final Object input = JsonUtils.fromReader(reader);
+        assertNotNull(input);
+
+        final JsonLdOptions options = new JsonLdOptions();
+        final List<Object> expanded = JsonLdProcessor.expand(input, options);
+        assertFalse("expanded form must not be empty", expanded.isEmpty());
+
+        final Reader outReader = new BufferedReader(new InputStreamReader(
+                this.getClass().getResourceAsStream("/custom/base-0003-out.jsonld"),
+                Charset.forName("UTF-8")));
+        final Object expected = JsonLdProcessor.expand(JsonUtils.fromReader(outReader), options);
+        assertNotNull(expected);
+        assertEquals(expected, expanded);
+    }
+
 }
diff --git a/core/src/test/java/com/github/jsonldjava/utils/JsonUtilsTest.java b/core/src/test/java/com/github/jsonldjava/utils/JsonUtilsTest.java
@@ -1,5 +1,7 @@
 package com.github.jsonldjava.utils;
 
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -26,8 +28,7 @@ public void resolveTest() {
         } catch (final Exception e) {
             assertTrue(false);
         }
-
-        assertTrue(resolve.equals(baseUri + "/" + pathToResolve));
+        assertEquals(baseUri + "/" + pathToResolve, resolve);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/core/src/test/resources/custom/base-0003-in.jsonld b/core/src/test/resources/custom/base-0003-in.jsonld
@@ -0,0 +1,17 @@
+{
+    "@context": {
+        "@base": "http://mysite.net",
+        "DataSet": "http://schema.org/DataSet",
+        "CreativeWork": "http://schema.org/CreativeWork"
+    },
+    "@graph": [
+        {
+            "@type": "CreativeWork",
+            "@id": "picture.jpg"
+        },
+        {
+            "@id": "./",
+            "@type": "DataSet"
+        }
+    ]
+}
diff --git a/core/src/test/resources/custom/base-0003-out.jsonld b/core/src/test/resources/custom/base-0003-out.jsonld
@@ -0,0 +1,7 @@
+[ {
+  "@id" : "http://mysite.net/picture.jpg",
+  "@type" : [ "http://schema.org/CreativeWork" ]
+}, {
+  "@id" : "http://mysite.net/",
+  "@type" : [ "http://schema.org/DataSet" ]
+} ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package com.github.jsonldjava.utils;`
`2`	`2`
	`3`	`+`
	`4`	`+import static org.junit.Assert.assertEquals;`
`3`	`5`	`import static org.junit.Assert.assertTrue;`
`4`	`6`
`5`	`7`	`import java.io.IOException;`
`@@ -26,8 +28,7 @@ public void resolveTest() {`
`26`	`28`	`} catch (final Exception e) {`
`27`	`29`	`assertTrue(false);`
`28`	`30`	`}`
`29`		`-`
`30`		`- assertTrue(resolve.equals(baseUri + "/" + pathToResolve));`
	`31`	`+ assertEquals(baseUri + "/" + pathToResolve, resolve);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`@SuppressWarnings("unchecked")`