Add an option for setting the title; add test for interlanguage links;

remove dupliate test

diff --git a/maintenance/parserTests.php b/maintenance/parserTests.php
index 6e1422e..db56705 100644 (file)
--- a/maintenance/parserTests.php
+++ b/maintenance/parserTests.php
@@ -189,8 +189,15 @@ class ParserTest {
                        $options->setUseTex(true);
                }
 
+               if (preg_match('/title=\[\[(.*)\]\]/', $opts, $m)) {
+                       $titleText = $m[1];
+               }
+               else {
+                       $titleText = 'Parser test';
+               }
+
                $parser =& new Parser();
-               $title =& Title::makeTitle( NS_MAIN, 'Parser_test' );
+               $title =& Title::makeTitle( NS_MAIN, $titleText );
 
                if (preg_match('/pst/i', $opts)) {
                        $out = $parser->preSaveTransform( $input, $title, $user, $options );
@@ -205,12 +212,12 @@ class ParserTest {
                        $op = new OutputPage();
                        $op->replaceLinkHolders($out);
 
-                       #if (preg_match('/ill/i', $opts)) {
-                       #       $out .= $output->getLanguageLinks();
-                       #}
-                       #if (preg_match('/cat/i', $opts)) {
-                       #       $out .= $output->getCategoryLinks();
-                       #}
+                       if (preg_match('/ill/i', $opts)) {
+                               $out .= implode( ' ', $output->getLanguageLinks() );
+                       }       
+                       if (preg_match('/cat/i', $opts)) {
+                               $out .= implode( ' ', $output->getCategoryLinks() );
+                       }
 
                        if ($GLOBALS['wgUseTidy']) {
                                $result = Parser::tidy($result);

diff --git a/maintenance/parserTests.sql b/maintenance/parserTests.sql
index e93be58..26e22af 100644 (file)
--- a/maintenance/parserTests.sql
+++ b/maintenance/parserTests.sql
@@ -285,8 +285,9 @@ CREATE TEMPORARY TABLE parsertestlogging (
   KEY page_time (log_namespace, log_title, log_timestamp)
 );
 
-INSERT INTO parsertestinterwiki VALUES('MeatBall',
-       'http://www.usemod.com/cgi-bin/mb.pl?$1',
-       0
-);
+INSERT INTO parsertestinterwiki (iw_prefix,iw_url,iw_local) VALUES
+       ('MeatBall','http://www.usemod.com/cgi-bin/mb.pl?$1',0),
+       ('es','http://es.wikipedia.org/wiki/$1',1),
+       ('fr','http://fr.wikipedia.org/wiki/$1',1),
+       ('zh','http://zh.wikipedia.org/wiki/$1',1);
 

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 86e1ae7..f68ca94 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -8,7 +8,10 @@
 #      (default)       generate HTML output
 #      pst             apply pre-save transform
 #      msg             apply message transform
+#      cat             add category links
+#      ill             add inter-language links
 #      subpage         enable subpages (disabled by default)
+#      title=[[XXX]]   run test using article title XXX
 #
 # Tests can be disabled with the '!!disabled' flag.
 #
@@ -686,30 +689,6 @@ Piped link to namespace
 </p>
 !! end
 
-!! article
-Category:MediaWiki User's Guide
-!! text
-blah
-!! endarticle
-
-!! test
-Link to category
-!! input
-[[:Category:MediaWiki User's Guide]]
-!! result
-<p><a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User's Guide">Category:MediaWiki User's Guide</a>
-</p>
-!! end
-
-!! test
-Link to image page
-!! input
-[[:Image:Ncwikicol.png]]
-!! result
-<p><a href="/wiki/Image:Ncwikicol.png" title="Image:Ncwikicol.png">Image:Ncwikicol.png</a>
-</p>
-!! end
-
 !! test
 Plain link to URL
 !! input
@@ -1152,7 +1131,7 @@ Link to image page
 ### Subpages
 ###
 !! article
-Parser test/subpage
+Subpage test/subpage
 !! text
 foo
 !! endarticle
@@ -1160,22 +1139,22 @@ foo
 !! test
 Subpage link
 !! options
-subpage
+subpage title=[[Subpage test]]
 !! input
 [[/subpage]]
 !! result
-<p><a href="/wiki/Parser_test/subpage" title="Parser test/subpage">/subpage</a>
+<p><a href="/wiki/Subpage_test/subpage" title="Subpage test/subpage">/subpage</a>
 </p>
 !! end
 
 !! test
 Subpage noslash link
 !! options
-subpage
+subpage title=[[Subpage test]]
 !!input
 [[/subpage/]]
 !! result
-<p><a href="/wiki/Parser_test/subpage" title="Parser test/subpage">subpage</a>
+<p><a href="/wiki/Subpage_test/subpage" title="Subpage test/subpage">subpage</a>
 </p>
 !! end
 
@@ -1189,6 +1168,50 @@ Disabled subpages
 </p>
 !! end
 
+###
+### Categories
+###
+!! article
+Category:MediaWiki User's Guide
+!! text
+blah
+!! endarticle
+
+!! test
+Link to category
+!! input
+[[:Category:MediaWiki User's Guide]]
+!! result
+<p><a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User's Guide">Category:MediaWiki User's Guide</a>
+</p>
+!! end
+
+!! test
+Simple category
+!! options
+cat
+!! input
+[[Category: MediaWiki User's Guide]]
+!! result
+<a href="/wiki/Category:MediaWiki_User%27s_Guide" title="Category:MediaWiki User's Guide">MediaWiki User's Guide</a>
+!! end
+
+###
+### Inter-language links
+###
+!! test
+Inter-language links
+!! options
+ill
+!! input
+[[es:Alimento]]
+[[fr:Nourriture]]
+[[zh:&#39135;&#21697;]]
+!! result
+es:Alimento fr:Nourriture zh:食品
+!! end
+
+
 TODO:
 more images
 more tables