Update test-suite for RDF tests, now re-named and updated to current spec.
authorGregg Kellogg <gregg@kellogg-assoc.com>
Sat, 06 Aug 2011 16:12:47 -0700
changeset 133 fdf1af9ea013
parent 132 1e7877bb071d
child 134 9d95f3a3a75a
Update test-suite for RDF tests, now re-named and updated to current spec.
test-suite/manifest.ttl
test-suite/tests/rdf-0001.jsonld
test-suite/tests/rdf-0002.jsonld
test-suite/tests/rdf-0003.jsonld
test-suite/tests/rdf-0004.jsonld
test-suite/tests/rdf-0005.jsonld
test-suite/tests/rdf-0006.jsonld
test-suite/tests/rdf-0006.sparql
test-suite/tests/rdf-0007.jsonld
test-suite/tests/rdf-0010.jsonld
test-suite/tests/rdf-0011.jsonld
test-suite/tests/rdf-0012.jsonld
test-suite/tests/rdf-0012.sparql
test-suite/tests/rdf-0013.jsonld
test-suite/tests/rdf-0014.jsonld
test-suite/tests/rdf-0015.jsonld
test-suite/tests/rdf-0015.sparql
test-suite/tests/rdf-0016.jsonld
test-suite/tests/rdf-0016.sparql
test-suite/tests/rdf-0017.jsonld
test-suite/tests/rdf-0018.jsonld
test-suite/tests/rdf-0019.jsonld
test-suite/tests/rdf-0020.jsonld
--- a/test-suite/manifest.ttl	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/manifest.ttl	Sat Aug 06 16:12:47 2011 -0700
@@ -6,243 +6,244 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
[email protected] jld: <http://json-ld.org/test-suite/vocab#> .
 
-<test-cases/0001> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0001> dc:contributor "Gregg Kellogg";
   dc:title "Plain literal with URIs";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0001.json>;
-  :informationResourceResults <test-cases/0001.sparql>;
+  :informationResourceInput <test-cases/rdf-0001.jsonld>;
+  :informationResourceResults <test-cases/rdf-0001.sparql>;
   :purpose "Tests generation of a triple using full URIs and a plain literal.";
   :specificationReference <http://json-ld.org/spec/latest/#plain-literals>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0002> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0002> dc:contributor "Gregg Kellogg";
   dc:title "Plain literal with CURIE from default context";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0002.json>;
-  :informationResourceResults <test-cases/0002.sparql>;
+  :informationResourceInput <test-cases/rdf-0002.jsonld>;
+  :informationResourceResults <test-cases/rdf-0002.sparql>;
   :purpose "Tests generation of a triple using a CURIE defined in the default context.";
   :specificationReference <http://json-ld.org/spec/latest/#iris>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0003> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0003> dc:contributor "Gregg Kellogg";
   dc:title "Default subject is BNode";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0003.json>;
-  :informationResourceResults <test-cases/0003.sparql>;
+  :informationResourceInput <test-cases/rdf-0003.jsonld>;
+  :informationResourceResults <test-cases/rdf-0003.sparql>;
   :purpose "Tests that a BNode is created if no explicit subject is set.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0004> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0004> dc:contributor "Gregg Kellogg";
   dc:title "Literal with language tag";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0004.json>;
-  :informationResourceResults <test-cases/0004.sparql>;
+  :informationResourceInput <test-cases/rdf-0004.jsonld>;
+  :informationResourceResults <test-cases/rdf-0004.sparql>;
   :purpose "Tests that a plain literal is created with a language tag.";
   :specificationReference <http://json-ld.org/spec/latest/#language-specification-in-plain-literals>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0005> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0005> dc:contributor "Gregg Kellogg";
   dc:title "Extended character set literal";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0005.json>;
-  :informationResourceResults <test-cases/0005.sparql>;
+  :informationResourceInput <test-cases/rdf-0005.jsonld>;
+  :informationResourceResults <test-cases/rdf-0005.sparql>;
   :purpose "Tests that a literal may be created using extended characters.";
   :specificationReference "";
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0006> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0006> dc:contributor "Gregg Kellogg";
   dc:title "Typed literal";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0006.json>;
