Sync up with Parsoid parserTests.

This now aligns with Parsoid commit b869b084be641d0e2150648ea926ca974590e6e3

Change-Id: I3e8ebd578db8b6630d23ebbdedb5036fa5a092e5

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index c127be2..58860e9 100644 (file)
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -14,9 +14,8 @@
 # Plus any combination of these:
 #
 # cat           add category links
 # Plus any combination of these:
 #
 # cat           add category links

-#               (ignored by Parsoid, since it emits <link>s)

 # ill           add inter-language links
 # ill           add inter-language links

-#               (ignored by Parsoid, since it emits <links>s)
+#               (ignored by Parsoid, since it emits <link>s)

 # subpage       enable subpages (disabled by default)
 # noxml         don't check for XML well-formedness
 # title=[[XXX]] run test using article title XXX
 # subpage       enable subpages (disabled by default)
 # noxml         don't check for XML well-formedness
 # title=[[XXX]] run test using article title XXX


@@ -3330,18 +3329,14 @@ parsoid=wt2html,wt2wt
 <span about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":" [[Category:foo]]"}},"i":0}}]}'> </span><link rel="mw:PageProp/Category" href="./Category:Foo" about="#mwt1"> <!-- No pre&#x2D;wrapping -->
 !! end
 
 <span about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":" [[Category:foo]]"}},"i":0}}]}'> </span><link rel="mw:PageProp/Category" href="./Category:Foo" about="#mwt1"> <!-- No pre&#x2D;wrapping -->
 !! end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.

 !! test
 7b. Indent-pre and category links
 !! options
 !! test
 7b. Indent-pre and category links
 !! options

-parsoid=wt2html
+parsoid=wt2html,wt2wt

 !! wikitext
  [[Category:foo]] a
  [[Category:foo]] {{echo|b}}
 !! wikitext
  [[Category:foo]] a
  [[Category:foo]] {{echo|b}}

-!! html/parsoid
+!! html

 <pre><link rel="mw:PageProp/Category" href="./Category:Foo"> a
  <link rel="mw:PageProp/Category" href="./Category:Foo"> <span about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"b"}},"i":0}}]}'>b</span></pre>
 !! end
 <pre><link rel="mw:PageProp/Category" href="./Category:Foo"> a
  <link rel="mw:PageProp/Category" href="./Category:Foo"> <span about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"b"}},"i":0}}]}'>b</span></pre>
 !! end


@@ -10865,14 +10860,8 @@ Un-closed <includeonly>
 !! html
 !! end
 
 !! html
 !! end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize the include directives to serialize on their own line.
-## Selser will take care of preserving formatting in scenarios where they
-## intermingled with other wikitext.

 !! test
 Includes and comments at SOL
 !! test
 Includes and comments at SOL

-!! options
-parsoid=wt2html,html2html

 !! wikitext
 <!-- comment --><noinclude><!-- comment --></noinclude><!-- comment -->== hu ==
 
 !! wikitext
 <!-- comment --><noinclude><!-- comment --></noinclude><!-- comment -->== hu ==
 


@@ -11053,14 +11042,10 @@ parsoid=wt2html,wt2wt
 </tbody></table>
 !!end
 
 </tbody></table>
 !!end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize the include directives to serialize on their own line.
-## Selser will take care of preserving formatting in scenarios where they
-## intermingled with other wikitext.

 !!test
 2. Table tag in SOL posn. should get reparsed correctly with valid TSR
 !!options
 !!test
 2. Table tag in SOL posn. should get reparsed correctly with valid TSR
 !!options

