merged master

[lhc/web/wiklou.git] / tests / phpunit / maintenance / DumpTestCase.php

diff --git a/tests/phpunit/maintenance/DumpTestCase.php b/tests/phpunit/maintenance/DumpTestCase.php
index 976fd6b..71cd988 100644 (file)
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -311,6 +311,18 @@ abstract class DumpTestCase extends MediaWikiLangTestCase {
                $this->skipWhitespace();
 
                $this->assertTextNode( "comment", $summary );
+               $this->skipWhitespace();
+
+               if ( $this->xml->name == "model" ) { // model tag is optional
+                       $this->assertTextNode( "model", CONTENT_MODEL_WIKITEXT ); //@todo: make this a test parameter
+                       $this->skipWhitespace();
+               }
+
+
+               if ( $this->xml->name == "format" ) { // format tag is optional
+                       $this->assertTextNode( "format", CONTENT_FORMAT_WIKITEXT ); //@todo: make this a test parameter
+                       $this->skipWhitespace();
+               }
 
                $this->assertTextNode( "sha1", $text_sha1 );