-  :informationResourceResults <test-cases/0006.sparql>;
+  :informationResourceInput <test-cases/rdf-0006.jsonld>;
+  :informationResourceResults <test-cases/rdf-0006.sparql>;
   :purpose "Tests creation of a literal with a datatype.";
   :specificationReference <http://json-ld.org/spec/latest/#typed-literals>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0007> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0007> dc:contributor "Gregg Kellogg";
   dc:title "Tests 'a' generates rdf:type and object is implicit IRI";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0007.json>;
-  :informationResourceResults <test-cases/0007.sparql>;
+  :informationResourceInput <test-cases/rdf-0007.jsonld>;
+  :informationResourceResults <test-cases/rdf-0007.sparql>;
   :purpose "Verify that 'a' is an alias for rdf:type, and the object is created as an IRI.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0008> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0008> dc:contributor "Gregg Kellogg";
   dc:title "Test prefix defined in @context";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0008.json>;
-  :informationResourceResults <test-cases/0008.sparql>;
+  :informationResourceInput <test-cases/rdf-0008.jsonld>;
+  :informationResourceResults <test-cases/rdf-0008.sparql>;
   :purpose "Generate an IRI using a prefix defined within an @context.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0009> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0009> dc:contributor "Gregg Kellogg";
   dc:title "Test using default prefix";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0009.json>;
-  :informationResourceResults <test-cases/0009.sparql>;
+  :informationResourceInput <test-cases/rdf-0009.jsonld>;
+  :informationResourceResults <test-cases/rdf-0009.sparql>;
   :purpose "The empty string may be used to define the default prefix.";
   :specificationReference "";
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0010> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0010> dc:contributor "Gregg Kellogg";
   dc:title "Test object processing defines object";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0010.json>;
-  :informationResourceResults <test-cases/0010.sparql>;
+  :informationResourceInput <test-cases/rdf-0010.jsonld>;
+  :informationResourceResults <test-cases/rdf-0010.sparql>;
   :purpose "A property referencing an associative array gets object from subject of array.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0011> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0011> dc:contributor "Gregg Kellogg";
   dc:title "Test object processing defines object with implicit BNode";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0011.json>;
-  :informationResourceResults <test-cases/0011.sparql>;
+  :informationResourceInput <test-cases/rdf-0011.jsonld>;
+  :informationResourceResults <test-cases/rdf-0011.sparql>;
   :purpose "If no @ is specified, a BNode is created, and will be used as the object of an enclosing property.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0012> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0012> dc:contributor "Gregg Kellogg";
   dc:title "Multiple Objects for a Single Property";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0012.json>;
-  :informationResourceResults <test-cases/0012.sparql>;
+  :informationResourceInput <test-cases/rdf-0012.jsonld>;
+  :informationResourceResults <test-cases/rdf-0012.sparql>;
   :purpose "Tests that Multiple Objects are for a Single Property using array syntax.";
   :specificationReference <http://json-ld.org/spec/latest/#multiple-objects-for-a-single-property>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0013> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0013> dc:contributor "Gregg Kellogg";
   dc:title "Creation of an empty list";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :optional;
-  :informationResourceInput <test-cases/0013.json>;
-  :informationResourceResults <test-cases/0013.sparql>;
+  :informationResourceInput <test-cases/rdf-0013.jsonld>;
+  :informationResourceResults <test-cases/rdf-0013.sparql>;
   :purpose "Tests that [[]] generates an empty list.";
   :specificationReference "If the value is a regular array, should we support RDF List/Sequence generation of triples?";
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0014> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0014> dc:contributor "Gregg Kellogg";
   dc:title "Creation of a list with single element";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :optional;
-  :informationResourceInput <test-cases/0014.json>;
-  :informationResourceResults <test-cases/0014.sparql>;
+  :informationResourceInput <test-cases/rdf-0014.jsonld>;
+  :informationResourceResults <test-cases/rdf-0014.sparql>;
   :purpose "Tests that [[a]] generates list.";
   :specificationReference "If the value is a regular array, should we support RDF List/Sequence generation of triples?";
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0015> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0015> dc:contributor "Gregg Kellogg";
   dc:title "Creation of a list with multiple elements";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :optional;
-  :informationResourceInput <test-cases/0015.json>;
-  :informationResourceResults <test-cases/0015.sparql>;
+  :informationResourceInput <test-cases/rdf-0015.jsonld>;
+  :informationResourceResults <test-cases/rdf-0015.sparql>;
   :purpose "Tests that list with multiple elements.";
   :specificationReference "If the value is a regular array, should we support RDF List/Sequence generation of triples?";
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0016> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0016> dc:contributor "Gregg Kellogg";
   dc:title "Test @base";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0016.json>;
