Merge branch 'master' of github.com:json-ld/json-ld.org
authorDave Longley <dlongley@digitalbazaar.com>
Wed, 02 May 2012 13:55:45 -0400
changeset 614 5259a1abcf03
parent 612 c2d91c94c863 (current diff)
parent 613 bb1439f14ffb (diff)
child 615 431b7936e575
Merge branch 'master' of github.com:json-ld/json-ld.org
--- a/test-suite/tests/compact-0015-in.jsonld	Wed May 02 13:55:35 2012 -0400
+++ b/test-suite/tests/compact-0015-in.jsonld	Wed May 02 13:55:45 2012 -0400
@@ -2,10 +2,11 @@
   "@id": "http://example.com/id1",
   "@type": ["http://example.com/t1"],
   "http://example.com/term": [
-    "v1",
+    {"@value": "v1", "@language": "de"},
     {"@value": "v2", "@type": "http://example.com/t2"},
     {"@value": "v3", "@language": "en"},
     {"@list": [1, 2]},
+    "v5",
     {"@value": "plain literal"}
   ]
-}]
\ No newline at end of file
+}]
--- a/test-suite/tests/compact-0015-out.jsonld	Wed May 02 13:55:35 2012 -0400
+++ b/test-suite/tests/compact-0015-out.jsonld	Wed May 02 13:55:45 2012 -0400
@@ -12,8 +12,9 @@
   },
   "@id": "id1",
   "@type": "t1",
-  "term5": ["v1", "plain literal"],
+  "term1": "v1",
   "term2": "v2",
   "term3": "v3",
-  "term4": [1, 2]
+  "term4": [ 1, 2 ],
+  "term5": [ "v5", "plain literal" ]
 }