Added vocabulary expansion tests
authorGregg Kellogg <gregg@kellogg-assoc.com>
Wed, 19 Sep 2012 22:37:43 -0700
changeset 145 59b95335e52b
parent 144 3b49c3d0d305
child 146 461b60f5934e
Added vocabulary expansion tests
f
microdata-rdf/tests/0073.html
microdata-rdf/tests/0073.ttl
microdata-rdf/tests/0074.html
microdata-rdf/tests/0074.ttl
microdata-rdf/tests/add-test.rb
microdata-rdf/tests/index.html
microdata-rdf/tests/manifest.jsonld
microdata-rdf/tests/manifest.ttl
microdata-rdf/tests/test-registry.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0073.html	Wed Sep 19 22:37:43 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope='' itemtype='http://expansion/MainType'>
+  <link itemprop='subPropertyOf' href='http://expansion/AdditionalType' />
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0073.ttl	Wed Sep 19 22:37:43 2012 -0700
@@ -0,0 +1,12 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] rdfa: <http://www.w3.org/ns/rdfa#> .
[email protected] rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+
+<0073.html> md:item (
+  [ a <http://expansion/MainType>, <http://expansion/AdditionalType>;
+    <http://expansion/subPropertyOf> <http://expansion/AdditionalType>
+  ]);
+  rdfa:usesVocabulary <http://expansion/> .
+
+<http://expansion/subPropertyOf> rdfs:subPropertyOf rdf:type .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0074.html	Wed Sep 19 22:37:43 2012 -0700
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div itemscope='' itemtype='http://expansion/MainType'>
+  <link itemprop='equivalentProperty' href='http://expansion/AdditionalType' />
+</div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/microdata-rdf/tests/0074.ttl	Wed Sep 19 22:37:43 2012 -0700
@@ -0,0 +1,13 @@
[email protected] md: <http://www.w3.org/ns/md#> .
[email protected] owl: <http://www.w3.org/2002/07/owl#> .
[email protected] rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
[email protected] rdfa: <http://www.w3.org/ns/rdfa#> .
+
+<0074.html> md:item (
+  [ a <http://expansion/MainType>, <http://expansion/AdditionalType>;
+    <http://expansion/equivalentProperty> <http://expansion/AdditionalType>,
+                                          <http://expansion/MainType>
+  ]);
+  rdfa:usesVocabulary <http://expansion/> .
+
+<http://expansion/equivalentProperty> owl:equivalentProperty rdf:type .
--- a/microdata-rdf/tests/add-test.rb	Wed Sep 19 17:53:00 2012 -0700
+++ b/microdata-rdf/tests/add-test.rb	Wed Sep 19 22:37:43 2012 -0700
@@ -75,7 +75,7 @@
         itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
     <a itemprop="data" href="#{data}">input</a>
   </span> |
-  <a itemprop="result" href="#{query}">result</a>
+  <a itemprop="result" href="#{result}">result</a>
   <meta itemprop="positiveTest" content="true"/>
   )
 </div>
--- a/microdata-rdf/tests/index.html	Wed Sep 19 17:53:00 2012 -0700
+++ b/microdata-rdf/tests/index.html	Wed Sep 19 22:37:43 2012 -0700
@@ -1590,6 +1590,46 @@
 </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 0073</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >Vocabulary Expansion test with rdfs:subPropertyOf</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0073.html">input</a>
+  </span> |
+  <a itemprop="result" href="0073.ttl">result</a>
+  <meta itemprop="positiveTest" 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 0074</span>:
+  <span itemprop="http://www.w3.org/2000/01/rdf-schema#comment"
+    >Vocabulary Expansion test with owl:equivalentProperty</span>
+  (
+  <span itemprop="action"
+        itemscope="true"
+        itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
+    <a itemprop="data" href="0074.html">input</a>
+  </span> |
+  <a itemprop="result" href="0074.ttl">result</a>
+  <meta itemprop="positiveTest" content="true"/>
+  )
+</div>
+<!-- End Test Description -->
+
 </section>
 
 <section id="negative-tests"