-  :informationResourceResults <test-cases/0016.sparql>;
+  :informationResourceInput <test-cases/rdf-0016.jsonld>;
+  :informationResourceResults <test-cases/rdf-0016.sparql>;
   :purpose "Tests using @base in @context for IRI processing.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0017> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0017> dc:contributor "Gregg Kellogg";
   dc:title "Test @vocab";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0017.json>;
-  :informationResourceResults <test-cases/0017.sparql>;
+  :informationResourceInput <test-cases/rdf-0017.jsonld>;
+  :informationResourceResults <test-cases/rdf-0017.sparql>;
   :purpose "Tests using @vocab in @context for IRI processing.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0018> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0018> dc:contributor "Gregg Kellogg";
   dc:title "Test @base and @vocab together";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0018.json>;
-  :informationResourceResults <test-cases/0018.sparql>;
+  :informationResourceInput <test-cases/rdf-0018.jsonld>;
+  :informationResourceResults <test-cases/rdf-0018.sparql>;
   :purpose "Tests using @base and @vocab in @context for IRI processing.";
   :specificationReference <http://json-ld.org/spec/latest/#the-json-ld-processing-algorithm>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0019> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0019> dc:contributor "Gregg Kellogg";
   dc:title "Test type coercion to anyURI";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0019.json>;
-  :informationResourceResults <test-cases/0019.sparql>;
+  :informationResourceInput <test-cases/rdf-0019.jsonld>;
+  :informationResourceResults <test-cases/rdf-0019.sparql>;
   :purpose "Tests coercion of object to anyURI when specified.";
   :specificationReference <http://json-ld.org/spec/latest/#type-coercion>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0020> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0020> dc:contributor "Gregg Kellogg";
   dc:title "Test type coercion to typed literal";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0020.json>;
-  :informationResourceResults <test-cases/0020.sparql>;
+  :informationResourceInput <test-cases/rdf-0020.jsonld>;
+  :informationResourceResults <test-cases/rdf-0020.sparql>;
   :purpose "Tests coercion of object to a typed literal when specified.";
   :specificationReference <http://json-ld.org/spec/latest/#type-coercion>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0021> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0021> dc:contributor "Gregg Kellogg";
   dc:title "Test coercion of decimal value";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :buggy;
-  :informationResourceInput <test-cases/0021.json>;
-  :informationResourceResults <test-cases/0021.sparql>;
+  :informationResourceInput <test-cases/rdf-0021.jsonld>;
+  :informationResourceResults <test-cases/rdf-0021.sparql>;
   :purpose "Tests that a decimal value generates a xsd:decimal typed literal (buggy test).";
   :specificationReference <http://json-ld.org/spec/latest/#automatic-typing>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0022> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0022> dc:contributor "Gregg Kellogg";
   dc:title "Test coercion of double value";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0022.json>;
-  :informationResourceResults <test-cases/0022.sparql>;
+  :informationResourceInput <test-cases/rdf-0022.jsonld>;
+  :informationResourceResults <test-cases/rdf-0022.sparql>;
   :purpose "Tests that a decimal value generates a xsd:double typed literal;.";
   :specificationReference <http://json-ld.org/spec/latest/#automatic-typing>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0023> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0023> dc:contributor "Gregg Kellogg";
   dc:title "Test coercion of integer value";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0023.json>;
-  :informationResourceResults <test-cases/0023.sparql>;
+  :informationResourceInput <test-cases/rdf-0023.jsonld>;
+  :informationResourceResults <test-cases/rdf-0023.sparql>;
   :purpose "Tests that a decimal value generates a xsd:integer typed literal.";
   :specificationReference <http://json-ld.org/spec/latest/#automatic-typing>;
   :expectedResults "true"^^xsd:boolean .
 
-<test-cases/0024> dc:contributor "Gregg Kellogg";
+<test-cases/rdf-0024> dc:contributor "Gregg Kellogg";
   dc:title "Test coercion of boolean value";
-  a :TestCase;
+  a :TestCase, jld:SPARQLTest;
   :classification :required;
