--- a/microdata-namespace/ns.json Sun Jul 22 16:44:24 2012 -0700
+++ b/microdata-namespace/ns.json Mon Jul 30 11:30:57 2012 -0700
@@ -3,7 +3,7 @@
"propertyURI": "vocabulary",
"multipleValues": "unordered",
"properties": {
- "additionalType": {"equivalentProperty": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"},
+ "additionalType": {"subPropertyOf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"},
"blogPosts": {"multipleValues": "list"},
"breadcrumb": {"multipleValues": "list"},
"byArtist": {"multipleValues": "list"},
--- a/microdata-rdf/index.html Sun Jul 22 16:44:24 2012 -0700
+++ b/microdata-rdf/index.html Mon Jul 30 11:30:57 2012 -0700
@@ -744,7 +744,7 @@
after the triples have been generated, or as the last
processing step.</p>
<p>For example, the <a>registry</a> definition for the <em>additionalType</em> property
- within schema.org, defines <em>additionalType</em> to have an <a>equivalentProperty</a>
+ within schema.org, defines <em>additionalType</em> to have an <a>subPropertyOf</a>
relationship with <code>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</code>.</p>
<pre class="example" data-transform="updateExample">
@@ -752,7 +752,7 @@
{
"http://schema.org/": {
"properties": {
- ****"additionalType": {"equivalentProperty": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"}****
+ ****"additionalType": {"subPropertyOf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"}****
}
}
@@ -778,7 +778,7 @@
schema:name "Laser Printer"]
) .
-schema:additionalProperty owl:equivalentProperty rdf:type .
+schema:additionalProperty owl:subPropertyOf rdf:type .
-->
</pre>
@@ -796,7 +796,7 @@
schema:name "Laser Printer"]
) .
-schema:additionalProperty owl:equivalentProperty rdf:type .
+schema:additionalProperty owl:subPropertyOf rdf:type .
-->
</pre>
--- a/microdata-rdf/tests/0001.html Sun Jul 22 16:44:24 2012 -0700
+++ b/microdata-rdf/tests/0001.html Mon Jul 30 11:30:57 2012 -0700
@@ -1,20 +1,20 @@
<!DOCTYPE html>
<html>
<head>
- <title itemscope itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry">
+ <title>Test 001</title>
+ </head>
+ <body>
+ <p class="entry" itemscope itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#ManifestEntry">
<span itemprop="name">Test 0001</span>:
<span itemprop="http://www.w3.org/2000/01/rdf-schema#comment">Item with no itemtype and literal itemprop</span>
(
<span itemprop="action" itemscope itemtype="http://www.w3.org/2001/sw/DataAccess/tests/test-query#QueryTest">
- <a itemprop="data" href="0001.html">input</a> |
- <a itemprop="query" href="0001.rq">query</a>
- </span>
+ <a itemprop="data" href="0001.html">input</a>
+ </span> |
+ <a itemprop="result" href="0001.ttl">query</a> |
<a itemprop="registry" href="test-registry.json">registry</a>
- <meta itemprop="result" content="true"/>
)
- </title>
- </head>
- <body>
+ </p>
<p itemscope>This test created by <span itemprop="name">Gregg Kellogg</span>.</p>
</body>
</html>
\ No newline at end of file
--- a/microdata-rdf/tests/index.html Sun Jul 22 16:44:24 2012 -0700
+++ b/microdata-rdf/tests/index.html Mon Jul 30 11:30:57 2012 -0700
@@ -143,9 +143,10 @@
processor implementations claiming conformance.</p>
</section><section><h2>Running tests</h2>
<p>Tests are described with individual HTML files containing microdata, which when processed,
- will either pass or fail a SPARQL ASK query associated with the test. <a href="#positive-tests">Positive processor
- tests</a> tests MUST yield a value of <code>true</code> and <a href="#negative-tests">Negative processor tests</a>
- MUST yield a value of <code>false</code>.</p>
+ generates exactly the triples specified in the result file.
+ <a href="#positive-tests">Positive processor
+ tests</a> tests MUST generate the specified triples and <a href="#negative-tests">Negative processor tests</a>
+ MUST NOT generate the specified triples.</p>
<p>All tests should be performed with an assumed base of <code>http://www.w3.org/TR/microdata-rdf/tests/</code>
along with the base-name of the specific test document (excluding any format extension).</p>
<p>This document serves as the test manifest for both positive and negative parser tests using the
@@ -171,13 +172,9 @@
[ a mf:ManifestEntry;
mf:name "Test 0001";
rdfs:comment "Item with no itemtype and literal itemprop";
- mf:action [
- a qt:QueryTest;
- qt:data <0001.html>;
- qt:query <0001.rq>;
- ];
+ mf:action [qt:data <0001.html>];
mf:registry <test-registry.json>;
- mf:result "true"
+ mf:result <0001.ttl>
]
)
] .
--- a/microdata-rdf/tests/update_index.rb Sun Jul 22 16:44:24 2012 -0700
+++ b/microdata-rdf/tests/update_index.rb Mon Jul 30 11:30:57 2012 -0700
@@ -22,7 +22,7 @@
test = Nokogiri::HTML.parse(File.open(test_file))
# Extract head, replace as div.test-entry
- test_info = test.at_css('title')
+ test_info = test.at_css('p.entry')
test_info.name = "div"
test_info['itemprop'] = 'entries'
test_info['class'] = 'test-entry'