--- a/microdata-rdf/tests/manifest.jsonld	Wed Sep 19 17:53:00 2012 -0700
+++ b/microdata-rdf/tests/manifest.jsonld	Wed Sep 19 22:37:43 2012 -0700
@@ -27,15 +27,15 @@
   },
   "@graph": [
     {
-      "@id": "_:ag5",
+      "@id": "_:ag7",
       "@type": "mf:Manifest",
       "comment": "Positive processor tests",
       "entries": [
         {
-          "@id": "_:v4",
+          "@id": "_:u2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v5",
+            "@id": "_:u3",
             "@type": "mq:QueryTest",
             "data": "0001.html"
           },
@@ -45,10 +45,10 @@
           "result": "0001.ttl"
         },
         {
-          "@id": "_:w4",
+          "@id": "_:v2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w5",
+            "@id": "_:v3",
             "@type": "mq:QueryTest",
             "data": "0002.html"
           },
@@ -58,10 +58,10 @@
           "result": "0002.ttl"
         },
         {
-          "@id": "_:x0",
+          "@id": "_:z2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x1",
+            "@id": "_:z3",
             "@type": "mq:QueryTest",
             "data": "0003.html"
           },
@@ -71,10 +71,10 @@
           "result": "0003.ttl"
         },
         {
-          "@id": "_:z5",
+          "@id": "_:aa2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x8",
+            "@id": "_:aa3",
             "@type": "mq:QueryTest",
             "data": "0004.html"
           },
@@ -84,10 +84,10 @@
           "result": "0004.ttl"
         },
         {
-          "@id": "_:z8",
+          "@id": "_:aa9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z9",
+            "@id": "_:ab0",
             "@type": "mq:QueryTest",
             "data": "0005.html"
           },
@@ -97,10 +97,10 @@
           "result": "0005.ttl"
         },
         {
-          "@id": "_:z1",
+          "@id": "_:ab9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z2",
+            "@id": "_:ac0",
             "@type": "mq:QueryTest",
             "data": "0006.html"
           },
@@ -110,10 +110,10 @@
           "result": "0006.ttl"
         },
         {
-          "@id": "_:aa4",
+          "@id": "_:ac6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa5",
+            "@id": "_:ac7",
             "@type": "mq:QueryTest",
             "data": "0007.html"
           },
@@ -123,10 +123,10 @@
           "result": "0007.ttl"
         },
         {
-          "@id": "_:ab1",
+          "@id": "_:y6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab2",
+            "@id": "_:y7",
             "@type": "mq:QueryTest",
             "data": "0008.html"
           },
@@ -136,10 +136,10 @@
           "result": "0008.ttl"
         },
         {
-          "@id": "_:ac0",
+          "@id": "_:x6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac1",
+            "@id": "_:x7",
             "@type": "mq:QueryTest",
             "data": "0009.html"
           },
@@ -149,10 +149,10 @@
           "result": "0009.ttl"
         },
         {
-          "@id": "_:ad0",
+          "@id": "_:ae2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad1",
+            "@id": "_:x8",
             "@type": "mq:QueryTest",
             "data": "0010.html"
           },
@@ -162,10 +162,10 @@
           "result": "0010.ttl"
         },
         {
-          "@id": "_:ad6",
+          "@id": "_:ae9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad7",
+            "@id": "_:y3",
             "@type": "mq:QueryTest",
             "data": "0011.html"
           },
@@ -175,10 +175,10 @@
           "result": "0011.ttl"
         },
         {
-          "@id": "_:ae3",
+          "@id": "_:w8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae4",
+            "@id": "_:w9",
             "@type": "mq:QueryTest",
             "data": "0012.html"
           },
@@ -201,10 +201,10 @@
           "result": "0013.ttl"
         },
         {
-          "@id": "_:ag1",
+          "@id": "_:ag4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag2",
+            "@id": "_:ag5",
             "@type": "mq:QueryTest",
             "data": "0014.html"
           },
@@ -214,10 +214,10 @@
           "result": "0014.ttl"
         },
         {
-          "@id": "_:ag6",
+          "@id": "_:ag8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah4",
+            "@id": "_:ah8",
             "@type": "mq:QueryTest",
             "data": "0015.html"
           },
@@ -227,10 +227,10 @@
           "result": "0015.ttl"
         },
         {
-          "@id": "_:ag7",
+          "@id": "_:ag9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah1",
+            "@id": "_:ah4",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_1.html"
           },