-parsoid=wt2html
+parsoid=wt2html,wt2wt

 !!wikitext
 <includeonly>a</includeonly>{| {{{b}}}
 |c
 !!wikitext
 <includeonly>a</includeonly>{| {{{b}}}
 |c


@@ -14275,22 +14260,15 @@ pst
 [[Category:Foo (bar)|Foo]]
 !! end
 
 [[Category:Foo (bar)|Foo]]
 !! end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.

 !! test
 Category with link tail
 !! options
 cat
 pst
 !! test
 Category with link tail
 !! options
 cat
 pst

-parsoid=wt2html

 !! wikitext
 123[[Category:Foo]]456
 !! wikitext
 123[[Category:Foo]]456

-!! html/php
+!! html

 123[[Category:Foo]]456
 123[[Category:Foo]]456

-!! html/parsoid
-<p>123<link rel="mw:PageProp/Category" href="Category:Foo"/>456</p>

 !! end
 
 !! test
 !! end
 
 !! test


@@ -14326,14 +14304,8 @@ pst
 [[Category:{{echo|Foo}}|{{echo|Bar}}]]
 !! end
 
 [[Category:{{echo|Foo}}|{{echo|Bar}}]]
 !! end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.

 !! test
 Category / paragraph interactions
 !! test
 Category / paragraph interactions

-!! options
-parsoid=wt2html

 !! wikitext
 Foo [[Category:Baz]] Bar
 
 !! wikitext
 Foo [[Category:Baz]] Bar
 


@@ -14360,7 +14332,7 @@ Bar
 [[Category:Baz]]
  {{echo|[[Category:Baz]]}}
 [[Category:Baz]]
 [[Category:Baz]]
  {{echo|[[Category:Baz]]}}
 [[Category:Baz]]

-!! html/php
+!! html

 <p>Foo Bar
 </p><p>Foo
 Bar
 <p>Foo Bar
 </p><p>Foo
 Bar


@@ -14370,32 +14342,20 @@ Bar
 </p><p>Foo
 Bar
 </p>
 </p><p>Foo
 Bar
 </p>

-!! html/parsoid
-<p>Foo <link rel="mw:PageProp/Category" href="Category:Baz"/> Bar</p>
-<p>Foo <link rel="mw:PageProp/Category" href="Category:Baz"/> Bar</p>
-<p>Foo <link rel="mw:PageProp/Category" href="Category:Baz"/> Bar</p>
-<p>Foo <link rel="mw:PageProp/Category" href="Category:Baz"/> Bar</p>
-<p>Foo <link rel="mw:PageProp/Category" href="Category:Baz"/> <link rel="mw:PageProp/Category" href="Category:Baz"/> <link rel="mw:PageProp/Category" href="Category:Baz"/> Bar <link rel="mw:PageProp/Category" href="Category:Baz"/> <link rel="mw:PageProp/Category" href="Category:Baz"/> <link rel="mw:PageProp/Category" href="Category:Baz"/> <link rel="mw:PageProp/Category" href="Category:Baz"/> <link rel="mw:PageProp/Category" href="Category:Baz" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"[[Category:Baz]]"}},"i":0}}]}'/></p>
-<link rel="mw:PageProp/Category" href="Category:Baz"/>

 !! end
 
 !! end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.
-##

 ## The whitespace on the empty line is part of the test. Please do not delete
 !! test
 1. Categories and newlines: All preceding newlines should be suppressed (courtesy bug 87)
 !! options
 ## The whitespace on the empty line is part of the test. Please do not delete
 !! test
 1. Categories and newlines: All preceding newlines should be suppressed (courtesy bug 87)
 !! options

-parsoid=wt2html
+parsoid=wt2html,wt2wt

 !! wikitext
 This
    
 [[Category:Foo]] and this should be part of same paragraph (not an indent-pre)
    
 {{echo|[[Category:Foo]] and so should this!}}
 !! wikitext
 This
    
 [[Category:Foo]] and this should be part of same paragraph (not an indent-pre)
    
 {{echo|[[Category:Foo]] and so should this!}}

-!! html/php
+!! html

 <p>This and this should be part of same paragraph (not an indent-pre) and so should this!
 </p>
 !! html/parsoid
 <p>This and this should be part of same paragraph (not an indent-pre) and so should this!
 </p>
 !! html/parsoid


@@ -14493,14 +14453,8 @@ parsoid=wt2html
 <link rel="mw:PageProp/Category" href="./Category:Foo" data-parsoid='{"stx":"simple","a":{"href":"./Category:Foo"},"sa":{"href":"Category:Foo"}}'/>
 !! end
 
 <link rel="mw:PageProp/Category" href="./Category:Foo" data-parsoid='{"stx":"simple","a":{"href":"./Category:Foo"},"sa":{"href":"Category:Foo"}}'/>
 !! end
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.

 !! test
 6. Categories and newlines: migrateTrailingCategories dom pass should not migrate categories not preceded by newlines
 !! test
 6. Categories and newlines: migrateTrailingCategories dom pass should not migrate categories not preceded by newlines

-!! options
-parsoid=wt2html

 !! wikitext
 * a [[Category:Foo]]
 !! html/parsoid
 !! wikitext
 * a [[Category:Foo]]
 !! html/parsoid


@@ -14516,7 +14470,7 @@ parsoid=wt2html
 * {{echo|a
 [[Category:Foo]]}}
 !! html/parsoid
 * {{echo|a
 [[Category:Foo]]}}
 !! html/parsoid

-<ul><li> <span about="#mwt1" typeof="mw:Transclusion" data-parsoid='{"pi":[[{"k":"1","spc":["","","",""]}]]}' data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"a\n[[Category:Foo]]"}},"i":0}}]}'>a</span><span about="#mwt1">
+<ul><li> <span about="#mwt1" typeof="mw:Transclusion" data-parsoid='{"pi":[[{"k":"1","spc":["","","",""]}]]}' data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"a\n[[Category:Foo]]"}},"i":0}}]}'>a

 </span><link rel="mw:PageProp/Category" href="./Category:Foo" about="#mwt1" data-parsoid='{"stx":"simple","a":{"href":"./Category:Foo"},"sa":{"href":"Category:Foo"}}'/></li></ul>
 !! end
 
 </span><link rel="mw:PageProp/Category" href="./Category:Foo" about="#mwt1" data-parsoid='{"stx":"simple","a":{"href":"./Category:Foo"},"sa":{"href":"Category:Foo"}}'/></li></ul>
 !! end
 


@@ -14551,20 +14505,13 @@ parsoid
 </p>
 !! end
 
 </p>
 !! end
 