-  :informationResourceInput <test-cases/0024.json>;
-  :informationResourceResults <test-cases/0024.sparql>;
+  :informationResourceInput <test-cases/rdf-0024.jsonld>;
+  :informationResourceResults <test-cases/rdf-0024.sparql>;
   :purpose "Tests that a decimal value generates a xsd:boolean typed literal.";
   :specificationReference <http://json-ld.org/spec/latest/#automatic-typing>;
   :expectedResults "true"^^xsd:boolean .
--- a/test-suite/tests/rdf-0001.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0001.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,4 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
+  "@subject": "http://greggkellogg.net/foaf#me",
   "http://xmlns.com/foaf/0.1/name": "Gregg Kellogg"
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0002.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0002.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,4 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
+  "@subject": "http://greggkellogg.net/foaf#me",
   "foaf:name": "Gregg Kellogg"
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0003.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0003.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,1 +1,1 @@
-{ "a": "foaf:Person" }
\ No newline at end of file
+{ "@type": "foaf:Person" }
\ No newline at end of file
--- a/test-suite/tests/rdf-0004.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0004.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,3 +1,6 @@
 {
-  "rdfs:label": {"@literal": "A plain literal with a lang tag.", "@language": "en-us"}
+  "http://www.w3.org/2000/01/rdf-schema#label": {
+    "@literal": "A plain literal with a lang tag.",
+    "@language": "en-us"
+  }
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0005.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0005.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,9 +1,9 @@
 [
   {
     "@": "http://greggkellogg.net/foaf#me",
-    "foaf:knows": {"@iri": "http://www.ivan-herman.net/foaf#me"}
+    "http://xmlns.com/foaf/0.1/knows": {"@iri": "http://www.ivan-herman.net/foaf#me"}
   },{
     "@": "http://www.ivan-herman.net/foaf#me",
-    "foaf:name": {"@literal": "Herman Iván", "@language": "hu"}
+    "http://xmlns.com/foaf/0.1/name": {"@literal": "Herman Iván", "@language": "hu"}
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/rdf-0006.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0006.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,7 @@
 {
-  "@":  "http://greggkellogg.net/foaf#me",
-  "dcterms:created":  {"@literal": "1957-02-27", "@datatype": "xsd:date"}
+  "@subject":  "http://greggkellogg.net/foaf#me",
+  "http://purl.org/dc/terms/created":  {
+    "@literal": "1957-02-27",
+    "@datatype": "http://www.w3.org/2001/XMLSchema#date"
+  }
 }
--- a/test-suite/tests/rdf-0006.sparql	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0006.sparql	Sat Aug 06 16:12:47 2011 -0700
@@ -1,6 +1,6 @@
-PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX dc: <http://purl.org/dc/terms/>
 PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> dcterms:created "1957-02-27"^^xsd:date
+  <http://greggkellogg.net/foaf#me> dc:created "1957-02-27"^^xsd:date
 }
--- a/test-suite/tests/rdf-0007.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0007.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,4 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
-  "a": "foaf:Person"
+  "@subject": "http://greggkellogg.net/foaf#me",
+  "@type": "http://xmlns.com/foaf/0.1/Person"
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0010.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0010.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,7 +1,10 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
+  "@context": {
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "@subject": "http://greggkellogg.net/foaf#me",
   "foaf:knows": {
-    "@": "http://www.ivan-herman.net/foaf#me",
+    "@subject": "http://www.ivan-herman.net/foaf#me",
     "foaf:name": "Ivan Herman"
   }
 }
--- a/test-suite/tests/rdf-0011.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0011.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,5 +1,8 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
+  "@context": {
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "@subject": "http://greggkellogg.net/foaf#me",
   "foaf:knows": {
     "foaf:name": "Manu Sporny"
   }
--- a/test-suite/tests/rdf-0012.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0012.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,7 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
-  "foaf:knows": ["Manu Sporny", "Ivan Herman"]
+  "@context": {
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "@subject": "http://greggkellogg.net/foaf#me",
+  "foaf:knows": ["Manu Sporny", "Dave Longley"]
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0012.sparql	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0012.sparql	Sat Aug 06 16:12:47 2011 -0700
@@ -1,5 +1,5 @@
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> foaf:knows "Manu Sporny", "Ivan Herman" .
+  <http://greggkellogg.net/foaf#me> foaf:knows "Manu Sporny", "Dave Longley" .
 }
--- a/test-suite/tests/rdf-0013.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0013.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,7 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
-  "foaf:knows": [[]]
+  "@context": {
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "@subject": "http://greggkellogg.net/foaf#me",
+  "foaf:knows": {"@list": []}
 }
--- a/test-suite/tests/rdf-0014.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0014.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,7 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
-  "foaf:knows": [["Manu Sporny"]]
+  "@context": {
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "@subject": "http://greggkellogg.net/foaf#me",
+  "foaf:knows": {"@list": ["Manu Sporny"]}
 }
--- a/test-suite/tests/rdf-0015.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0015.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,4 +1,7 @@
 {
-  "@": "http://greggkellogg.net/foaf#me",
-  "foaf:knows": [["Manu Sporny", "Ivan Herman"]]
+  "@context": {
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "@subject": "http://greggkellogg.net/foaf#me",
+  "foaf:knows": {"@list": ["Manu Sporny", "Dave Longley"]}
 }
--- a/test-suite/tests/rdf-0015.sparql	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0015.sparql	Sat Aug 06 16:12:47 2011 -0700
@@ -1,5 +1,5 @@
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> foaf:knows ("Manu Sporny" "Ivan Herman") .
+  <http://greggkellogg.net/foaf#me> foaf:knows ("Manu Sporny" "Dave Longley") .
 }
--- a/test-suite/tests/rdf-0016.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0016.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,7 +1,8 @@
 {
   "@context": {
-    "@base":  "http://greggkellogg.net/foaf"
+    "@base":  "http://greggkellogg.net/foaf",
+    "foaf": "http://xmlns.com/foaf/0.1/"
   },
-  "@":  "#me",
-  "doap:homepage":  {"@iri": "http://github.com/gkellogg/"}
+  "@subject":  "#me",
+  "foaf:homepage":  {"@iri": "http://github.com/gkellogg/"}
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0016.sparql	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0016.sparql	Sat Aug 06 16:12:47 2011 -0700
@@ -1,6 +1,6 @@
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX doap: <http://usefulinc.com/ns/doap#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> doap:homepage <http://github.com/gkellogg/>
+  <http://greggkellogg.net/foaf#me> foaf:homepage <http://github.com/gkellogg/>
 }
\ No newline at end of file
--- a/test-suite/tests/rdf-0017.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0017.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -2,6 +2,6 @@
   "@context": {
     "@vocab": "http://usefulinc.com/ns/doap#"
   },
-  "@":  "http://greggkellogg.net/foaf#me",
+  "@subject":  "http://greggkellogg.net/foaf#me",
   "homepage":  {"@iri": "http://github.com/gkellogg/"}
 }
--- a/test-suite/tests/rdf-0018.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0018.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -3,6 +3,6 @@
     "@base":  "http://greggkellogg.net/foaf",
     "@vocab": "http://usefulinc.com/ns/doap#"
   },
-  "@":  "#me",
+  "@subject":  "#me",
   "homepage":  {"@iri": "http://github.com/gkellogg/"}
 }
--- a/test-suite/tests/rdf-0019.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0019.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,7 +1,8 @@
 {
   "@context": {
-    "@coerce":  { "xsd:anyURI": "foaf:knows"}
+    "foaf": "http://xmlns.com/foaf/0.1/",
+    "@coerce":  { "@iri": "foaf:knows"}
   },
-  "@":  "http://greggkellogg.net/foaf#me",
+  "@subject":  "http://greggkellogg.net/foaf#me",
   "foaf:knows":  "http://www.ivan-herman.net/foaf#me"
 }
--- a/test-suite/tests/rdf-0020.jsonld	Sat Aug 06 16:12:31 2011 -0700
+++ b/test-suite/tests/rdf-0020.jsonld	Sat Aug 06 16:12:47 2011 -0700
@@ -1,7 +1,8 @@
 {
   "@context": {
-    "@coerce":  { "xsd:date": "dcterms:created"}
+    "dc": "http://purl.org/dc/terms/",
+    "@coerce":  { "xsd:date": "dc:created"}
   },
-  "@":  "http://greggkellogg.net/foaf#me",
-  "dcterms:created":  "1957-02-27"
+  "@subject":  "http://greggkellogg.net/foaf#me",
+  "dc:created":  "1957-02-27"
 }