@@ -241,10 +241,10 @@
           "result": "sdo_eg_md_1.ttl"
         },
         {
-          "@id": "_:af9",
+          "@id": "_:af8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:af6",
+            "@id": "_:af5",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_2.html"
           },
@@ -255,10 +255,10 @@
           "result": "sdo_eg_md_2.ttl"
         },
         {
-          "@id": "_:ae9",
+          "@id": "_:af1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae6",
+            "@id": "_:w7",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_3.html"
           },
@@ -269,10 +269,10 @@
           "result": "sdo_eg_md_3.ttl"
         },
         {
-          "@id": "_:ae0",
+          "@id": "_:ae7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad4",
+            "@id": "_:ae5",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_4.html"
           },
@@ -283,10 +283,10 @@
           "result": "sdo_eg_md_4.ttl"
         },
         {
-          "@id": "_:ac6",
+          "@id": "_:ad9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac4",
+            "@id": "_:ad6",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_5.html"
           },
@@ -297,10 +297,10 @@
           "result": "sdo_eg_md_5.ttl"
         },
         {
-          "@id": "_:ab9",
+          "@id": "_:ad3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab5",
+            "@id": "_:y5",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_6.html"
           },
@@ -311,10 +311,10 @@
           "result": "sdo_eg_md_6.ttl"
         },
         {
-          "@id": "_:aa9",
+          "@id": "_:ac9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa3",
+            "@id": "_:ac4",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_7.html"
           },
@@ -325,10 +325,10 @@
           "result": "sdo_eg_md_7.ttl"
         },
         {
-          "@id": "_:z3",
+          "@id": "_:ab7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z4",
+            "@id": "_:ab4",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_8.html"
           },
@@ -339,10 +339,10 @@
           "result": "sdo_eg_md_8.ttl"
         },
         {
-          "@id": "_:y1",
+          "@id": "_:aa7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:y2",
+            "@id": "_:aa4",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_9.html"
           },
@@ -353,10 +353,10 @@
           "result": "sdo_eg_md_9.ttl"
         },
         {
-          "@id": "_:x7",
+          "@id": "_:z7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x2",
+            "@id": "_:z4",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_10.html"
           },
@@ -367,10 +367,10 @@
           "result": "sdo_eg_md_10.ttl"
         },
         {
-          "@id": "_:w6",
+          "@id": "_:v5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w0",
+            "@id": "_:v0",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_11.html"
           },
@@ -381,10 +381,10 @@
           "result": "sdo_eg_md_11.ttl"
         },
         {
-          "@id": "_:v6",
+          "@id": "_:u5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v3",
+            "@id": "_:u0",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_12.html"
           },
@@ -395,10 +395,10 @@
           "result": "sdo_eg_md_12.ttl"
         },
         {
-          "@id": "_:u5",
+          "@id": "_:w6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u2",
+            "@id": "_:w3",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_13.html"
           },
@@ -409,7 +409,7 @@
           "result": "sdo_eg_md_13.ttl"
         },
         {
-          "@id": "_:t7",
+          "@id": "_:v8",
           "@type": "mf:ManifestEntry",
           "action": {
             "@id": "_:t3",
@@ -423,10 +423,10 @@
           "result": "sdo_eg_md_14.ttl"
         },
         {
-          "@id": "_:ag8",
+          "@id": "_:ah0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah2",
+            "@id": "_:ah5",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_15.html"
           },
@@ -437,7 +437,7 @@
           "result": "sdo_eg_md_15.ttl"
         },
         {
-          "@id": "_:ag0",
+          "@id": "_:ag1",
           "@type": "mf:ManifestEntry",
           "action": {
             "@id": "_:af7",
@@ -451,10 +451,10 @@
           "result": "sdo_eg_md_16.ttl"
         },
         {
-          "@id": "_:af0",
+          "@id": "_:x9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae7",
+            "@id": "_:y0",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_17.html"
           },
@@ -465,10 +465,10 @@
           "result": "sdo_eg_md_17.ttl"
         },
         {
-          "@id": "_:ae1",
+          "@id": "_:ae8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad5",
+            "@id": "_:ae6",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_18.html"
           },
@@ -479,10 +479,10 @@
           "result": "sdo_eg_md_18.ttl"
         },
         {
-          "@id": "_:ac7",
+          "@id": "_:ae0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac5",
+            "@id": "_:ad7",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_19.html"
           },
