* Add printing the names of tests whose status has just changed when using "--record...

* Make $wgRawHtml testable by parserTests.
* Add a variety of new tests, some of which will fail and some of which will succeed. (Please feel free to edit expected test results if you think they are wrong, especially the subpage ones).

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index b255203..f3b1754 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -370,7 +370,7 @@ class ParserTest {
                        'wgLanguageCode' => $lang,
                        'wgContLanguageCode' => $lang,
                        'wgDBprefix' => 'parsertest_',
-
+                       'wgRawHtml' => preg_match('/\\brawhtml\\b/i', $opts),
                        'wgLang' => null,
                        'wgContLang' => null,
                        'wgNamespacesWithSubpages' => array( 0 => preg_match('/\\bsubpage\\b/i', $opts)),
@@ -843,6 +843,7 @@ class AnsiTermColorer {
        }
 }
 
+/* A colour-less terminal */
 class DummyTermColorer {
        function color( $color ) {
                return '';
@@ -894,9 +895,9 @@ class TestRecorder {
 }
 
 class DbTestRecorder extends TestRecorder  {
-       var $db; ///< Database connection to the main DB
-       var $curRun; ///< run ID number for the current run
-       var $prevRun; ///< run ID number for the previous run, if any
+       private $db;      ///< Database connection to the main DB
+       private $curRun;  ///< run ID number for the current run
+       private $prevRun; ///< run ID number for the previous run, if any
        
        function __construct( $term ) {
                parent::__construct( $term );
@@ -962,11 +963,15 @@ class DbTestRecorder extends TestRecorder  {
                                array( 'previously FAILING test(s) removed O_o', 0, null ),
                                array( 'new FAILING test(s) :(', null, 0 ),
                        );
-                       foreach( $table as $blah ) {
-                               list( $label, $before, $after ) = $blah;
-                               $count = $this->comparisonCount( $before, $after );
-                               if( $count ) {
+                       foreach( $table as $criteria ) {
+                               list( $label, $before, $after ) = $criteria;
+                               $differences = $this->compareResult( $before, $after );
+                               if( $differences ) {
+                                       $count = count($differences);
                                        printf( "%4d %s\n", $count, $label );
+                                       foreach ($differences as $differing_test_name) {
+                                               print "      * $differing_test_name\n";
+                                       }
                                }
                        }
                } else {
@@ -976,19 +981,20 @@ class DbTestRecorder extends TestRecorder  {
        }
        
        /**
-        * :P
+        ** @desc: Returns an array of the test names with changed results, based on the specified
+        **        before/after criteria.
         */
-       private function comparisonCount( $before, $after ) {
+       private function compareResult( $before, $after ) {
                $testitem = $this->db->tableName( 'testitem' );
                $prevRun = intval( $this->prevRun );
                $curRun = intval( $this->curRun );
                $prevStatus = $this->condition( $before );
                $curStatus = $this->condition( $after );
                
-               // note: requires a current mysql for subselects
+               // note: requires mysql >= ver 4.1 for subselects
                if( is_null( $after ) ) {
                        $sql = "
-                               select count(*) as c from $testitem as prev
+                               select prev.ti_name as t from $testitem as prev
                                        where prev.ti_run=$prevRun and
                                                prev.ti_success $prevStatus and
                                                (select current.ti_success from $testitem as current
@@ -996,7 +1002,7 @@ class DbTestRecorder extends TestRecorder  {
                                                                and prev.ti_name=current.ti_name) $curStatus";
                } else {
                        $sql = "
-                               select count(*) as c from $testitem as current 
+                               select current.ti_name as t from $testitem as current 
                                        where current.ti_run=$curRun and
                                                current.ti_success $curStatus and
                                                (select prev.ti_success from $testitem as prev
@@ -1004,11 +1010,17 @@ class DbTestRecorder extends TestRecorder  {
                                                                and prev.ti_name=current.ti_name) $prevStatus";
                }
                $result = $this->db->query( $sql, __METHOD__ );
-               $row = $this->db->fetchObject( $result );
+               $retval = array();
+               while ($row = $this->db->fetchObject( $result )) {
+                       $retval[] = $row->t;
+               }
                $this->db->freeResult( $result );
-               return $row->c;
+               return $retval;
        }
        
+       /**
+        ** @desc: Helper function for compareResult() database querying.
+        */
        private function condition( $value ) {
                if( is_null( $value ) ) {
                        return 'IS NULL';

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 4eab18b..ff48509 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -5871,6 +5871,221 @@ TODO: Images with the "|" character in the comment
 
 !!end
 
+!! test
+[Before] HTML without raw HTML enabled ($wgRawHtml==false)
+!! input
+<html><script>alert(1);</script></html>
+!! result
+<p>&lt;html&gt;&lt;script&gt;alert(1);&lt;/script&gt;&lt;/html&gt;
+</p>
+!! end
+
+!! test
+HTML with raw HTML ($wgRawHtml==true)
+!! options
+rawhtml
+!! input
+<html><script>alert(1);</script></html>
+!! result
+<p><script>alert(1);</script>
+</p>
+!! end
+
+!! test
+Parents of subpages, one level up
+!! options
+subpage title=[[Subpage test/L1/L2/L3]]
+!! input
+[[../|L2]]
+!! result
+<p><a href="/index.php?title=Subpage_test/L1/L2&amp;action=edit" class="new" title="Subpage test/L1/L2">L2</a>
+</p>
+!! end
+
+
+!! test
+Parents of subpages, one level up, not named
+!! options
+subpage title=[[Subpage test/L1/L2/L3]]
+!! input
+[[../]]
+!! result
+<p><a href="/index.php?title=Subpage_test/L1/L2&amp;action=edit" class="new" title="Subpage test/L1/L2">Subpage test/L1/L2</a>
+</p>
+!! end
+
+
+
+!! test
+Parents of subpages, two levels up
+!! options
+disabled
+subpage title=[[Subpage test/L1/L2/L3]]
+!! input
+[[../../|L1]]2
+!! result
+<p><a href="/index.php?title=Subpage_test/L1&amp;action=edit" class="new" title="Subpage test/L1">L1</a>
+</p>
+!! end
+
+
+# Question: should result be "/index.php?title=Subpage_test/L1&amp;action=edit" instead?
+!! test
+TODO: Parents of subpages, two levels up, without trailing slash or name.
+!! options
+subpage title=[[Subpage test/L1/L2/L3]]
+!! input
+[[../..]]
+!! result
+<p><a href="/index.php?title=Subpage_test/L1/L2/..&amp;action=edit" class="new" title="Subpage test/L1">../..</a>
+</p>
+!! end
+
+# Question: Why should the link text in the above test be "../..", yet in this test the "../.." part is silently dropped?
+# Current result: <p><a href="/index.php?title=Subpage_test/L1////&amp;action=edit" class="new" title="Subpage test/L1////">///
+!! test
+TODO: Parents of subpages, two levels up, with lots of extra trailing slashes.
+!! options
+subpage title=[[Subpage test/L1/L2/L3]]
+!! input
+[[../../////]]
+!! result
+<p><a href="/index.php?title=Subpage_test/L1&amp;action=edit" class="new" title="Subpage test/L1">Subpage test/L1</a>
+</p>
+!! end
+
+!! test
+Definition list code coverage
+!! input
+; title   : def
+; title : def
+;title: def
+!! result
+<dl><dt> title  &nbsp;</dt><dd> def
+</dd><dt> title&nbsp;</dt><dd> def
+</dd><dt>title</dt><dd> def
+</dd></dl>
+
+!! end
+
+!! test
+TODO: Don't fall for the self-closing div
+!! input
+<div>hello world</div/>
+!! result
+<div>hello world</div>
+
+!! end
+
+!! test
+MSGNW magic word
+!! input
+{{MSGNW:msg}}
+!! result
+<p>&#91;&#91;:Template:Msg]]
+</p>
+!! end
+
+!! test
+RAW magic word
+!! input
+{{RAW:QUERTY}}
+!! result
+<p><a href="/index.php?title=Template:QUERTY&amp;action=edit" class="new" title="Template:QUERTY">Template:QUERTY</a>
+</p>
+!! end
+
+!! test
+TODO: Always escape literal '>' in output, not just after '<'
+!! input
+><>
+!! result
+<p>&gt;&lt;&gt;
+</p>
+!! end
+
+!! test
+Template caching
+!! input
+{{Test}}
+{{Test}}
+!! result
+<p>This is a test template
+This is a test template
+</p>
+!! end
+
+
+!! article
+MediaWiki:Fake
+!! text
+==header==
+!! endarticle
+
+!! test
+Inclusion of !userCanEdit() content
+!! input
+{{MediaWiki:Fake}}
+!! result
+<a name="header"></a><h2><span class="editsection">[<a href="/index.php?title=MediaWiki:Fake&amp;action=edit&amp;section=1" title="MediaWiki:Fake">edit</a>]</span> <span class="mw-headline">header</span></h2>
+
+!! end
+
+
+!! test
+Out-of-order TOC heading levels
+!! input
+==2==
+======6======
+===3===
+=1=
+=====5=====
+==2==
+!! result
+<table id="toc" class="toc" summary="Contents"><tr><td><div id="toctitle"><h2>Contents</h2></div>
+<ul>
+<li class="toclevel-1"><a href="#2"><span class="tocnumber">1</span> <span class="toctext">2</span></a>
+<ul>
+<li class="toclevel-2"><a href="#6"><span class="tocnumber">1.1</span> <span class="toctext">6</span></a></li>
+<li class="toclevel-2"><a href="#3"><span class="tocnumber">1.2</span> <span class="toctext">3</span></a></li>
+</ul>
+</li>
+<li class="toclevel-1"><a href="#1_7"><span class="tocnumber">2</span> <span class="toctext">1</span></a>
+<ul>
+<li class="toclevel-2"><a href="#5"><span class="tocnumber">2.1</span> <span class="toctext">5</span></a></li>
+<li class="toclevel-2"><a href="#2_4"><span class="tocnumber">2.2</span> <span class="toctext">2</span></a></li>
+</ul>
+</li>
+</ul>
+</td></tr></table><script type="text/javascript"> if (window.showTocToggle) { var tocShowText = "show"; var tocHideText = "hide"; showTocToggle(); } </script>
+<a name="2"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: 2">edit</a>]</span> <span class="mw-headline">2</span></h2>
+<a name="6"></a><h6><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: 6">edit</a>]</span> <span class="mw-headline">6</span></h6>
+<a name="3"></a><h3><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: 3">edit</a>]</span> <span class="mw-headline">3</span></h3>
+<a name="1_7"></a><h1><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: 1">edit</a>]</span> <span class="mw-headline">1</span></h1>
+<a name="5"></a><h5><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: 5">edit</a>]</span> <span class="mw-headline">5</span></h5>
+<a name="2_4"></a><h2><span class="editsection">[<a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: 2">edit</a>]</span> <span class="mw-headline">2</span></h2>
+
+!! end
+
+
+!! test
+ISBN with a dummy number
+!! input
+ISBN ---
+!! result
+<p><a href="/index.php?title=Special:Booksources&amp;isbn=" class="internal">ISBN ---</a>
+</p>
+!! end
+
+
+!! test
+Pages in namespace (Magic word disabled currently)
+!! input
+{{PAGESINNAMESPACE:}}
+!! result
+
+!! end
+
 
 #
 #