From 29d6a9ea85c8fb939b4fdaabb92e08eb42bfdefc Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Sun, 27 Oct 2013 13:45:00 -0400 Subject: Updated ITS 2.0 test suite --- .../html/withintext1htmloutput.txt | 14 +++++---- .../html/withintext3htmloutput.txt | 12 ++++---- .../html/withintext4htmloutput.txt | 16 +++++----- .../html/externalresource1htmloutput.txt | 7 ++--- .../html/externalresource2htmloutput.txt | 21 +++++++------ .../html/externalresource3htmloutput.txt | 7 ++--- .../localefilter/html/locale1htmloutput.txt | 24 +++++++-------- .../localefilter/html/locale2htmloutput.txt | 20 ++++++------- .../localefilter/html/locale3htmloutput.txt | 24 +++++++-------- .../localefilter/html/locale4htmloutput.txt | 22 +++++++------- .../localefilter/html/locale5htmloutput.txt | 21 +++++++++++++ .../expected/localefilter/xml/locale1xmloutput.txt | 22 +++++++------- .../expected/localefilter/xml/locale2xmloutput.txt | 12 ++++---- .../expected/localefilter/xml/locale3xmloutput.txt | 18 ++++++------ .../expected/localefilter/xml/locale4xmloutput.txt | 34 +++++++++++----------- .../expected/localefilter/xml/locale5xmloutput.txt | 12 ++++---- .../expected/localefilter/xml/locale6xmloutput.txt | 30 +++++++++---------- .../expected/localefilter/xml/locale7xmloutput.txt | 24 +++++++-------- .../expected/localefilter/xml/locale8xmloutput.txt | 19 ++++++++++++ .../localizationnote/xml/locnote1xmloutput.txt | 1 - .../translate/html/translate1htmloutput.txt | 7 ++++- .../translate/html/translate2htmloutput.txt | 6 ++++ .../translate/html/translate3htmloutput.txt | 1 + .../translate/html/translate7htmloutput.txt | 4 ++- .../expected/translate/xml/translate4xmloutput.txt | 5 ++++ 25 files changed, 222 insertions(+), 161 deletions(-) create mode 100644 tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt create mode 100644 tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt (limited to 'tests/ITS-2.0-Testsuite/expected') diff --git a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt index 4436193..512ceff 100644 --- a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt @@ -5,17 +5,19 @@ /html/head[1]/link[1] withinText="no" /html/head[1]/link[1]/@href /html/head[1]/link[1]/@rel +/html/head[1]/title[1] withinText="no" /html/body[1] withinText="no" /html/body[1]/section[1] withinText="no" -/html/body[1]/section[1]/title[1] withinText="no" -/html/body[1]/section[1]/span[1] withinText="no" -/html/body[1]/section[1]/span[1]/@itemref -/html/body[1]/section[1]/span[2] withinText="no" -/html/body[1]/section[1]/span[2]/@itemref +/html/body[1]/section[1]/@itemscope +/html/body[1]/section[1]/span[1] withinText="yes" +/html/body[1]/section[1]/span[1]/@itemprop +/html/body[1]/section[1]/span[2] withinText="yes" +/html/body[1]/section[1]/span[2]/@itemprop /html/body[1]/p[1] withinText="no" +/html/body[1]/p[1]/@itemscope /html/body[1]/p[1]/cite[1] withinText="nested" /html/body[1]/p[1]/span[1] withinText="yes" -/html/body[1]/p[1]/span[1]/@itemref +/html/body[1]/p[1]/span[1]/@itemprop /html/body[1]/p[2] withinText="no" /html/body[1]/p[2]/img[1] withinText="yes" /html/body[1]/p[2]/img[1]/@alt diff --git a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt index 4436193..2a17954 100644 --- a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt @@ -5,17 +5,19 @@ /html/head[1]/link[1] withinText="no" /html/head[1]/link[1]/@href /html/head[1]/link[1]/@rel +/html/head[1]/title[1] withinText="no" /html/body[1] withinText="no" /html/body[1]/section[1] withinText="no" -/html/body[1]/section[1]/title[1] withinText="no" +/html/body[1]/section[1]/@itemscope /html/body[1]/section[1]/span[1] withinText="no" -/html/body[1]/section[1]/span[1]/@itemref -/html/body[1]/section[1]/span[2] withinText="no" -/html/body[1]/section[1]/span[2]/@itemref +/html/body[1]/section[1]/span[1]/@itemprop +/html/body[1]/section[1]/span[2] withinText="yes" +/html/body[1]/section[1]/span[2]/@itemprop /html/body[1]/p[1] withinText="no" +/html/body[1]/p[1]/@itemscope /html/body[1]/p[1]/cite[1] withinText="nested" /html/body[1]/p[1]/span[1] withinText="yes" -/html/body[1]/p[1]/span[1]/@itemref +/html/body[1]/p[1]/span[1]/@itemprop /html/body[1]/p[2] withinText="no" /html/body[1]/p[2]/img[1] withinText="yes" /html/body[1]/p[2]/img[1]/@alt diff --git a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt index f060955..c71064d 100644 --- a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt @@ -1,20 +1,22 @@ /html withinText="no" /html/head[1] withinText="no" -/html/head[1]/script[1] withinText="no" +/html/head[1]/script[1] withinText="nested" /html/head[1]/script[1]/@type /html/head[1]/meta[1] withinText="no" /html/head[1]/meta[1]/@charset +/html/head[1]/title[1] withinText="no" /html/body[1] withinText="no" /html/body[1]/section[1] withinText="no" -/html/body[1]/section[1]/title[1] withinText="no" -/html/body[1]/section[1]/span[1] withinText="no" -/html/body[1]/section[1]/span[1]/@itemref -/html/body[1]/section[1]/span[2] withinText="no" -/html/body[1]/section[1]/span[2]/@itemref +/html/body[1]/section[1]/@itemscope +/html/body[1]/section[1]/span[1] withinText="yes" +/html/body[1]/section[1]/span[1]/@itemprop +/html/body[1]/section[1]/span[2] withinText="yes" +/html/body[1]/section[1]/span[2]/@itemprop /html/body[1]/p[1] withinText="no" +/html/body[1]/p[1]/@itemscope /html/body[1]/p[1]/cite[1] withinText="nested" /html/body[1]/p[1]/span[1] withinText="yes" -/html/body[1]/p[1]/span[1]/@itemref +/html/body[1]/p[1]/span[1]/@itemprop /html/body[1]/p[2] withinText="no" /html/body[1]/p[2]/img[1] withinText="yes" /html/body[1]/p[2]/img[1]/@alt diff --git a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt index 9d13062..00f0a71 100644 --- a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt @@ -13,7 +13,6 @@ /html/body[1]/video[1]/@poster externalResourceRef="video-image.png" /html/body[1]/video[1]/@src externalResourceRef="http://www.example.com/video/v2.mp" /html/body[1]/video[1]/@width -/html/body[1]/video[1]/p[1] -/html/body[1]/video[1]/p[1]/code[1] -/html/body[1]/video[1]/p[1]/a[1] -/html/body[1]/video[1]/p[1]/a[1]/@href +/html/body[1]/video[1]/code[1] +/html/body[1]/video[1]/a[1] +/html/body[1]/video[1]/a[1]/@href diff --git a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt index d665d90..d753b88 100644 --- a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt @@ -8,14 +8,13 @@ /html/head[1]/link[1]/@rel /html/head[1]/title[1] /html/body[1] -/html/body[1]/span[1] -/html/body[1]/span[1]/@id -/html/body[1]/span[1]/video[1] externalResourceRef="video-image.png" -/html/body[1]/span[1]/video[1]/@height -/html/body[1]/span[1]/video[1]/@poster -/html/body[1]/span[1]/video[1]/@src -/html/body[1]/span[1]/video[1]/@width -/html/body[1]/span[1]/video[1]/p[1] -/html/body[1]/span[1]/video[1]/p[1]/code[1] -/html/body[1]/span[1]/video[1]/p[1]/a[1] -/html/body[1]/span[1]/video[1]/p[1]/a[1]/@href +/html/body[1]/p[1] +/html/body[1]/p[1]/@id +/html/body[1]/p[1]/video[1] externalResourceRef="video-image.png" +/html/body[1]/p[1]/video[1]/@height +/html/body[1]/p[1]/video[1]/@poster +/html/body[1]/p[1]/video[1]/@src +/html/body[1]/p[1]/video[1]/@width +/html/body[1]/p[1]/video[1]/code[1] +/html/body[1]/p[1]/video[1]/a[1] +/html/body[1]/p[1]/video[1]/a[1]/@href diff --git a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt index e4200a8..d32f37f 100644 --- a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt @@ -12,7 +12,6 @@ /html/body[1]/video[1]/@poster /html/body[1]/video[1]/@src /html/body[1]/video[1]/@width -/html/body[1]/video[1]/p[1] -/html/body[1]/video[1]/p[1]/code[1] -/html/body[1]/video[1]/p[1]/a[1] -/html/body[1]/video[1]/p[1]/a[1]/@href +/html/body[1]/video[1]/code[1] +/html/body[1]/video[1]/a[1] +/html/body[1]/video[1]/a[1]/@href diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt index 9637b55..c4f99d0 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt @@ -1,12 +1,12 @@ -/html localeFilterList="*" -/html/head[1] localeFilterList="*" -/html/head[1]/meta[1] localeFilterList="*" -/html/head[1]/meta[1]/@charset localeFilterList="*" -/html/head[1]/title[1] localeFilterList="*" -/html/head[1]/link[1] localeFilterList="*" -/html/head[1]/link[1]/@href localeFilterList="*" -/html/head[1]/link[1]/@rel localeFilterList="*" -/html/body[1] localeFilterList="*" -/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" +/html localeFilterList="*" localeFilterType="include" +/html/head[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include" +/html/head[1]/title[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/link[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/link[1]/@href localeFilterList="*" localeFilterType="include" +/html/head[1]/link[1]/@rel localeFilterList="*" localeFilterType="include" +/html/body[1] localeFilterList="*" localeFilterType="include" +/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt index 3bbac28..b0e1336 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt @@ -1,10 +1,10 @@ -/html localeFilterList="*" -/html/head[1] localeFilterList="*" -/html/head[1]/meta[1] localeFilterList="*" -/html/head[1]/meta[1]/@charset localeFilterList="*" -/html/head[1]/title[1] localeFilterList="*" -/html/body[1] localeFilterList="*" -/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/@its-locale-filter-list localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" +/html localeFilterList="*" localeFilterType="include" +/html/head[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include" +/html/head[1]/title[1] localeFilterList="*" localeFilterType="include" +/html/body[1] localeFilterList="*" localeFilterType="include" +/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/@its-locale-filter-list localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt index 9637b55..c4f99d0 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt @@ -1,12 +1,12 @@ -/html localeFilterList="*" -/html/head[1] localeFilterList="*" -/html/head[1]/meta[1] localeFilterList="*" -/html/head[1]/meta[1]/@charset localeFilterList="*" -/html/head[1]/title[1] localeFilterList="*" -/html/head[1]/link[1] localeFilterList="*" -/html/head[1]/link[1]/@href localeFilterList="*" -/html/head[1]/link[1]/@rel localeFilterList="*" -/html/body[1] localeFilterList="*" -/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" +/html localeFilterList="*" localeFilterType="include" +/html/head[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include" +/html/head[1]/title[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/link[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/link[1]/@href localeFilterList="*" localeFilterType="include" +/html/head[1]/link[1]/@rel localeFilterList="*" localeFilterType="include" +/html/body[1] localeFilterList="*" localeFilterType="include" +/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt index 3100bb5..b0f1f16 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt @@ -1,11 +1,11 @@ -/html localeFilterList="*" -/html/head[1] localeFilterList="*" -/html/head[1]/script[1] localeFilterList="*" -/html/head[1]/script[1]/@type localeFilterList="*" -/html/head[1]/meta[1] localeFilterList="*" -/html/head[1]/meta[1]/@charset localeFilterList="*" -/html/head[1]/title[1] localeFilterList="*" -/html/body[1] localeFilterList="*" -/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" -/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" +/html localeFilterList="*" localeFilterType="include" +/html/head[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/script[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/script[1]/@type localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include" +/html/head[1]/title[1] localeFilterList="*" localeFilterType="include" +/html/body[1] localeFilterList="*" localeFilterType="include" +/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include" +/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt new file mode 100644 index 0000000..5873400 --- /dev/null +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt @@ -0,0 +1,21 @@ +/html localeFilterList="*" localeFilterType="include" +/html/head[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include" +/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include" +/html/head[1]/title[1] localeFilterList="*" localeFilterType="include" +/html/body[1] localeFilterList="*" localeFilterType="include" +/html/body[1]/div[1] localeFilterList="*-ca" localeFilterType="include" +/html/body[1]/div[1]/@its-locale-filter-list localeFilterList="*-ca" localeFilterType="include" +/html/body[1]/div[1]/p[1] localeFilterList="*-ca" localeFilterType="include" +/html/body[1]/div[2] localeFilterList="*-ca" localeFilterType="exclude" +/html/body[1]/div[2]/@its-locale-filter-list localeFilterList="*-ca" localeFilterType="exclude" +/html/body[1]/div[2]/@its-locale-filter-type localeFilterList="*-ca" localeFilterType="exclude" +/html/body[1]/div[2]/p[1] localeFilterList="*-ca" localeFilterType="exclude" +/html/body[1]/div[3] localeFilterList="*" localeFilterType="exclude" +/html/body[1]/div[3]/@its-locale-filter-list localeFilterList="*" localeFilterType="exclude" +/html/body[1]/div[3]/@its-locale-filter-type localeFilterList="*" localeFilterType="exclude" +/html/body[1]/div[3]/p[1] localeFilterList="*" localeFilterType="exclude" +/html/body[1]/div[4] localeFilterList="" localeFilterType="exclude" +/html/body[1]/div[4]/@its-locale-filter-list localeFilterList="" localeFilterType="exclude" +/html/body[1]/div[4]/@its-locale-filter-type localeFilterList="" localeFilterType="exclude" +/html/body[1]/div[4]/p[1] localeFilterList="" localeFilterType="exclude" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt index e3d4353..455864b 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt @@ -1,11 +1,11 @@ -/book localeFilterList="*" -/book/@its:version localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/its:rules[1] localeFilterList="*" -/book/info[1]/its:rules[1]/@version localeFilterList="*" -/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*" -/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" -/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*" -/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt index e3d2d52..b2ed3e1 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt @@ -1,6 +1,6 @@ -/book localeFilterList="*" -/book/@its:version localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/@its:localeFilterList localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/@its:localeFilterList localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt index d793039..c3124af 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt @@ -1,9 +1,9 @@ -/book localeFilterList="*" -/book/@its:version localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/its:rules[1] localeFilterList="*" -/book/info[1]/its:rules[1]/@version localeFilterList="*" -/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" -/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt index df596ae..4960df4 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt @@ -1,17 +1,17 @@ -/book localeFilterList="*" -/book/@its:version localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/its:rules[1] localeFilterList="*" -/book/info[1]/its:rules[1]/@version localeFilterList="*" -/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" -/book/info[1]/its:rules[2] localeFilterList="*" -/book/info[1]/its:rules[2]/@version localeFilterList="*" -/book/info[1]/its:rules[2]/its:localeFilterRule[1] localeFilterList="*" -/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" -/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@selector localeFilterList="*" -/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" -/book/info[1]/legalnotice[2] localeFilterList="de-DE" -/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" -/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[2] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[2]/@version localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[2]/its:localeFilterRule[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@selector localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/legalnotice[2] localeFilterList="de-DE" localeFilterType="include" +/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" localeFilterType="include" +/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt index ceced3d..41ec233 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt @@ -1,6 +1,6 @@ -/book localeFilterList="*" -/book/@its:version localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/its:span[1] localeFilterList="en-CA, fr-CA" -/book/info[1]/its:span[1]/@localeFilterList localeFilterList="en-CA, fr-CA" -/book/info[1]/its:span[1]/para[1] localeFilterList="en-CA, fr-CA" +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:span[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/its:span[1]/@localeFilterList localeFilterList="en-CA, fr-CA" localeFilterType="include" +/book/info[1]/its:span[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt index 17f244f..e569e43 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt @@ -1,15 +1,15 @@ -/book localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/its:rules[1] localeFilterList="*" -/book/info[1]/its:rules[1]/@version localeFilterList="*" -/book/info[1]/its:rules[1]/its:param[1] localeFilterList="*" -/book/info[1]/its:rules[1]/its:param[1]/@name localeFilterList="*" -/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*" -/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" -/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*" -/book/info[1]/legalnotice[1] localeFilterList="*" -/book/info[1]/legalnotice[1]/@role localeFilterList="*" -/book/info[1]/legalnotice[1]/para[1] localeFilterList="*" -/book/info[1]/legalnotice[2] localeFilterList="de-DE" -/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" -/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" +/book localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:param[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:param[1]/@name localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1]/@role localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[2] localeFilterList="de-DE" localeFilterType="include" +/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" localeFilterType="include" +/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt index d395b38..077e94b 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt @@ -1,12 +1,12 @@ -/book localeFilterList="*" -/book/@its:version localeFilterList="*" -/book/info[1] localeFilterList="*" -/book/info[1]/its:rules[1] localeFilterList="*" -/book/info[1]/its:rules[1]/@version localeFilterList="*" -/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" -/book/info[1]/legalnotice[1] localeFilterList="*" -/book/info[1]/legalnotice[1]/@role localeFilterList="*" -/book/info[1]/legalnotice[1]/para[1] localeFilterList="*" -/book/info[1]/legalnotice[2] localeFilterList="de-DE" -/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" -/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include" +/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1]/@role localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[2] localeFilterList="de-DE" localeFilterType="include" +/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" localeFilterType="include" +/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" localeFilterType="include" diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt new file mode 100644 index 0000000..4e30862 --- /dev/null +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt @@ -0,0 +1,19 @@ +/book localeFilterList="*" localeFilterType="include" +/book/@its:version localeFilterList="*" localeFilterType="include" +/book/info[1] localeFilterList="*" localeFilterType="include" +/book/info[1]/legalnotice[1] localeFilterList="*-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/@its:localeFilterList localeFilterList="*-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/@its:localeFilterType localeFilterList="*-CA" localeFilterType="include" +/book/info[1]/legalnotice[1]/para[1] localeFilterList="*-CA" localeFilterType="include" +/book/info[1]/legalnotice[2] localeFilterList="*-CA" localeFilterType="exclude" +/book/info[1]/legalnotice[2]/@its:localeFilterList localeFilterList="*-CA" localeFilterType="exclude" +/book/info[1]/legalnotice[2]/@its:localeFilterType localeFilterList="*-CA" localeFilterType="exclude" +/book/info[1]/legalnotice[2]/para[1] localeFilterList="*-CA" localeFilterType="exclude" +/book/info[1]/legalnotice[3] localeFilterList="*" localeFilterType="exclude" +/book/info[1]/legalnotice[3]/@its:localeFilterList localeFilterList="*" localeFilterType="exclude" +/book/info[1]/legalnotice[3]/@its:localeFilterType localeFilterList="*" localeFilterType="exclude" +/book/info[1]/legalnotice[3]/para[1] localeFilterList="*" localeFilterType="exclude" +/book/info[1]/legalnotice[4] localeFilterList="" localeFilterType="exclude" +/book/info[1]/legalnotice[4]/@its:localeFilterList localeFilterList="" localeFilterType="exclude" +/book/info[1]/legalnotice[4]/@its:localeFilterType localeFilterList="" localeFilterType="exclude" +/book/info[1]/legalnotice[4]/para[1] localeFilterList="" localeFilterType="exclude" diff --git a/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt index 7a4a9b1..1cee566 100644 --- a/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt @@ -1,7 +1,6 @@ /myRes /myRes/head[1] /myRes/head[1]/its:rules[1] -/myRes/head[1]/its:rules[1]/@its:translate /myRes/head[1]/its:rules[1]/@version /myRes/head[1]/its:rules[1]/its:locNoteRule[1] /myRes/head[1]/its:rules[1]/its:locNoteRule[1]/@locNoteType diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt index e518dc9..e0b7ee9 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt @@ -3,10 +3,15 @@ /html/head[1]/meta[1] translate="yes" /html/head[1]/meta[1]/@charset translate="no" /html/head[1]/title[1] translate="yes" -/html/head[1]/link[1] translate="yes" +/html/head[1]/link[1] translate="no" /html/head[1]/link[1]/@href translate="no" /html/head[1]/link[1]/@rel translate="no" /html/body[1] translate="yes" +/html/body[1]/img[1] translate="yes" +/html/body[1]/img[1]/@alt translate="yes" +/html/body[1]/img[1]/@height translate="no" +/html/body[1]/img[1]/@src translate="no" +/html/body[1]/img[1]/@width translate="no" /html/body[1]/p[1] translate="yes" /html/body[1]/p[1]/@id translate="no" /html/body[1]/p[1]/@title translate="yes" diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt index 9d0dc84..f8281c6 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt @@ -1,10 +1,16 @@ /html translate="yes" +/html/@lang translate="yes" /html/head[1] translate="yes" /html/head[1]/meta[1] translate="yes" /html/head[1]/meta[1]/@charset translate="no" /html/head[1]/title[1] translate="yes" /html/body[1] translate="yes" /html/body[1]/p[1] translate="yes" +/html/body[1]/p[1]/img[1] translate="yes" +/html/body[1]/p[1]/img[1]/@alt translate="yes" +/html/body[1]/p[1]/img[1]/@height translate="no" +/html/body[1]/p[1]/img[1]/@src translate="no" +/html/body[1]/p[1]/img[1]/@width translate="no" /html/body[1]/p[1]/span[1] translate="no" /html/body[1]/p[1]/span[1]/@translate translate="no" /html/body[1]/p[1]/span[2] translate="no" diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt index 38b15cc..daecaee 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt @@ -10,6 +10,7 @@ /html/body[1]/span[1] translate="yes" /html/body[1]/span[1]/@translate translate="no" /html/body[1]/section[1] translate="no" +/html/body[1]/section[1]/@title translate="no" /html/body[1]/section[1]/p[1] translate="yes" /html/body[1]/section[1]/p[1]/span[1] translate="no" /html/body[1]/section[1]/p[1]/span[2] translate="no" diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt index 65856ef..b328e5c 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt @@ -1,5 +1,5 @@ /html translate="yes" -/html/@lang translate="no" +/html/@lang translate="yes" /html/head[1] translate="yes" /html/head[1]/script[1] translate="yes" /html/head[1]/script[1]/@type translate="no" @@ -7,6 +7,8 @@ /html/head[1]/meta[1]/@charset translate="no" /html/head[1]/title[1] translate="yes" /html/body[1] translate="yes" +/html/body[1]/@title translate="yes" /html/body[1]/p[1] translate="yes" +/html/body[1]/p[1]/@style translate="yes" /html/body[1]/p[1]/code[1] translate="no" /html/body[1]/p[1]/code[1]/@id translate="no" diff --git a/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt index 3d22e7e..99b3b9a 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt @@ -3,6 +3,11 @@ /book/head[1] translate="yes" /book/head[1]/title[1] translate="yes" /book/body[1] translate="yes" +/book/body[1]/img[1] translate="yes" +/book/body[1]/img[1]/@alt translate="no" +/book/body[1]/img[1]/@height translate="no" +/book/body[1]/img[1]/@src translate="no" +/book/body[1]/img[1]/@width translate="no" /book/body[1]/p[1] translate="yes" /book/body[1]/p[1]/fexp[1] translate="no" /book/body[1]/p[1]/fexp[1]/@its:translate translate="no" -- cgit v1.2.1