@@ -493,10 +493,10 @@
           "result": "sdo_eg_md_19.ttl"
         },
         {
-          "@id": "_:ab8",
+          "@id": "_:ad2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab4",
+            "@id": "_:y4",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_20.html"
           },
@@ -507,10 +507,10 @@
           "result": "sdo_eg_md_20.ttl"
         },
         {
-          "@id": "_:aa8",
+          "@id": "_:ac8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa2",
+            "@id": "_:ac3",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_21.html"
           },
@@ -521,10 +521,10 @@
           "result": "sdo_eg_md_21.ttl"
         },
         {
-          "@id": "_:y9",
+          "@id": "_:ab6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z0",
+            "@id": "_:ab2",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_22.html"
           },
@@ -535,10 +535,10 @@
           "result": "sdo_eg_md_22.ttl"
         },
         {
-          "@id": "_:y5",
+          "@id": "_:aa6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:y6",
+            "@id": "_:aa0",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_23.html"
           },
@@ -549,10 +549,10 @@
           "result": "sdo_eg_md_23.ttl"
         },
         {
-          "@id": "_:x5",
+          "@id": "_:z5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w8",
+            "@id": "_:z0",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_24.html"
           },
@@ -563,10 +563,10 @@
           "result": "sdo_eg_md_24.ttl"
         },
         {
-          "@id": "_:w3",
+          "@id": "_:v1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v8",
+            "@id": "_:u7",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_25.html"
           },
@@ -577,10 +577,10 @@
           "result": "sdo_eg_md_25.ttl"
         },
         {
-          "@id": "_:v2",
+          "@id": "_:u1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u7",
+            "@id": "_:t7",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_26.html"
           },
@@ -591,10 +591,10 @@
           "result": "sdo_eg_md_26.ttl"
         },
         {
-          "@id": "_:u0",
+          "@id": "_:w2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t8",
+            "@id": "_:v9",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_27.html"
           },
@@ -619,10 +619,10 @@
           "result": "sdo_eg_md_28.ttl"
         },
         {
-          "@id": "_:ag9",
+          "@id": "_:ah1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ag4",
+            "@id": "_:ag6",
             "@type": "mq:QueryTest",
             "data": "sdo_eg_md_29.html"
           },
@@ -633,7 +633,7 @@
           "result": "sdo_eg_md_29.ttl"
         },
         {
-          "@id": "_:af5",
+          "@id": "_:af6",
           "@type": "mf:ManifestEntry",
           "action": {
             "@id": "_:af2",
@@ -647,10 +647,10 @@
           "result": "sdo_eg_md_30.ttl"
         },
         {
-          "@id": "_:ae5",
+          "@id": "_:af0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae2",
+            "@id": "_:x0",
             "@type": "mq:QueryTest",
             "data": "0046.html"
           },
@@ -660,10 +660,10 @@
           "result": "0046.ttl"
         },
         {
-          "@id": "_:ad3",
+          "@id": "_:ae4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad2",
+            "@id": "_:ae3",
             "@type": "mq:QueryTest",
             "data": "0047.html"
           },
@@ -673,10 +673,10 @@
           "result": "0047.ttl"
         },
         {
-          "@id": "_:ac3",
+          "@id": "_:ad5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac2",
+            "@id": "_:x5",
             "@type": "mq:QueryTest",
             "data": "0048.html"
           },
@@ -686,10 +686,10 @@
           "result": "0048.ttl"
         },
         {
-          "@id": "_:ab3",
+          "@id": "_:y8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab0",
+            "@id": "_:y9",
             "@type": "mq:QueryTest",
             "data": "0049.html"
           },
@@ -699,10 +699,10 @@
           "result": "0049.ttl"
         },
         {
-          "@id": "_:aa1",
+          "@id": "_:ac2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa0",
+            "@id": "_:ac1",
             "@type": "mq:QueryTest",
             "data": "0050.html"
           },
@@ -712,10 +712,10 @@
           "result": "0050.ttl"
         },
         {
-          "@id": "_:z6",
+          "@id": "_:ab3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:z7",
+            "@id": "_:ab1",
             "@type": "mq:QueryTest",
             "data": "0051.html"
           },
