Added property URI generation variations
authorGregg Kellogg <gregg@kellogg-assoc.com>
Tue, 11 Sep 2012 17:30:07 -0700
changeset 134 b6604f21ccb0
parent 133 133f8ea227b5
child 135 6633ab65ac76
Added property URI generation variations
f
microdata-rdf/tests/0046.html
microdata-rdf/tests/0046.ttl
microdata-rdf/tests/0047.html
microdata-rdf/tests/0047.ttl
microdata-rdf/tests/0048.html
microdata-rdf/tests/0048.ttl
microdata-rdf/tests/0049.html
microdata-rdf/tests/0049.ttl
microdata-rdf/tests/0050.html
microdata-rdf/tests/0050.ttl
microdata-rdf/tests/0051.html
microdata-rdf/tests/0051.ttl
microdata-rdf/tests/0052.html
microdata-rdf/tests/0052.ttl
microdata-rdf/tests/0053.html
microdata-rdf/tests/0053.ttl
microdata-rdf/tests/0054.html
microdata-rdf/tests/0054.ttl
microdata-rdf/tests/0055.html
microdata-rdf/tests/0055.ttl
microdata-rdf/tests/0056.html
microdata-rdf/tests/0056.ttl
microdata-rdf/tests/0057.html
microdata-rdf/tests/0057.ttl
microdata-rdf/tests/0058.html
microdata-rdf/tests/0058.ttl
microdata-rdf/tests/0059.html
microdata-rdf/tests/0059.ttl
microdata-rdf/tests/0060.html
microdata-rdf/tests/0060.ttl
microdata-rdf/tests/0061.html
microdata-rdf/tests/0061.ttl
microdata-rdf/tests/index.html
microdata-rdf/tests/manifest.jsonld
microdata-rdf/tests/manifest.ttl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0046.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope="" itemtype="http://schema.org/Thing">
+  <time itemprop="time" datetime="00:00:00Z">midnight</time>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0046.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,7 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
[email protected] xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0046.html> md:item ([ a schema:Thing;
+       schema:time "00:00:00Z"^^xsd:time]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0047.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope="" itemtype="http://schema.org/Thing">
+  <time itemprop="time" datetime="2011-06-28T00:00:00Z">28 June 2011 at midnight</time>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0047.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,7 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
[email protected] xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0047.html> md:item ([ a schema:Thing;
+       schema:time "2011-06-28T00:00:00Z"^^xsd:dateTime]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0048.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope="" itemtype="http://schema.org/Thing">
+  <time itemprop="time" datetime="P2011Y06M28DT00H00M00S">2011 years 6 months 28 days</time>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0048.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,7 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
[email protected] xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0048.html> md:item ([ a schema:Thing;
+       schema:time "P2011Y06M28DT00H00M00S"^^xsd:duration]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0049.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope="" itemtype="http://schema.org/Thing">
+  <time itemprop="time" datetime="foo">28 June 2011</time>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0049.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,6 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0049.html> md:item ([ a schema:Thing;
+       schema:time "foo"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0050.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope="" itemtype="http://schema.org/Thing">
+  <a itemprop="a" href="foo"></a>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0050.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,6 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0050.html> md:item ([ a schema:Thing;
+       schema:a <http://www.w3.org/TR/microdata-rdf/tests/foo>]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0051.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope="" itemid="subj" itemtype="http://schema.org/Thing">
+  <span itemprop="name">@itemid test</span>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0051.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,8 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0051.html> md:item (<http://www.w3.org/TR/microdata-rdf/tests/subj>) .
+
+<http://www.w3.org/TR/microdata-rdf/tests/subj> a schema:Thing;
+   schema:name "@itemid test" .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0052.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope>
+  <p id="a">Name: <span itemprop="name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0052.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,5 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0052.html> md:item (
+  [ <http://www.w3.org/TR/microdata-rdf/tests/0052.html#name> "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0053.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="">
+  <p id="a">Name: <span itemprop="name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0053.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,5 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0053.html> md:item (
+  [ <http://www.w3.org/TR/microdata-rdf/tests/0053.html#name> "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0054.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="Person">
+  <p id="a">Name: <span itemprop="name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0054.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,5 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0054.html> md:item (
+  [ <http://www.w3.org/TR/microdata-rdf/tests/0054.html#name> "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0055.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="http://schema.org/Person">
+  <p id="a">Name: <span itemprop="name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0055.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,7 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0055.html> md:item (
+  [ a schema:Person;
+    schema:name "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0056.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="http://schema.org/Person http://xmlns.com/foaf/0.1/Person">
+  <p id="a">Name: <span itemprop="name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0056.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,8 @@
[email protected] foaf: <http://xmlns.com/foaf/0.1/> .
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0056.html> md:item (
+  [ a schema:Person, foaf:Person;
+    schema:name "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0057.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope>
+  <p id="a">Name: <span itemprop="http://schema.org/name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0057.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,6 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0057.html> md:item (
+  [ schema:name "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0058.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="">
+  <p id="a">Name: <span itemprop="http://schema.org/name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0058.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,6 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0058.html> md:item (
+  [ schema:name "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0059.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="Person">
+  <p id="a">Name: <span itemprop="http://schema.org/name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0059.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,6 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0059.html> md:item (
+  [ schema:name "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0060.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope itemtype="http://schema.org/Person">
+  <p id="a">Name: <span itemprop="http://schema.org/name">Amanda</span></p>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0060.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,7 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0060.html> md:item (
+  [ a schema:Person;
+    schema:name "Amanda"]) .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0061.html	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<div itemscope itemtype="http://schema.org/Person">
+  <p>Name: <span itemprop="name">Gregg</span></p>
+  <div itemprop="knows" itemscope="">
+    <p id="a">Name: <span itemprop="name">Jeni</span></p>
+  </div>
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0061.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -0,0 +1,8 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] schema: <http://schema.org/> .
+
+<http://www.w3.org/TR/microdata-rdf/tests/0061.html> md:item (
+  [ a schema:Person;
+    schema:knows [ schema:name "Jeni"];
+    schema:name "Gregg"]) .
--- a/microdata-rdf/tests/index.html	Tue Sep 11 17:09:32 2012 -0700
+++ b/microdata-rdf/tests/index.html	Tue Sep 11 17:30:07 2012 -0700
@@ -1169,6 +1169,206 @@
 </div>
 <!-- End Test Description -->
 
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0052</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >token property no @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0052.html">input</a> |
+    <a itemprop="query" href="0052.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0053</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >token property empty @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0053.html">input</a> |
+    <a itemprop="query" href="0053.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0054</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >token property and relative @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0054.html">input</a> |
+    <a itemprop="query" href="0054.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0055</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >token property and single @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0055.html">input</a> |
+    <a itemprop="query" href="0055.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0056</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >token property and multiple @itemtypes from different vocabularies</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0056.html">input</a> |
+    <a itemprop="query" href="0056.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0057</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >URI property no @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0057.html">input</a> |
+    <a itemprop="query" href="0057.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0058</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >URI property empty @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0058.html">input</a> |
+    <a itemprop="query" href="0058.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0059</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >URI property relative @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0059.html">input</a> |
+    <a itemprop="query" href="0059.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0060</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >URI property single @itemtype</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0060.html">input</a> |
+    <a itemprop="query" href="0060.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
+<!-- Start Test Description -->
+<div itemprop="entries"
+     itemscope="true"
+     itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry"
+     class="test-entry">
+  <span itemprop="name">Test 0061</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >inherited type and token property</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0061.html">input</a> |
+    <a itemprop="query" href="0061.ttl">query</a>
+  </span>
+  <meta itemprop="result" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
 </section>
 
 <section id="negative-tests"
--- a/microdata-rdf/tests/manifest.jsonld	Tue Sep 11 17:09:32 2012 -0700
+++ b/microdata-rdf/tests/manifest.jsonld	Tue Sep 11 17:30:07 2012 -0700
@@ -27,15 +27,15 @@
   },
   "@graph": [
     {
-      "@id": "_:x7",
+      "@id": "_:y2",
       "@type": "mf:Manifest",
       "comment": "Positive processor tests",
       "entries": [
         {
-          "@id": "_:x8",
+          "@id": "_:u8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac8",
+            "@id": "_:u9",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0001.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0001.ttl"
@@ -45,10 +45,10 @@
           "result": "true"
         },
         {
-          "@id": "_:u0",
+          "@id": "_:v7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u1",
+            "@id": "_:v8",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0002.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0002.ttl"
@@ -58,10 +58,10 @@
           "result": "true"
         },
         {
-          "@id": "_:u5",
+          "@id": "_:w4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u6",
+            "@id": "_:w5",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0003.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0003.ttl"
@@ -71,10 +71,10 @@
           "result": "true"
         },
         {
-          "@id": "_:v3",
+          "@id": "_:x0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v4",
+            "@id": "_:x1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0004.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0004.ttl"
@@ -87,7 +87,7 @@
           "@id": "_:x9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad2",
+            "@id": "_:y0",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0005.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0005.ttl"
@@ -97,10 +97,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y0",
+          "@id": "_:y3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w0",
+            "@id": "_:ac3",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0006.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0006.ttl"
@@ -110,10 +110,10 @@
           "result": "true"
         },
         {
-          "@id": "_:w5",
+          "@id": "_:y4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w6",
+            "@id": "_:ac5",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0007.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0007.ttl"
@@ -123,10 +123,10 @@
           "result": "true"
         },
         {
-          "@id": "_:x2",
+          "@id": "_:y5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x3",
+            "@id": "_:ac9",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0008.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0008.ttl"
@@ -136,10 +136,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y1",
+          "@id": "_:y6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa7",
+            "@id": "_:ad4",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0009.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0009.ttl"
@@ -149,10 +149,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y2",
+          "@id": "_:y7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab1",
+            "@id": "_:ad8",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0010.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0010.ttl"
@@ -162,10 +162,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y3",
+          "@id": "_:y8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab5",
+            "@id": "_:ae3",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0011.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0011.ttl"
@@ -175,10 +175,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y4",
+          "@id": "_:y9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab8",
+            "@id": "_:ae5",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0012.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0012.ttl"
@@ -188,10 +188,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y5",
+          "@id": "_:z0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac2",
+            "@id": "_:af2",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0013.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0013.ttl"
@@ -201,10 +201,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y6",
+          "@id": "_:z1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac4",
+            "@id": "_:ae6",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0014.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0014.ttl"
@@ -214,10 +214,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y7",
+          "@id": "_:z2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac0",
+            "@id": "_:ae1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0015.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0015.ttl"
@@ -227,10 +227,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y8",
+          "@id": "_:z3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab7",
+            "@id": "_:ad7",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_1.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_1.ttl"
@@ -241,10 +241,10 @@
           "result": "true"
         },
         {
-          "@id": "_:y9",
+          "@id": "_:z4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab2",
+            "@id": "_:ad2",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_2.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_2.ttl"
@@ -255,10 +255,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z0",
+          "@id": "_:z5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa9",
+            "@id": "_:ac7",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_3.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_3.ttl"
@@ -269,10 +269,10 @@
           "result": "true"
         },
         {
-          "@id": "_:x6",
+          "@id": "_:z6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x1",
+            "@id": "_:ac2",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_4.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_4.ttl"
@@ -283,10 +283,10 @@
           "result": "true"
         },
         {
-          "@id": "_:w8",
+          "@id": "_:y1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w3",
+            "@id": "_:x5",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_5.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_5.ttl"
@@ -297,10 +297,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z1",
+          "@id": "_:w8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad1",
+            "@id": "_:w9",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_6.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_6.ttl"
@@ -311,10 +311,10 @@
           "result": "true"
         },
         {
-          "@id": "_:v9",
+          "@id": "_:w3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v7",
+            "@id": "_:w1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_7.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_7.ttl"
@@ -325,10 +325,10 @@
           "result": "true"
         },
         {
-          "@id": "_:v1",
+          "@id": "_:v5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u9",
+            "@id": "_:v3",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_8.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_8.ttl"
@@ -339,10 +339,10 @@
           "result": "true"
         },
         {
-          "@id": "_:u3",
+          "@id": "_:u7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t7",
+            "@id": "_:u5",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_9.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_9.ttl"
@@ -353,10 +353,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z2",
+          "@id": "_:u0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac7",
+            "@id": "_:t8",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_10.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_10.ttl"
@@ -367,10 +367,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z3",
+          "@id": "_:t2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac5",
+            "@id": "_:t3",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.ttl"
@@ -381,10 +381,10 @@
           "result": "true"
         },
         {
-          "@id": "_:t4",
+          "@id": "_:z7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t3",
+            "@id": "_:t1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_12.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_12.ttl"
@@ -395,10 +395,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z4",
+          "@id": "_:z8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t0",
+            "@id": "_:ae8",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.ttl"
@@ -409,10 +409,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z5",
+          "@id": "_:z9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac1",
+            "@id": "_:ae2",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.ttl"
@@ -423,10 +423,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z6",
+          "@id": "_:aa0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab6",
+            "@id": "_:ad6",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.ttl"
@@ -437,10 +437,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z7",
+          "@id": "_:aa1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab3",
+            "@id": "_:ad1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_16.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_16.ttl"
@@ -451,10 +451,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z8",
+          "@id": "_:aa2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa8",
+            "@id": "_:ac6",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_17.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_17.ttl"
@@ -465,10 +465,10 @@
           "result": "true"
         },
         {
-          "@id": "_:x4",
+          "@id": "_:aa3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w9",
+            "@id": "_:ac0",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_18.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_18.ttl"
@@ -479,10 +479,10 @@
           "result": "true"
         },
         {
-          "@id": "_:w4",
+          "@id": "_:x7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w1",
+            "@id": "_:x3",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_19.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_19.ttl"
@@ -493,10 +493,10 @@
           "result": "true"
         },
         {
-          "@id": "_:z9",
+          "@id": "_:aa4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac9",
+            "@id": "_:af1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_20.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_20.ttl"
@@ -507,10 +507,10 @@
           "result": "true"
         },
         {
-          "@id": "_:v6",
+          "@id": "_:w0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v2",
+            "@id": "_:v6",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_21.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_21.ttl"
@@ -521,10 +521,10 @@
           "result": "true"
         },
         {
-          "@id": "_:u7",
+          "@id": "_:v1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u4",
+            "@id": "_:v0",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_22.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_22.ttl"
@@ -535,10 +535,10 @@
           "result": "true"
         },
         {
-          "@id": "_:t8",
+          "@id": "_:u3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t9",
+            "@id": "_:u2",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_23.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_23.ttl"
@@ -549,10 +549,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa0",
+          "@id": "_:t7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac6",
+            "@id": "_:t6",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.ttl"
@@ -563,10 +563,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa1",
+          "@id": "_:aa5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t5",
+            "@id": "_:af0",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.ttl"
@@ -577,10 +577,10 @@
           "result": "true"
         },
         {
-          "@id": "_:t2",
+          "@id": "_:aa6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t1",
+            "@id": "_:ae9",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_26.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_26.ttl"
@@ -591,10 +591,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa2",
+          "@id": "_:aa7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac3",
+            "@id": "_:ae4",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_27.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_27.ttl"
@@ -605,10 +605,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa3",
+          "@id": "_:aa8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab9",
+            "@id": "_:ad9",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_28.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_28.ttl"
@@ -619,10 +619,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa4",
+          "@id": "_:aa9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab4",
+            "@id": "_:ad3",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_29.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_29.ttl"
@@ -633,10 +633,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa5",
+          "@id": "_:ab0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab0",
+            "@id": "_:ac8",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_30.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_30.ttl"
@@ -647,10 +647,10 @@
           "result": "true"
         },
         {
-          "@id": "_:x5",
+          "@id": "_:ab1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x0",
+            "@id": "_:ac1",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0046.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0046.ttl"
@@ -660,10 +660,10 @@
           "result": "true"
         },
         {
-          "@id": "_:w7",
+          "@id": "_:x8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w2",
+            "@id": "_:x4",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0047.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0047.ttl"
@@ -673,10 +673,10 @@
           "result": "true"
         },
         {
-          "@id": "_:aa6",
+          "@id": "_:w6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad0",
+            "@id": "_:w7",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0048.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0048.ttl"
@@ -686,10 +686,10 @@
           "result": "true"
         },
         {
-          "@id": "_:v8",
+          "@id": "_:w2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v5",
+            "@id": "_:v9",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0049.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0049.ttl"
@@ -699,10 +699,10 @@
           "result": "true"
         },
         {
-          "@id": "_:v0",
+          "@id": "_:v4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u8",
+            "@id": "_:v2",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0050.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0050.ttl"
@@ -712,10 +712,10 @@
           "result": "true"
         },
         {
-          "@id": "_:u2",
+          "@id": "_:u6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t6",
+            "@id": "_:u4",
             "@type": "mq:QueryTest",
             "data": "http://www.w3.org/TR/microdata-rdf/tests/0051.html",
             "query": "http://www.w3.org/TR/microdata-rdf/tests/0051.ttl"
@@ -723,6 +723,136 @@
           "comment": "relative URL as itemid",
           "name": "Test 0051",
           "result": "true"
+        },
+        {
+          "@id": "_:u1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0052.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0052.ttl"
+          },
+          "comment": "token property no @itemtype",
+          "name": "Test 0052",
+          "result": "true"
+        },
+        {
+          "@id": "_:t4",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t5",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0053.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0053.ttl"
+          },
+          "comment": "token property empty @itemtype",
+          "name": "Test 0053",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab2",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:t0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0054.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0054.ttl"
+          },
+          "comment": "token property and relative @itemtype",
+          "name": "Test 0054",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ae7",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0055.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0055.ttl"
+          },
+          "comment": "token property and single @itemtype",
+          "name": "Test 0055",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab4",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ae0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0056.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0056.ttl"
+          },
+          "comment": "token property and multiple @itemtypes from different vocabularies",
+          "name": "Test 0056",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab5",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ad5",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0057.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0057.ttl"
+          },
+          "comment": "URI property no @itemtype",
+          "name": "Test 0057",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab6",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ad0",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0058.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0058.ttl"
+          },
+          "comment": "URI property empty @itemtype",
+          "name": "Test 0058",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab7",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ac4",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0059.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0059.ttl"
+          },
+          "comment": "URI property relative @itemtype",
+          "name": "Test 0059",
+          "result": "true"
+        },
+        {
+          "@id": "_:ab8",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ab9",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0060.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0060.ttl"
+          },
+          "comment": "URI property single @itemtype",
+          "name": "Test 0060",
+          "result": "true"
+        },
+        {
+          "@id": "_:x6",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:x2",
+            "@type": "mq:QueryTest",
+            "data": "http://www.w3.org/TR/microdata-rdf/tests/0061.html",
+            "query": "http://www.w3.org/TR/microdata-rdf/tests/0061.ttl"
+          },
+          "comment": "inherited type and token property",
+          "name": "Test 0061",
+          "result": "true"
         }
       ]
     }
--- a/microdata-rdf/tests/manifest.ttl	Tue Sep 11 17:09:32 2012 -0700
+++ b/microdata-rdf/tests/manifest.ttl	Tue Sep 11 17:30:07 2012 -0700
@@ -341,4 +341,64 @@
              mq:data <0051.html>;
              mq:query <0051.ttl>];
            mf:name "Test 0051";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "token property no @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0052.html>;
+             mq:query <0052.ttl>];
+           mf:name "Test 0052";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "token property empty @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0053.html>;
+             mq:query <0053.ttl>];
+           mf:name "Test 0053";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "token property and relative @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0054.html>;
+             mq:query <0054.ttl>];
+           mf:name "Test 0054";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "token property and single @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0055.html>;
+             mq:query <0055.ttl>];
+           mf:name "Test 0055";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "token property and multiple @itemtypes from different vocabularies";
+           mf:action [ a mq:QueryTest;
+             mq:data <0056.html>;
+             mq:query <0056.ttl>];
+           mf:name "Test 0056";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "URI property no @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0057.html>;
+             mq:query <0057.ttl>];
+           mf:name "Test 0057";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "URI property empty @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0058.html>;
+             mq:query <0058.ttl>];
+           mf:name "Test 0058";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "URI property relative @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0059.html>;
+             mq:query <0059.ttl>];
+           mf:name "Test 0059";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "URI property single @itemtype";
+           mf:action [ a mq:QueryTest;
+             mq:data <0060.html>;
+             mq:query <0060.ttl>];
+           mf:name "Test 0060";
+           mf:result "true"] [ a mf:ManifestEntry;
+           rdfs:comment "inherited type and token property";
+           mf:action [ a mq:QueryTest;
+             mq:data <0061.html>;
+             mq:query <0061.ttl>];
+           mf:name "Test 0061";
            mf:result "true"])]) .