-# We used to, but no longer wt2wt this test since the default serializer
-# will normalize all categories to serialize on their own line.
-# This wikitext usage is going to be fairly uncommon in production and
-# selser will take care of preventing whitespace insertion if this
-# occurs in an article.
-#
-# html2html disabled for the same reason (whitespace insertion between
-# x and y).
-#
-# html2wt disabled because it localizes the "Category" namespace.
+# html2wt localizes the "Category" namespace.
+# XXX the <link> element needs an empty data-parsoid attribute, or
+# else the html2html test fails because spaces are inserted.

 !! test
 Link prefix/suffixes aren't applied to category links
 !! options
 !! test
 Link prefix/suffixes aren't applied to category links
 !! options

-parsoid=wt2html
+parsoid=wt2html,wt2wt,html2html

 language=is
 !! wikitext
 x[[Category:Foo]]y
 language=is
 !! wikitext
 x[[Category:Foo]]y


@@ -19264,25 +19211,17 @@ Category:分類
 blah
 !! endarticle
 
 blah
 !! endarticle
 

-## We used to, but no longer wt2wt this test since the default serializer
-## will normalize all categories to serialize on their own line.
-## This wikitext usage is going to be fairly uncommon in production and
-## selser will take care of preserving formatting in those scenarios.

 !! test
 Don't convert blue categorylinks to another variant (bug 33210)
 !! options
 !! test
 Don't convert blue categorylinks to another variant (bug 33210)
 !! options

-cat
-language=zh
-parsoid=wt2html
+language=zh cat

 !! wikitext
 [[A]][[Category:分类]]
 !! wikitext
 [[A]][[Category:分类]]

-!! html/php
+!! html

 <a href="/wiki/Category:%E5%88%86%E7%B1%BB" title="Category:分类">分类</a>
 <a href="/wiki/Category:%E5%88%86%E7%B1%BB" title="Category:分类">分类</a>

-!! html/parsoid
-<p><a rel="mw:WikiLink" href="A" title="A">A</a></p>
-<link rel="mw:PageProp/Category" href="Category:分类"/>

 !! end
 
 !! end
 

+

 !! test
 Stripping -{}- tags (language variants)
 !! options
 !! test
 Stripping -{}- tags (language variants)
 !! options


@@ -23281,7 +23220,7 @@ parsoid=html2wt
 <p>this is not a link: http://example.com
 </p>
 !! wikitext
 <p>this is not a link: http://example.com
 </p>
 !! wikitext

-<nowiki>this is not a link: http://example.com</nowiki>
+this is not a link: <nowiki>http://example.com</nowiki>

 !! end
 
 !! test
 !! end
 
 !! test


@@ -23626,8 +23565,7 @@ parsoid=html2wt
 
  __TOC__ foo
 
 
  __TOC__ foo
 

-__TOC__
- bar
+__TOC__ bar

 !! end
 
 #### --------------- HTML tags ---------------
 !! end
 
 #### --------------- HTML tags ---------------


@@ -25433,7 +25371,7 @@ parsoid=html2wt
 !! html/parsoid
 <p>http://example.com is not a link.</p>
 !! wikitext
 !! html/parsoid
 <p>http://example.com is not a link.</p>
 !! wikitext

-<nowiki>http://example.com is not a link.</nowiki>
+<nowiki>http://example.com</nowiki> is not a link.

 !! end
 
 !! test
 !! end
 
 !! test


@@ -25443,7 +25381,7 @@ parsoid=html2wt
 !! html/parsoid
 <p><a rel="mw:ExtLink" href="http://example.com">http://example.com</a> http://example.com is not a link.</p>
 !! wikitext
 !! html/parsoid
 <p><a rel="mw:ExtLink" href="http://example.com">http://example.com</a> http://example.com is not a link.</p>
 !! wikitext

-http://example.com<nowiki> http://example.com is not a link.</nowiki>
+http://example.com <nowiki>http://example.com</nowiki> is not a link.

 !! end
 
 !! test
 !! end
 
 !! test


@@ -25686,26 +25624,6 @@ parsoid=html2wt
 # Tests spec'ing wikitext serialization norms |
 # --------------------------------------------
 
 # Tests spec'ing wikitext serialization norms |
 # --------------------------------------------
 

-!! test
-1. Categories should always be serialized on their own line
-!! options
-parsoid=html2wt
-!! html/parsoid
-foo<link rel="mw:PageProp/Category" href="./Category:Foo">bar
-!! wikitext
-foo
-[[Category:Foo]]
-bar
-!! end
-
-!! test
-2. Categories that are part of templates should not introduce a line break
-!! wikitext
-foo {{echo|<span>bar</span> [[Category:baz]]}} bar
-!! html/parsoid
-<p>foo <span about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;span>bar&lt;/span> [[Category:baz]]"}},"i":0}}]}'>bar</span><span about="#mwt1"> </span><link rel="mw:PageProp/Category" href="./Category:Baz" about="#mwt1" data-parsoid='{"stx":"simple","a":{"href":"./Category:Baz"},"sa":{"href":"Category:baz"}}'/> bar</p>
-!! end
-

 !! test
 Lists: Add space after bullets
 !! options
 !! test
 Lists: Add space after bullets
 !! options