@@ -725,10 +725,10 @@
           "result": "0051.ttl"
         },
         {
-          "@id": "_:x9",
+          "@id": "_:aa1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:y0",
+            "@id": "_:z9",
             "@type": "mq:QueryTest",
             "data": "0052.html"
           },
@@ -738,10 +738,10 @@
           "result": "0052.ttl"
         },
         {
-          "@id": "_:w9",
+          "@id": "_:z6",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w7",
+            "@id": "_:v6",
             "@type": "mq:QueryTest",
             "data": "0053.html"
           },
@@ -751,10 +751,10 @@
           "result": "0053.ttl"
         },
         {
-          "@id": "_:v9",
+          "@id": "_:u9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v7",
+            "@id": "_:u6",
             "@type": "mq:QueryTest",
             "data": "0054.html"
           },
@@ -764,10 +764,10 @@
           "result": "0054.ttl"
         },
         {
-          "@id": "_:v1",
+          "@id": "_:t9",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u8",
+            "@id": "_:t6",
             "@type": "mq:QueryTest",
             "data": "0055.html"
           },
@@ -777,10 +777,10 @@
           "result": "0055.ttl"
         },
         {
-          "@id": "_:u1",
+          "@id": "_:w4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t9",
+            "@id": "_:w0",
             "@type": "mq:QueryTest",
             "data": "0056.html"
           },
@@ -790,10 +790,10 @@
           "result": "0056.ttl"
         },
         {
-          "@id": "_:t6",
+          "@id": "_:t4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t0",
+            "@id": "_:t5",
             "@type": "mq:QueryTest",
             "data": "0057.html"
           },
@@ -803,10 +803,10 @@
           "result": "0057.ttl"
         },
         {
-          "@id": "_:ah0",
+          "@id": "_:ah2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ah3",
+            "@id": "_:ah6",
             "@type": "mq:QueryTest",
             "data": "0058.html"
           },
@@ -816,10 +816,10 @@
           "result": "0058.ttl"
         },
         {
-          "@id": "_:ag3",
+          "@id": "_:ag2",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:af8",
+            "@id": "_:af9",
             "@type": "mq:QueryTest",
             "data": "0059.html"
           },
@@ -829,10 +829,10 @@
           "result": "0059.ttl"
         },
         {
-          "@id": "_:af1",
+          "@id": "_:x3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ae8",
+            "@id": "_:x4",
             "@type": "mq:QueryTest",
             "data": "0060.html"
           },
@@ -842,10 +842,10 @@
           "result": "0060.ttl"
         },
         {
-          "@id": "_:x6",
+          "@id": "_:y1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u6",
+            "@id": "_:y2",
             "@type": "mq:QueryTest",
             "data": "0061.html"
           },
@@ -855,10 +855,10 @@
           "result": "0061.ttl"
         },
         {
-          "@id": "_:t4",
+          "@id": "_:ae1",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:t5",
+            "@id": "_:ad8",
             "@type": "mq:QueryTest",
             "data": "0062.html"
           },
@@ -868,10 +868,10 @@
           "result": "0062.ttl"
         },
         {
-          "@id": "_:u3",
+          "@id": "_:ad4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:u4",
+            "@id": "_:ad1",
             "@type": "mq:QueryTest",
             "data": "0063.html"
           },
@@ -881,10 +881,10 @@
           "result": "0063.ttl"
         },
         {
-          "@id": "_:u9",
+          "@id": "_:ad0",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:v0",
+            "@id": "_:ac5",
             "@type": "mq:QueryTest",
             "data": "0064.html"
           },
@@ -894,10 +894,10 @@
           "result": "0064.ttl"
         },
         {
-          "@id": "_:w1",
+          "@id": "_:ab8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:w2",
+            "@id": "_:ab5",
             "@type": "mq:QueryTest",
             "data": "0065.html"
           },
@@ -907,10 +907,10 @@
           "result": "0065.ttl"
         },
         {
-          "@id": "_:x3",
+          "@id": "_:aa8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:x4",
+            "@id": "_:aa5",
             "@type": "mq:QueryTest",
             "data": "0066.html"
           },
@@ -920,10 +920,10 @@
           "result": "0066.ttl"
         },
         {
-          "@id": "_:y3",
+          "@id": "_:z8",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:y4",
+            "@id": "_:z1",
             "@type": "mq:QueryTest",
             "data": "0067.html"
           },
