Skip to content

Commit 24a56c3

Browse files
RinkeHoekstraRinkeHoekstra
committed
This fixes issue #262:
* Included new JSON-LD tests in json-ld.org directory (perhaps rename this to something more W3C specific, as these are the latest tests from W3C) * Starting from `manifest.jsonld` rather than all jsonld files in the test directory; then iterating of the the list of manifest files specified there.
1 parent 44c1bba commit 24a56c3

File tree

2,027 files changed

+16642
-6648
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,027 files changed

+16642
-6648
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_store
12
.classpath
23
.project
34
.settings

‎core/src/test/java/com/github/jsonldjava/core/JsonLdProcessorTest.java‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
public class JsonLdProcessorTest {
4747

4848
private static final String TEST_DIR = "json-ld.org";
49+
private static final String MANIFEST_FILE = "manifest.jsonld";
4950

5051
private static Map<String, Object> REPORT;
5152
private static List<Object> REPORT_GRAPH;
@@ -184,22 +185,37 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
184185
// https://github.com/json-ld/json-ld.org/tree/master/test-suite/tests
185186

186187
final ClassLoader cl = Thread.currentThread().getContextClassLoader();
187-
final File f = new File(cl.getResource(TEST_DIR).toURI());
188-
final List<File> manifestfiles = Arrays.asList(f.listFiles(new FilenameFilter() {
189-
@Override
190-
public boolean accept(File dir, String name) {
191-
if (name.contains("manifest") && name.endsWith(".jsonld")) {
192-
// System.out.println("Using manifest: " + dir + " "
193-
// + name);
194-
// Remote-doc tests are not currently supported
195-
if (name.contains("remote-doc")) {
196-
return false;
197-
}
198-
return true;
199-
}
200-
return false;
201-
}
202-
}));
188+
final File testDir = new File(cl.getResource(TEST_DIR).toURI());
189+
final File mainManifestFile = new File(testDir, MANIFEST_FILE);
190+
191+
final Map<String, Object> mainManifest = (Map<String, Object>) JsonUtils
192+
.fromInputStream(new FileInputStream(mainManifestFile));
193+
194+
final List<String> manifestFileNames = (List<String>) mainManifest
195+
.get("sequence");
196+
197+
final List<File> manifestfiles = new ArrayList<File>();
198+
199+
for (final String manifestFileName : manifestFileNames) {
200+
System.out.println("Using manifest: " + testDir + " " + manifestFileName);
201+
manifestfiles.add(new File(testDir, manifestFileName));
202+
}
203+
204+
// final List<File> manifestfiles = Arrays.asList(f.listFiles(new FilenameFilter() {
205+
// @Override
206+
// public boolean accept(File dir, String name) {
207+
// if (name.contains("manifest") && name.endsWith(".jsonld") && !name.equals("manifest.jsonld")) {
208+
// System.out.println("Using manifest: " + dir + " "
209+
// + name);
210+
// // Remote-doc tests are not currently supported
211+
// if (name.contains("remote-doc")) {
212+
// return false;
213+
// }
214+
// return true;
215+
// }
216+
// return false;
217+
// }
218+
// }));
203219

204220
final Collection<Object[]> rdata = new ArrayList<Object[]>();
205221
for (final File in : manifestfiles) {

‎core/src/test/resources/json-ld.org/LICENSE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The JSON-LD Test Suite is covered by the dual-licensing approach described in
2+
[LICENSES FOR W3C TEST SUITES](https://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html).

‎core/src/test/resources/json-ld.org/README.md‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Introduction
2+
3+
The JSON-LD Test Suite is a set of tests that can
4+
be used to verify JSON-LD Processor conformance to the set of specifications
5+
that constitute JSON-LD. The goal of the suite is to provide an easy and
6+
comprehensive JSON-LD testing solution for developers creating JSON-LD Processors.
7+
8+
More information and an RDFS definition of the test vocabulary can be found at [vocab](https://w3c.github.io/json-ld-api/tests/vocab).
9+
10+
# Design
11+
12+
Tests are defined into _compact_, _expand_, _flatten_, _remote-doc_, _fromRdf_, and _toRdf_ sections:
13+
14+
* _compact_ tests have _input_, _expected_ and _context_ documents.
15+
The _expected_ results can be compared using [JSON-LD object comparison](#json-ld-object-comparison) with the processor output. Additionally, if the `ordered` option is not set, result should be expanded and compared with the expanded _expected_ document also using [JSON-LD object comparison](#json-ld-object-comparison).
16+
17+
For *NegativeEvaluationTests*, the result is a string associated with the expected error code.
18+
* _expand_ tests have _input_ and _expected_ documents.
19+
The _expected_ results can be compared using [JSON-LD object comparison](#json-ld-object-comparison) with the processor output.
20+
21+
For *NegativeEvaluationTests*, the result is a string associated with the expected error code.
22+
* _flatten_ tests have _input_ and _expected_ documents and an optional _context_ document.
23+
The _expected_ results can be compared using [JSON-LD object comparison](#json-ld-object-comparison) with the processor output
24+
after potentially remapping blank node identifiers (see below).
25+
Additionally, if the result is compacted and the `ordered` option is not set, result should be expanded and compared with the expanded _expected_ document also using [JSON-LD object comparison](#json-ld-object-comparison).
26+
27+
For *NegativeEvaluationTests*, the result is a string associated with the expected error code.
28+
* _remote-doc_ tests have _input_ and _expected_ documents.
29+
The _expected_ results can be compared using [JSON-LD object comparison](#json-ld-object-comparison) with the processor output.
30+
31+
For *NegativeEvaluationTests*, the result is a string associated with the expected error code. Options may be present to describe the intended HTTP behavior:
32+
* _contentType_: Content-Type of the returned HTTP payload, defaults to the appropriate type for the _input_ suffix.
33+
* _httpStatus_: The HTTP status code to return, defaults to `200`.
34+
* _redirectTo_: The HTTP _Content-Location_ header value.
35+
* _httpLink_: The HTTP _Link_ header value.
36+
* _fromRdf_ tests have _input_ and _expected_ documents.
37+
The _expected_ results can be compared using [JSON-LD object comparison](#json-ld-object-comparison) with the processor output.
38+
* _toRdf_ tests have _input_ and _expected_ documents.
39+
The _expected_ results can be compared using [RDF Dataset Isomorphism](https://www.w3.org/TR/rdf11-concepts/#dfn-dataset-isomorphism).
40+
* _http_ tests have _input_ and _expected_ documents and an optional _context_ document.
41+
These tests describe the behavior of an HTTP server performing content-negotiation using the ACCEPT header, specified using the _accept_ option to generate the _expected_ result document.
42+
The _expected_ results can be compared using [JSON-LD object comparison](#json-ld-object-comparison) with the processor output
43+
after potentially remapping blank node identifiers (see below).
44+
Additionally, if the result is compacted and the `ordered` option is not set, result should be expanded and compared with the expanded _expected_ document also using [JSON-LD object comparison](#json-ld-object-comparison).
45+
46+
If the result is to be compacted, and no explicit context URL is provided, test subjects should use http/default-context.jsonld
47+
48+
If the profile parameter includes http://example.com/do-not-use, test subjects should reject the URL and not accept the media type. Otherwise, for any other URL, applications should apply the specified URL for the context or frame, as appropriate.
49+
50+
For *NegativeEvaluationTests*, the result is the expected HTTP status. Options may be present to describe the intended HTTP behavior:
51+
* _accept_: The HTTP _Accept_ header value.
52+
53+
Unless `processingMode` is set explicitly in a test entry, `processingMode` is compatible with both `json-ld-1.0` and `json-ld-1.1`.
54+
55+
Test results that include a context input presume that the context is provided locally, and not from the referenced location, thus the results will include the content of the context file, rather than a reference.
56+
57+
## JSON-LD Object comparison
58+
59+
If algorithms are invoked with the `ordered` flag set to `true`, simple JSON Object comparison may be used, as the order of all arrays will be preserved (except for _fromRdf_, unless the input quads are also ordered). If `ordered` is `false`, then the following algorithm will ensure arrays other than values of `@list` are compared without regard to order.
60+
61+
JSON-LD Object comparison compares JSON objects, arrays, and values recursively for equality.
62+
63+
* JSON objects are compared member by member without regard to the ordering of members within the object. Each member must have a corresponding member in the object being compared to. Values are compared recursively.
64+
* JSON arrays are generally compared without regard to order (the lone exception being if the referencing key is `@list`). Each item within the array must be equivalent to an item in the array being compared to by using the comparison algorithm recursively. For values of `@list`, the order of these items is significant.
65+
* JSON values are compared using strict equality.
66+
67+
Note that some tests require re-expansion and comparison, as list values may exist as values of properties that have `@container: @list` and the comparison algorithm will not consider ordering significant.
68+
69+
# Running tests
70+
71+
Implementations create their own infrastructure for running the test suite. In particular, the following should be considered:
72+
73+
* _remote-doc_ tests will likely not return expected HTTP headers, so the _options_ should be used to determine what headers are associated with the input document.
74+
* Some algorithms, particularly _fromRdf_, may not preserve the order of statements listed in the input document, and provision should be taken for performing unordered array comparison, for arrays other than values of `@list`. (This may be difficult for compacted results, where array value ordering is dependent on the associated term definition).
75+
* When comparing documents after flattening, framing or generating RDF, blank node identifiers may not be predictable. Implementations using the JSON-LD 1.0 algorithm, where output is always sorted and blank node identifiers are generated sequentially from `_:b0` may continue to use a simple object comparison. Otherwise, implementations should take this into consideration. (One way to do this may be to reduce both results and _expected_ to datsets to extract a bijective mapping of blank node labels between the two datasets as described in [RDF Dataset Isomorphism](https://www.w3.org/TR/rdf11-concepts/#dfn-dataset-isomorphism)).
76+
77+
# Contributing
78+
79+
If you would like to contribute a new test or a fix to an existing test,
80+
please follow these steps:
81+
82+
1. Notify the JSON-LD mailing list, public-json-ld-wg@w3.org,
83+
that you will be creating a new test or fix and the purpose of the
84+
change.
85+
2. Clone the git repository: git://github.com/w3c/json-ld-wg.git
86+
3. Make your changes and submit them via github, or via a 'git format-patch'
87+
to the [JSON-LD Working Group mailing list](mailto:json-ld-wg@w3.org).

‎core/src/test/resources/json-ld.org/compact-0007-context.jsonld‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎core/src/test/resources/json-ld.org/compact-0007-out.jsonld‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎core/src/test/resources/json-ld.org/compact-0009-context.jsonld‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎core/src/test/resources/json-ld.org/compact-0009-out.jsonld‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎core/src/test/resources/json-ld.org/compact-0037-in.jsonld‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎core/src/test/resources/json-ld.org/compact-0045-context.jsonld‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)