Repository: any23 Updated Branches: refs/heads/master 97e364ae4 -> 6d0606f9b
http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1-expected.nquads b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1-expected.nquads index 53899fa..8409a61 100644 --- a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1-expected.nquads +++ b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1-expected.nquads @@ -16,12 +16,14 @@ # <http://books.example.com/works/45U8QJGZSQKDH8N> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://purl.org/vocab/frbr/core#Work> <http://bob.example.com/> . -<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/dc/elements/1.1/creator> "Wil Wheaton" <http://bob.example.com/> . +<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/dc/terms/type> <http://books.example.com/product-types/BOOK> <http://bob.example.com/> . +<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/dc/terms/type> <http://books.example.com/product-types/EBOOK> <http://bob.example.com/> . <http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/dc/terms/title> "Just a Geek" <http://bob.example.com/> . -<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/vocab/frbr/core#realization> <http://books.example.com/products/9780596007683.BOOK> <http://bob.example.com/> . -<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/vocab/frbr/core#realization> <http://books.example.com/products/9780596802189.EBOOK> <http://bob.example.com/> . <http://books.example.com/products/9780596007683.BOOK> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://purl.org/vocab/frbr/core#Expression> <http://bob.example.com/> . <http://books.example.com/products/9780596007683.BOOK> <http://purl.org/dc/terms/type> <http://books.example.com/product-types/BOOK> <http://bob.example.com/> . +<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/vocab/frbr/core#realization> <http://books.example.com/products/9780596007683.BOOK> <http://bob.example.com/> . <http://books.example.com/products/9780596802189.EBOOK> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://purl.org/vocab/frbr/core#Expression> <http://bob.example.com/> . <http://books.example.com/products/9780596802189.EBOOK> <http://purl.org/dc/terms/type> <http://books.example.com/product-types/EBOOK> <http://bob.example.com/> . +<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/vocab/frbr/core#realization> <http://books.example.com/products/9780596802189.EBOOK> <http://bob.example.com/> . +<http://books.example.com/works/45U8QJGZSQKDH8N> <http://purl.org/dc/elements/1.1/creator> "Wil\n Wheaton" <http://bob.example.com/> . <http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> <http://books.example.com/works/45U8QJGZSQKDH8N> <http://bob.example.com/> . \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1.html b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1.html index e313ccd..da6148f 100644 --- a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1.html +++ b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-1.html @@ -14,26 +14,30 @@ See the License for the specific language governing permissions and limitations under the License. --> -<dl itemscope - itemtype="http://purl.org/vocab/frbr/core#Work" - itemid="http://books.example.com/works/45U8QJGZSQKDH8N"> - <dt>Title</dt> - <dd><cite itemprop="http://purl.org/dc/terms/title">Just a Geek</cite></dd> - <dt>By</dt> - <dd><span itemprop="http://purl.org/dc/elements/1.1/creator">Wil Wheaton</span></dd> - <dt>Format</dt> - <dd itemprop="http://purl.org/vocab/frbr/core#realization" - itemscope - itemtype="http://purl.org/vocab/frbr/core#Expression" - itemid="http://books.example.com/products/9780596007683.BOOK"> - <link itemprop="http://purl.org/dc/terms/type" href="http://books.example.com/product-types/BOOK"> - Print - </dd> - <dd itemprop="http://purl.org/vocab/frbr/core#realization" - itemscope - itemtype="http://purl.org/vocab/frbr/core#Expression" - itemid="http://books.example.com/products/9780596802189.EBOOK"> - <link itemprop="http://purl.org/dc/terms/type" href="http://books.example.com/product-types/EBOOK"> - Ebook - </dd> +<dl itemscope itemtype="http://purl.org/vocab/frbr/core#Work" + itemid="http://books.example.com/works/45U8QJGZSQKDH8N"> + <dt>Title</dt> + <dd> + <cite itemprop="http://purl.org/dc/terms/title">Just a Geek</cite> + </dd> + <dt>By</dt> + <dd> + <span itemprop="http://purl.org/dc/elements/1.1/creator">Wil + Wheaton</span> + </dd> + <dt>Format</dt> + <dd itemprop="http://purl.org/vocab/frbr/core#realization" itemscope + itemtype="http://purl.org/vocab/frbr/core#Expression" + itemid="http://books.example.com/products/9780596007683.BOOK"> + <link itemprop="http://purl.org/dc/terms/type" + href="http://books.example.com/product-types/BOOK"> + Print + </dd> + <dd itemprop="http://purl.org/vocab/frbr/core#realization" itemscope + itemtype="http://purl.org/vocab/frbr/core#Expression" + itemid="http://books.example.com/products/9780596802189.EBOOK"> + <link itemprop="http://purl.org/dc/terms/type" + href="http://books.example.com/product-types/EBOOK"> + Ebook + </dd> </dl> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2-expected.nquads b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2-expected.nquads index eb6dcd9..2632f7a 100644 --- a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2-expected.nquads +++ b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2-expected.nquads @@ -15,18 +15,21 @@ # limitations under the License. # -<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node161nd8236x293102 <http://bob.example.com/> . -<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node161nd8236x293103 <http://bob.example.com/> . -_:node161nd8236x293102 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://microformats.org/profile/hcard> <http://bob.example.com/> . -_:node161nd8236x293102 <http://microformats.org/profile/hcard/fn> "Princeton" <http://bob.example.com/> . -_:node161nd8236x293102 <http://microformats.org/profile/hcard/n> _:node161nd8236x293104 <http://bob.example.com/> . -_:node161nd8236x293102 <http://microformats.org/profile/hcard/adr> _:node161nd8236x293105 <http://bob.example.com/> . -_:node161nd8236x293104 <http://microformats.org/profile/hcard/given-name> "Princeton" <http://bob.example.com/> . -_:node161nd8236x293103 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://microformats.org/profile/hcard> <http://bob.example.com/> . -_:node161nd8236x293103 <http://microformats.org/profile/hcard/fn> "Trekkie" <http://bob.example.com/> . -_:node161nd8236x293103 <http://microformats.org/profile/hcard/n> _:node161nd8236x293106 <http://bob.example.com/> . -_:node161nd8236x293103 <http://microformats.org/profile/hcard/adr> _:node161nd8236x293105 <http://bob.example.com/> . -_:node161nd8236x293106 <http://microformats.org/profile/hcard/given-name> "Trekkie" <http://bob.example.com/> . -_:node161nd8236x293105 <http://microformats.org/profile/hcard/street-address> "Avenue Q" <http://bob.example.com/> . -<http://bob.example.com/> <http://vocab.sindice.net/date> "2011-06-08T12:56:39+01:00" <http://bob.example.com/> . -<http://bob.example.com/> <http://vocab.sindice.net/size> "15"^^<http://www.w3.org/2001/XMLSchema#int> <http://bob.example.com/> . \ No newline at end of file +_:nodebdb2c525cf8095abb6954b51432e6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://microformats.org/profile/hcard> <http://bob.example.com/> . +_:nodebdb2c525cf8095abb6954b51432e6 <http://microformats.org/profile/hcard/street-address> "Avenue Q" <http://bob.example.com/> . +_:nodebdb2c525cf8095abb6954b51432e6 <http://microformats.org/profile/hcard/fn> "Princeton" <http://bob.example.com/> . +_:nodebdb2c525cf8095abb6954b51432e6 <http://microformats.org/profile/hcard/given-name> "Princeton" <http://bob.example.com/> . +_:node5194c3bb9d7f53e4759c6f393d95f88 <http://schema.org/given-name> "Princeton" <http://bob.example.com/> . +_:nodebdb2c525cf8095abb6954b51432e6 <http://microformats.org/profile/hcard/n> _:node5194c3bb9d7f53e4759c6f393d95f88 <http://bob.example.com/> . +_:node1ffeb2699b75ba7aca5ee3d72adb55a8 <http://schema.org/street-address> "Avenue Q" <http://bob.example.com/> . +_:nodebdb2c525cf8095abb6954b51432e6 <http://microformats.org/profile/hcard/adr> _:node1ffeb2699b75ba7aca5ee3d72adb55a8 <http://bob.example.com/> . +<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:nodebdb2c525cf8095abb6954b51432e6 <http://bob.example.com/> . +_:node7a12e48e321d29211c8b7c2ce396854 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://microformats.org/profile/hcard> <http://bob.example.com/> . +_:node7a12e48e321d29211c8b7c2ce396854 <http://microformats.org/profile/hcard/street-address> "Avenue Q" <http://bob.example.com/> . +_:node7a12e48e321d29211c8b7c2ce396854 <http://microformats.org/profile/hcard/fn> "Trekkie" <http://bob.example.com/> . +_:node7a12e48e321d29211c8b7c2ce396854 <http://microformats.org/profile/hcard/given-name> "Trekkie" <http://bob.example.com/> . +_:node45173ea18b736c2e9c3136e52ed3727e <http://schema.org/given-name> "Trekkie" <http://bob.example.com/> . +_:node7a12e48e321d29211c8b7c2ce396854 <http://microformats.org/profile/hcard/n> _:node45173ea18b736c2e9c3136e52ed3727e <http://bob.example.com/> . +_:node1ffeb2699b75ba7aca5ee3d72adb55a8 <http://schema.org/street-address> "Avenue Q" <http://bob.example.com/> . +_:node7a12e48e321d29211c8b7c2ce396854 <http://microformats.org/profile/hcard/adr> _:node1ffeb2699b75ba7aca5ee3d72adb55a8 <http://bob.example.com/> . +<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node7a12e48e321d29211c8b7c2ce396854 <http://bob.example.com/> . \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2.html b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2.html index 7234b21..e38d2a8 100644 --- a/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2.html +++ b/test-resources/src/test/resources/microdata/5.2.1-non-normative-example-2.html @@ -15,12 +15,12 @@ limitations under the License. --> <p> - Both - <span itemscope itemtype="http://microformats.org/profile/hcard" itemref="home"><span itemprop="fn" - ><span itemprop="n" itemscope><span itemprop="given-name">Princeton</span></span></span></span> - and - <span itemscope itemtype="http://microformats.org/profile/hcard" itemref="home"><span itemprop="fn" - ><span itemprop="n" itemscope><span itemprop="given-name">Trekkie</span></span></span></span> - live at - <span id="home" itemprop="adr" itemscope><span itemprop="street-address">Avenue Q</span>.</span> + Both <span itemscope itemtype="http://microformats.org/profile/hcard" + itemref="home"><span itemprop="fn"><span + itemprop="n" itemscope><span itemprop="given-name">Princeton</span></span></span></span> + and <span itemscope itemtype="http://microformats.org/profile/hcard" + itemref="home"><span itemprop="fn"><span + itemprop="n" itemscope><span itemprop="given-name">Trekkie</span></span></span></span> + live at <span id="home" itemprop="adr" itemscope><span + itemprop="street-address">Avenue Q</span>.</span> </p> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-basic-expected.properties ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-basic-expected.properties b/test-resources/src/test/resources/microdata/microdata-basic-expected.properties index a020a4b..ee57018 100644 --- a/test-resources/src/test/resources/microdata/microdata-basic-expected.properties +++ b/test-resources/src/test/resources/microdata/microdata-basic-expected.properties @@ -17,13 +17,13 @@ result0={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Elizabeth", "type" : "Plain" } } ] } result1={ "xpath" : "/HTML[1]/BODY[1]/DIV[2]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[2]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Daniel", "type" : "Plain" } } ] } -result2={ "xpath" : "/HTML[1]/BODY[1]/DIV[3]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[2]/SPAN[1]", "name" : "band", "value" : { "content" : "Four Parts Water", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[3]/SPAN[1]", "name" : "nationality", "value" : { "content" : "British", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Neil", "type" : "Plain" } } ] } +result2={ "xpath" : "/HTML[1]/BODY[1]/DIV[3]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[3]/SPAN[1]", "name" : "nationality", "value" : { "content" : "British", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Neil", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[2]/SPAN[1]", "name" : "band", "value" : { "content" : "Four Parts Water", "type" : "Plain" } } ] } result3={ "xpath" : "/HTML[1]/BODY[1]/DIV[4]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/IMG[1]", "name" : "image", "value" : { "content" : "google-logo.png", "type" : "Link" } } ] } result4={ "xpath" : "/HTML[1]/BODY[1]/DIV[5]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[5]/TIME[1]", "name" : "birthday", "value" : { "content" : "2009-05-10", "type" : "Date" } } ] } result5={ "xpath" : "/HTML[1]/BODY[1]/DIV[6]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[6]/UL[1]/LI[1]", "name" : "flavor", "value" : { "content" : "Lemon sorbet", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[6]/UL[1]/LI[2]", "name" : "flavor", "value" : { "content" : "Apricot sorbet", "type" : "Plain" } } ] } result6={ "xpath" : "/HTML[1]/BODY[1]/DIV[7]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[7]/SPAN[1]", "name" : "favorite-fruit", "value" : { "content" : "orange", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[7]/SPAN[1]", "name" : "favorite-color", "value" : { "content" : "orange", "type" : "Plain" } } ] } result7={ "xpath" : "/HTML[1]/BODY[1]/FIGURE[1]/FIGCAPTION[1]/SPAN[1]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/FIGURE[1]/FIGCAPTION[1]/SPAN[1]/SPAN[1]", "name" : "name", "value" : { "content" : "The Castle", "type" : "Plain" } } ] } result8={ "xpath" : "/HTML[1]/BODY[1]/SPAN[1]", "id" : null, "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/SPAN[1]/META[1]", "name" : "name", "value" : { "content" : "The Castle", "type" : "Plain" } } ] } -result9={ "xpath" : "/HTML[1]/BODY[1]/SECTION[1]", "id" : null, "refs" : [], "type" : "http://example.org/animals#cat", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/SECTION[1]/P[1]", "name" : "desc", "value" : { "content" : "Hedral is a male american domestic shorthair,\\n with a fluffy black fur with white paws and belly.", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[1]/H1[1]", "name" : "name", "value" : { "content" : "Hedral", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[1]/IMG[1]", "name" : "img", "value" : { "content" : "hedral.jpeg", "type" : "Link" } } ] } +result9={ "xpath" : "/HTML[1]/BODY[1]/SECTION[1]", "id" : null, "refs" : [], "type" : "http://example.org/animals#cat", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/SECTION[1]/IMG[1]", "name" : "img", "value" : { "content" : "hedral.jpeg", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[1]/H1[1]", "name" : "name", "value" : { "content" : "Hedral", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[1]/P[1]", "name" : "desc", "value" : { "content" : "Hedral is a male american domestic shorthair, with a fluffy black fur with white paws and belly.", "type" : "Plain" } } ] } result10={ "xpath" : "/HTML[1]/BODY[1]/DL[1]", "id" : null, "refs" : [], "type" : "http://vocab.example.net/book", "itemid" : "urn:isbn:0-330-34032-8", "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DL[1]/DD[2]", "name" : "author", "value" : { "content" : "Peter F. Hamilton\\n ", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DL[1]/DD[1]", "name" : "title", "value" : { "content" : "The Reality Dysfunction\\n ", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DL[1]/DD[3]/TIME[1]", "name" : "pubdate", "value" : { "content" : "1996-01-26", "type" : "Date" } } ] } -result11={ "xpath" : "/HTML[1]/BODY[1]/SECTION[2]", "id" : null, "refs" : [], "type" : "http://example.org/animals#cat", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/P[1]", "name" : "desc", "value" : { "content" : "Hedral is a male american domestic shorthair, with a fluffy\\n black fur with\\n white paws and belly.", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/H1[1]", "name" : "name", "value" : { "content" : "Hedral", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/IMG[1]", "name" : "img", "value" : { "content" : "hedral.jpeg", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/H1[1]", "name" : "http://example.com/fn", "value" : { "content" : "Hedral", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/P[1]/SPAN[1]", "name" : "http://example.com/color", "value" : { "content" : "black", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/P[1]/SPAN[2]", "name" : "http://exa mple.com/color", "value" : { "content" : "white", "type" : "Plain" } } ] } \ No newline at end of file +result11={ "xpath" : "/HTML[1]/BODY[1]/SECTION[2]", "id" : null, "refs" : [], "type" : "http://example.org/animals#cat", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/P[1]/SPAN[1]", "name" : "http://example.com/color", "value" : { "content" : "black", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/P[1]/SPAN[2]", "name" : "http://example.com/color", "value" : { "content" : "white", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/IMG[1]", "name" : "img", "value" : { "content" : "hedral.jpeg", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/H1[1]", "name" : "http://example.com/fn", "value" : { "content" : "Hedral", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/H1[1]", "name" : "name", "value" : { "content" : "Hedral", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/SECTION[2]/P[1]", "name" : "desc", "value" : { "content" : "Hedral is a male american domestic shorthair, with a fluffy black fur with white paws and belly.", "type" : "Plain" } } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-basic.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-basic.html b/test-resources/src/test/resources/microdata/microdata-basic.html index e7d4dba..695d126 100644 --- a/test-resources/src/test/resources/microdata/microdata-basic.html +++ b/test-resources/src/test/resources/microdata/microdata-basic.html @@ -75,10 +75,8 @@ <figure> <img src="castle.jpeg"> <figcaption> - <span itemscope> - <span itemprop="name">The Castle</span> - </span> - (1986) + <span itemscope> <span itemprop="name">The Castle</span> + </span> (1986) </figcaption> </figure> @@ -92,8 +90,7 @@ <!-- result9 --> <section itemscope itemtype="http://example.org/animals#cat"> <h1 itemprop="name">Hedral</h1> - <p itemprop="desc">Hedral is a male american domestic shorthair, - with a fluffy black fur with white paws and belly.</p> + <p itemprop="desc">Hedral is a male american domestic shorthair, with a fluffy black fur with white paws and belly.</p> <img itemprop="img" src="hedral.jpeg" alt="" title="Hedral, age 18 months"> </section> @@ -114,11 +111,9 @@ <!-- result11 --> <section itemscope itemtype="http://example.org/animals#cat"> <h1 itemprop="name http://example.com/fn">Hedral</h1> - <p itemprop="desc"> - Hedral is a male american domestic shorthair, with a fluffy <span + <p itemprop="desc">Hedral is a male american domestic shorthair, with a fluffy <span itemprop="http://example.com/color">black</span> fur with <span - itemprop="http://example.com/color">white</span> paws and belly. - </p> + itemprop="http://example.com/color">white</span> paws and belly.</p> <img itemprop="img" src="hedral.jpeg" alt="" title="Hedral, age 18 months"> </section> http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-itemref-expected.properties ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-itemref-expected.properties b/test-resources/src/test/resources/microdata/microdata-itemref-expected.properties index 8b60e54..843e957 100644 --- a/test-resources/src/test/resources/microdata/microdata-itemref-expected.properties +++ b/test-resources/src/test/resources/microdata/microdata-itemref-expected.properties @@ -15,11 +15,15 @@ # limitations under the License. # -result0={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]", "id" : "is1", "refs" : [], "type" : "http://type/IScopeType1", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/A[2]", "name" : "p4", "value" : { "content" : "http://www.domain.org/path/2", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/P[2]", "name" : "p3", "value" : { "content" : "Some Text 2", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/P[1]", "name" : "p2", "value" : { "content" : "Some Text 1", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/A[1]", "name" : "p1", "value" : { "content" : "http://www.domain.org/path/1", "type" : "Link" } } ] } -result1={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]", "id" : "is2", "refs" : ["ip5", "ip4", "ip3", "unexisting"], "type" : "http://type/IScopeType2", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]/P[1]", "name" : "p6", "value" : { "content" : "Some Text 3", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]/IMG[1]", "name" : "p5", "value" : { "content" : "http://source/dom/path", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/A[2]", "name" : "p4", "value" : { "content" : "http://www.domain.org/path/2", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/P[2]", "name" : "p3", "value" : { "content" : "Some Text 2", "type" : "Plain" } } ] } -result2={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]", "id" : "loops", "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "id" : "loop2", "refs" : ["loop3"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "id" : "loop3", "refs" : ["loop4"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } } ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "id" : "loop3", "refs" : ["loop4"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[5]", "name" : "next", "value" : { "c ontent" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[5]", "id" : "loop4", "refs" : ["loop2"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "id" : "loop2", "refs" : ["loop3"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "id" : "loop3", "refs" : ["loop4"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } } ] }, "type" : "Nested" } } ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[1]", "name" : "self", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[1]", "id" : "loop0", "refs" : ["loop0"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[ 3]/DIV[2]", "name" : "head", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[2]", "id" : "loop1", "refs" : ["loop2"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "id" : "loop2", "refs" : ["loop3"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "id" : "loop3", "refs" : ["loop4"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } } ] }, "type" : "Nested" } } ] }, "type" : "Nested" } } ] } -result3={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[2]", "id" : "idItem", "refs" : ["insideOut"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[2]/DIV[1]", "name" : "prop", "value" : { "content" : "Included via tree.", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[1]", "name" : "prop", "value" : { "content" : "Included via parent, before.", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[3]", "name" : "prop", "value" : { "content" : "Included via parent, after.", "type" : "Plain" } } ] } -error0={ "message" : "Unknown itemProp id 'unexisting'", "path" : "null", "begin_row" : -1, "begin_col" : -1, "end_row" : -1, "end_col" : -1 } -error1={ "message" : "Duplicated deferred itemProp 'p5'.", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]", "begin_row" : 26, "begin_col" : 5, "end_row" : 26, "end_col" : 97 } -error2={ "message" : "Loop detected with depth 1 while dereferencing itemProp 'loop0' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[1]", "begin_row" : 33, "begin_col" : 9, "end_row" : 33, "end_col" : 67 } -error3={ "message" : "Loop detected with depth 3 while dereferencing itemProp 'loop2' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[5]", "begin_row" : 37, "begin_col" : 9, "end_row" : 37, "end_col" : 67 } \ No newline at end of file +result0={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]", "id" : "is1", "refs" : [], "type" : "http://type/IScopeType1", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/A[1]", "name" : "p1", "value" : { "content" : "http://www.domain.org/path/1", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/P[1]", "name" : "p2", "value" : { "content" : "Some Text 1", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/P[2]", "name" : "p3", "value" : { "content" : "Some Text 2", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[1]/A[2]", "name" : "p4", "value" : { "content" : "http://www.domain.org/path/2", "type" : "Link" } } ] } +result1={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]", "id" : "is2", "refs" : ["ip5", "ip4", "ip3", "unexisting"], "type" : "http://type/IScopeType2", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]/IMG[1]", "name" : "p5", "value" : { "content" : "http://source/dom/path", "type" : "Link" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]/P[1]", "name" : "p6", "value" : { "content" : "Some Text 3", "type" : "Plain" } } ] } +result2={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]", "id" : "loops", "refs" : [], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[2]", "name" : "head", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[2]", "id" : "loop1", "refs" : ["loop2"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "id" : "loop2", "refs" : ["loop3"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "id" : "loop3", "refs" : ["loop4"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[5]", "name" : "next", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[5]", "id" : "loop4", "refs" : ["loop2"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[1]", "name" : "self", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[1]", "id" : "loop0", "refs" : ["loop0"], "type" : null, "itemid" : null, "properties" : [ ] }, "type" : "Nested" } } ] } +result3={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[2]", "id" : "idItem", "refs" : ["insideOut"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[2]/DIV[1]", "name" : "prop", "value" : { "content" : "Included via tree.", "type" : "Plain" } } ] } +error0={ "message" : "Duplicated deferred itemProp 'p5'.", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]", "begin_row" : 28, "begin_col" : 5, "end_row" : 29, "end_col" : 40 } +error1={ "message" : "Duplicated deferred itemProp 'p6'.", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[2]", "begin_row" : 28, "begin_col" : 5, "end_row" : 29, "end_col" : 40 } +error2={ "message" : "Loop detected with depth 1 while dereferencing itemProp 'loop0' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[1]", "begin_row" : 36, "begin_col" : 7, "end_row" : 36, "end_col" : 65 } +error3={ "message" : "Loop detected with depth 1 while dereferencing itemProp 'loop2' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[2]", "begin_row" : 37, "begin_col" : 7, "end_row" : 37, "end_col" : 65 } +error4={ "message" : "Loop detected with depth 1 while dereferencing itemProp 'loop3' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[3]", "begin_row" : 39, "begin_col" : 7, "end_row" : 39, "end_col" : 65 } +error5={ "message" : "Loop detected with depth 1 while dereferencing itemProp 'loop4' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[4]", "begin_row" : 40, "begin_col" : 7, "end_row" : 40, "end_col" : 65 } +error6={ "message" : "Loop detected with depth 1 while dereferencing itemProp 'loop2' .", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[3]/DIV[5]", "begin_row" : 41, "begin_col" : 7, "end_row" : 41, "end_col" : 65 } +error7={ "message" : "Duplicated deferred itemProp 'prop'.", "path" : "/HTML[1]/BODY[1]/DIV[1]/DIV[4]/DIV[2]", "begin_row" : 48, "begin_col" : 7, "end_row" : 48, "end_col" : 54 } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-itemref.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-itemref.html b/test-resources/src/test/resources/microdata/microdata-itemref.html index d133330..f8ff990 100644 --- a/test-resources/src/test/resources/microdata/microdata-itemref.html +++ b/test-resources/src/test/resources/microdata/microdata-itemref.html @@ -14,35 +14,43 @@ See the License for the specific language governing permissions and limitations under the License. --> -<div id="data"> +<html> +<body> + <div id="data"> <div id="is1" itemscope itemtype="http://type/IScopeType1"> - <a id="ip1" itemprop="p1" href="http://www.domain.org/path/1"></a> - <p id="ip2" itemprop="p2">Some Text 1</p> - <p id="ip3" itemprop="p3">Some Text 2</p> - <a id="ip4" itemprop="p4" href="http://www.domain.org/path/2"></a> + <a id="ip1" itemprop="p1" href="http://www.domain.org/path/1"></a> + <p id="ip2" itemprop="p2">Some Text 1</p> + <p id="ip3" itemprop="p3">Some Text 2</p> + <a id="ip4" itemprop="p4" href="http://www.domain.org/path/2"></a> </div> <!-- Duplicate and unexisting itemrefs. --> - <div id="is2" itemscope itemtype="http://type/IScopeType2" itemref="ip5 ip4 ip3 unexisting"> - <img id="ip5" itemprop="p5" src="http://source/dom/path"> - <p id="ip6" itemprop="p6">Some Text 3</p> + <div id="is2" itemscope itemtype="http://type/IScopeType2" + itemref="ip5 ip4 ip3 unexisting"> + <img id="ip5" itemprop="p5" src="http://source/dom/path"> + <p id="ip6" itemprop="p6">Some Text 3</p> </div> <!-- Loops. --> <div id="loops" itemscope> - <div id="loop0" itemprop="self" itemscope itemref="loop0"></div> - <div id="loop1" itemprop="head" itemscope itemref="loop2">not in the loop</div> - <div id="loop2" itemprop="next" itemscope itemref="loop3"></div> - <div id="loop3" itemprop="next" itemscope itemref="loop4"></div> - <div id="loop4" itemprop="next" itemscope itemref="loop2"></div> + <div id="loop0" itemprop="self" itemscope itemref="loop0"></div> + <div id="loop1" itemprop="head" itemscope itemref="loop2">not + in the loop</div> + <div id="loop2" itemprop="next" itemscope itemref="loop3"></div> + <div id="loop3" itemprop="next" itemscope itemref="loop4"></div> + <div id="loop4" itemprop="next" itemscope itemref="loop2"></div> </div> <!-- Inside - Out Nesting. --> <div id="insideOut"> - <div id="idBefore" itemprop="prop">Included via parent, before.</div> - <div id="idItem" itemscope itemref="insideOut"> - <div id="ioChild" itemprop="prop">Included via tree.</div> - </div> - <div id="idAfter" itemprop="prop">Included via parent, after.</div> + <div id="idBefore" itemprop="prop">Included via parent, + before.</div> + <div id="idItem" itemscope itemref="insideOut"> + <div id="ioChild" itemprop="prop">Included via tree.</div> + </div> + <div id="idAfter" itemprop="prop">Included via parent, + after.</div> </div> -</div> + </div> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-json-serialization.json ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-json-serialization.json b/test-resources/src/test/resources/microdata/microdata-json-serialization.json index 27692dc..6a3beec 100644 --- a/test-resources/src/test/resources/microdata/microdata-json-serialization.json +++ b/test-resources/src/test/resources/microdata/microdata-json-serialization.json @@ -1 +1 @@ -{ "result" : [{ "xpath" : "/HTML[1]/BODY[1]/DIV[1]", "id" : "amanda", "refs" : ["a", "b"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[2]", "name" : "band", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[2]", "id" : "b", "refs" : ["c"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Jazz Band", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[2]/SPAN[1]", "name" : "size", "value" : { "content" : "12", "type" : "Plain" } } ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Amanda", "type" : "Plain" } } ] }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]", "id" : null, "refs" : [], "type" : "http://schema.org/Movie", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/H1[1]", "name" : "name", "value" : { "content" : "Avatar", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "name" : "director", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "id" : null, "refs" : [], "type" : "http://schema.org/Person", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]/SPAN[1]", "name" : "name", "value" : { "content" : "James Cameron", "type" : "Plain" } } ] }, "type" : "Nested" } } ] }] } \ No newline at end of file +{ "result" : [{ "xpath" : "/HTML[1]/BODY[1]/DIV[1]", "id" : "amanda", "refs" : ["a", "b"], "type" : null, "itemid" : null, "properties" : [ ] }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]", "id" : null, "refs" : [], "type" : "http://schema.org/Movie", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "name" : "director", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "id" : null, "refs" : [], "type" : "http://schema.org/Person", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]/SPAN[1]", "name" : "name", "value" : { "content" : "James Cameron", "type" : "Plain" } } ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/H1[1]", "name" : "name", "value" : { "content" : "Avatar", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]/SPAN[1]", "name" : "name", "value" : { "content" : "James Cameron", "type" : "Plain" } } ] }] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads b/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads index fa6686d..dbf6d4a 100644 --- a/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads +++ b/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads @@ -15,14 +15,11 @@ # limitations under the License. # -_:node3e103839c5eaa86c975e26a96157bf2 <http://schema.org/name> "Jazz Band" <http://bob.example.com/> . -_:node3e103839c5eaa86c975e26a96157bf2 <http://schema.org/size> "12" <http://bob.example.com/> . -_:node70664686c06639b5211a24a9cf34f99 <http://schema.org/band> _:node3e103839c5eaa86c975e26a96157bf2 <http://bob.example.com/> . -_:node70664686c06639b5211a24a9cf34f99 <http://schema.org/name> "Amanda" <http://bob.example.com/> . -<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node70664686c06639b5211a24a9cf34f99 <http://bob.example.com/> . -_:nodea2c65a1b5a43d4ac4bd93b3216f5f7d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Movie> <http://bob.example.com/> . -_:nodea2c65a1b5a43d4ac4bd93b3216f5f7d <http://schema.org/Movie/name> "Avatar" <http://bob.example.com/> . -_:noded2bffd25e1a8448b159c4c45afd3283 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> <http://bob.example.com/> . -_:noded2bffd25e1a8448b159c4c45afd3283 <http://schema.org/Person/name> "James Cameron" <http://bob.example.com/> . -_:nodea2c65a1b5a43d4ac4bd93b3216f5f7d <http://schema.org/Movie/director> _:noded2bffd25e1a8448b159c4c45afd3283 <http://bob.example.com/> . -<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:nodea2c65a1b5a43d4ac4bd93b3216f5f7d <http://bob.example.com/> . \ No newline at end of file +<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node295195eb5d5124e03da26bafc7313bc <http://bob.example.com/> . +_:node3ecb85b37ebfd65a5d57ab82374a5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Movie> <http://bob.example.com/> . +_:node1fd8d9ab2f041cdaecbae55b76fadc1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> <http://bob.example.com/> . +_:node1fd8d9ab2f041cdaecbae55b76fadc1 <http://schema.org/Person/name> "James Cameron" <http://bob.example.com/> . +_:node3ecb85b37ebfd65a5d57ab82374a5 <http://schema.org/Movie/director> _:node1fd8d9ab2f041cdaecbae55b76fadc1 <http://bob.example.com/> . +_:node3ecb85b37ebfd65a5d57ab82374a5 <http://schema.org/Movie/name> "Avatar" <http://bob.example.com/> . +_:node3ecb85b37ebfd65a5d57ab82374a5 <http://schema.org/Movie/name> "James Cameron" <http://bob.example.com/> . +<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node3ecb85b37ebfd65a5d57ab82374a5 <http://bob.example.com/> . \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-nested-expected.properties ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-nested-expected.properties b/test-resources/src/test/resources/microdata/microdata-nested-expected.properties index 2f65ec4..ca05f33 100644 --- a/test-resources/src/test/resources/microdata/microdata-nested-expected.properties +++ b/test-resources/src/test/resources/microdata/microdata-nested-expected.properties @@ -15,5 +15,5 @@ # limitations under the License. # -result0={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]", "id" : "amanda", "refs" : ["a", "b"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[2]", "name" : "band", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[2]", "id" : "b", "refs" : ["c"], "type" : null, "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Jazz Band", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[3]/P[2]/SPAN[1]", "name" : "size", "value" : { "content" : "12", "type" : "Plain" } } ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/P[1]/SPAN[1]", "name" : "name", "value" : { "content" : "Amanda", "type" : "Plain" } } ] } -result1={ "xpath" : "/HTML[1]/BODY[1]/DIV[4]", "id" : null, "refs" : [], "type" : "http://schema.org/Movie", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/H1[1]", "name" : "name", "value" : { "content" : "Avatar", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "name" : "director", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "id" : null, "refs" : [], "type" : "http://schema.org/Person", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]/SPAN[1]", "name" : "name", "value" : { "content" : "James Cameron", "type" : "Plain" } } ] }, "type" : "Nested" } } ] } \ No newline at end of file +result0={ "xpath" : "/HTML[1]/BODY[1]/DIV[1]", "id" : "amanda", "refs" : ["a", "b"], "type" : null, "itemid" : null, "properties" : [ ] } +result1={ "xpath" : "/HTML[1]/BODY[1]/DIV[4]", "id" : null, "refs" : [], "type" : "http://schema.org/Movie", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "name" : "director", "value" : { "content" : { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]", "id" : null, "refs" : [], "type" : "http://schema.org/Person", "itemid" : null, "properties" : [ { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]/SPAN[1]", "name" : "name", "value" : { "content" : "James Cameron", "type" : "Plain" } } ] }, "type" : "Nested" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/H1[1]", "name" : "name", "value" : { "content" : "Avatar", "type" : "Plain" } }, { "xpath" : "/HTML[1]/BODY[1]/DIV[4]/DIV[1]/SPAN[1]", "name" : "name", "value" : { "content" : "James Cameron", "type" : "Plain" } } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-nested.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-nested.html b/test-resources/src/test/resources/microdata/microdata-nested.html index aaf29d6..bc81642 100644 --- a/test-resources/src/test/resources/microdata/microdata-nested.html +++ b/test-resources/src/test/resources/microdata/microdata-nested.html @@ -18,22 +18,29 @@ <head> <body> -<!-- result0 --> -<div itemscope id="amanda" itemref="a b"></div> -<p id="a">Name: <span itemprop="name">Amanda</span></p> -<div id="b" itemprop="band" itemscope itemref="c"></div> -<div id="c"> - <p>Band: <span itemprop="name">Jazz Band</span></p> - <p>Size: <span itemprop="size">12</span> players</p> -</div> + <!-- result0 --> + <div itemscope id="amanda" itemref="a b"></div> + <p id="a"> + Name: <span itemprop="name">Amanda</span> + </p> + <div id="b" itemprop="band" itemscope itemref="c"></div> + <div id="c"> + <p> + Band: <span itemprop="name">Jazz Band</span> + </p> + <p> + Size: <span itemprop="size">12</span> players + </p> + </div> -<!-- result1 --> -<div itemscope itemtype="http://schema.org/Movie"> + <!-- result1 --> + <div itemscope itemtype="http://schema.org/Movie"> <h1 itemprop="name">Avatar</h1> - <div itemprop="director" itemscope itemtype="http://schema.org/Person"> - Director: <span itemprop="name">James Cameron</span> + <div itemprop="director" itemscope + itemtype="http://schema.org/Person"> + Director: <span itemprop="name">James Cameron</span> </div> -</div> + </div> </body> </head> http://git-wip-us.apache.org/repos/asf/any23/blob/60e93a76/test-resources/src/test/resources/microdata/microdata-richsnippet-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-richsnippet-expected.nquads b/test-resources/src/test/resources/microdata/microdata-richsnippet-expected.nquads index 9ea9752..f59e6a0 100644 --- a/test-resources/src/test/resources/microdata/microdata-richsnippet-expected.nquads +++ b/test-resources/src/test/resources/microdata/microdata-richsnippet-expected.nquads @@ -15,15 +15,18 @@ # limitations under the License. # -_:nodee6ae2861b16a51a6519079d82c13763 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://data-vocabulary.org/Person> <http://bob.example.com/> . -_:nodee6ae2861b16a51a6519079d82c13763 <http://data-vocabulary.org/Person/title> "graduate research assistant" <http://bob.example.com/> . -_:nodee6ae2861b16a51a6519079d82c13763 <http://data-vocabulary.org/Person/nickname> "Johnny" <http://bob.example.com/> . -_:node14cf7264b949d7a9e18598d198e5f65 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://data-vocabulary.org/Address> <http://bob.example.com/> . -_:node14cf7264b949d7a9e18598d198e5f65 <http://data-vocabulary.org/Address/region> "Georgia" <http://bob.example.com/> . -_:node14cf7264b949d7a9e18598d198e5f65 <http://data-vocabulary.org/Address/locality> "Warner Robins" <http://bob.example.com/> . -_:node14cf7264b949d7a9e18598d198e5f65 <http://data-vocabulary.org/Address/street-address> "1234 Peach Drive" <http://bob.example.com/> . -_:nodee6ae2861b16a51a6519079d82c13763 <http://data-vocabulary.org/Person/address> _:node14cf7264b949d7a9e18598d198e5f65 <http://bob.example.com/> . -_:nodee6ae2861b16a51a6519079d82c13763 <http://data-vocabulary.org/Person/name> "John Doe" <http://bob.example.com/> . -_:nodee6ae2861b16a51a6519079d82c13763 <http://data-vocabulary.org/Person/affiliation> "University of Dreams" <http://bob.example.com/> . -_:nodee6ae2861b16a51a6519079d82c13763 <http://data-vocabulary.org/Person/url> <http://www.JohnnyD.com> <http://bob.example.com/> . -<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:nodee6ae2861b16a51a6519079d82c13763 <http://bob.example.com/> . \ No newline at end of file +_:node9423934b5f186fd49d90edd31b5625ba <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://data-vocabulary.org/Person> <http://bob.example.com/> . +_:nodee94f8737ad89876c85bd87156a1eb585 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://data-vocabulary.org/Address> <http://bob.example.com/> . +_:nodee94f8737ad89876c85bd87156a1eb585 <http://data-vocabulary.org/Address/street-address> "1234 Peach Drive" <http://bob.example.com/> . +_:nodee94f8737ad89876c85bd87156a1eb585 <http://data-vocabulary.org/Address/locality> "Warner Robins" <http://bob.example.com/> . +_:nodee94f8737ad89876c85bd87156a1eb585 <http://data-vocabulary.org/Address/region> "Georgia" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/address> _:nodee94f8737ad89876c85bd87156a1eb585 <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/affiliation> "University of Dreams" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/street-address> "1234 Peach Drive" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/name> "John Doe" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/nickname> "Johnny" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/locality> "Warner Robins" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/title> "graduate research assistant" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/region> "Georgia" <http://bob.example.com/> . +_:node9423934b5f186fd49d90edd31b5625ba <http://data-vocabulary.org/Person/url> <http://www.JohnnyD.com> <http://bob.example.com/> . +<http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node9423934b5f186fd49d90edd31b5625ba <http://bob.example.com/> . \ No newline at end of file