@@ -933,10 +933,10 @@
           "result": "0067.ttl"
         },
         {
-          "@id": "_:y7",
+          "@id": "_:v4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:y8",
+            "@id": "_:u8",
             "@type": "mq:QueryTest",
             "data": "0068.html"
           },
@@ -946,10 +946,10 @@
           "result": "0068.ttl"
         },
         {
-          "@id": "_:aa6",
+          "@id": "_:u4",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:aa7",
+            "@id": "_:t8",
             "@type": "mq:QueryTest",
             "data": "0069.html"
           },
@@ -959,10 +959,10 @@
           "result": "0069.ttl"
         },
         {
-          "@id": "_:ab6",
+          "@id": "_:w5",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ab7",
+            "@id": "_:w1",
             "@type": "mq:QueryTest",
             "data": "0070.html"
           },
@@ -972,10 +972,10 @@
           "result": "0070.ttl"
         },
         {
-          "@id": "_:ac8",
+          "@id": "_:v7",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ac9",
+            "@id": "_:t0",
             "@type": "mq:QueryTest",
             "data": "0071.html"
           },
@@ -985,10 +985,10 @@
           "result": "0071.ttl"
         },
         {
-          "@id": "_:ad8",
+          "@id": "_:ah3",
           "@type": "mf:ManifestEntry",
           "action": {
-            "@id": "_:ad9",
+            "@id": "_:ah7",
             "@type": "mq:QueryTest",
             "data": "0072.html"
           },
@@ -996,6 +996,32 @@
           "name": "Test 0072",
           "positiveTest": "true",
           "result": "0072.ttl"
+        },
+        {
+          "@id": "_:ag3",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:ag0",
+            "@type": "mq:QueryTest",
+            "data": "0073.html"
+          },
+          "comment": "Vocabulary Expansion test with rdfs:subPropertyOf",
+          "name": "Test 0073",
+          "positiveTest": "true",
+          "result": "0073.ttl"
+        },
+        {
+          "@id": "_:x1",
+          "@type": "mf:ManifestEntry",
+          "action": {
+            "@id": "_:x2",
+            "@type": "mq:QueryTest",
+            "data": "0074.html"
+          },
+          "comment": "Vocabulary Expansion test with owl:equivalentProperty",
+          "name": "Test 0074",
+          "positiveTest": "true",
+          "result": "0074.ttl"
         }
       ]
     }
--- a/microdata-rdf/tests/manifest.ttl	Wed Sep 19 17:53:00 2012 -0700
+++ b/microdata-rdf/tests/manifest.ttl	Wed Sep 19 22:37:43 2012 -0700
@@ -466,4 +466,16 @@
              mq:data <0072.html>];
            mf:name "Test 0072";
            mf:positiveTest "true";
-           mf:result <0072.ttl>])]) .
+           mf:result <0072.ttl>] [ a mf:ManifestEntry;
+           rdfs:comment "Vocabulary Expansion test with rdfs:subPropertyOf";
+           mf:action [ a mq:QueryTest;
+             mq:data <0073.html>];
+           mf:name "Test 0073";
+           mf:positiveTest "true";
+           mf:result <0073.ttl>] [ a mf:ManifestEntry;
+           rdfs:comment "Vocabulary Expansion test with owl:equivalentProperty";
+           mf:action [ a mq:QueryTest;
+             mq:data <0074.html>];
+           mf:name "Test 0074";
+           mf:positiveTest "true";
+           mf:result <0074.ttl>])]) .
--- a/microdata-rdf/tests/test-registry.json	Wed Sep 19 17:53:00 2012 -0700
+++ b/microdata-rdf/tests/test-registry.json	Wed Sep 19 22:37:43 2012 -0700
@@ -36,5 +36,17 @@
       "list": {"multipleValues": "list"},
       "typed": {"datatype": "http://typed"}
     }
+  },
+  "http://expansion/": {
+    "propertyURI":  "vocabulary",
+    "multipleValues": "unordered",
+    "properties": {
+      "equivalentProperty": {
+        "equivalentProperty": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      },
+      "subPropertyOf": {
+        "subPropertyOf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      }
+    }
   }
-  }
+}