X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=tests%2Fphpunit%2Fmaintenance%2FDumpTestCase.php;h=3dbd9edcc1f2118972d174ca01b78be220d45d31;hb=b801fa8b3b3b42fb6db9129d4642f6e583b56879;hp=fd39c45b0e8bdf1b19ad46b0719a2a45e29c640f;hpb=2f5914c2ce4c612920dd96f5ef66e3bd342d2195;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/maintenance/DumpTestCase.php b/tests/phpunit/maintenance/DumpTestCase.php
index fd39c45b0e..3dbd9edcc1 100644
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -1,11 +1,9 @@
 <?php
-global $IP;
-require_once( "$IP/maintenance/backup.inc" );
 
 /**
  * Base TestCase for dumps
  */
-abstract class DumpTestCase extends MediaWikiTestCase {
+abstract class DumpTestCase extends MediaWikiLangTestCase {
 
 	/**
 	 * exception to be rethrown once in sound PHPUnit surrounding
@@ -74,7 +72,7 @@ abstract class DumpTestCase extends MediaWikiTestCase {
 	 *
 	 * Clears $wgUser, and reports errors from addDBData to PHPUnit
 	 */
-	protected function setUp() {
+	public function setUp() {
 		global $wgUser;
 
 		parent::setUp();
@@ -297,13 +295,21 @@ abstract class DumpTestCase extends MediaWikiTestCase {
 	 * @param $text_sha1 string: the base36 SHA-1 of the revision's text
 	 * @param $text string|false: (optional) The revision's string, or false to check for a
 	 *            revision stub
+	 * @param $model int: the expected content model id (default: CONTENT_MODEL_WIKITEXT)
+	 * @param $format int: the expected format model id (default: CONTENT_FORMAT_WIKITEXT)
+	 * @param $parentid int|false: (optional) id of the parent revision
 	 */
-	protected function assertRevision( $id, $summary, $text_id, $text_bytes, $text_sha1, $text = false ) {
+	protected function assertRevision( $id, $summary, $text_id, $text_bytes, $text_sha1, $text = false, 
+						$model = CONTENT_MODEL_WIKITEXT, $format = CONTENT_FORMAT_WIKITEXT,
+						$parentid = false ) {
 
 		$this->assertNodeStart( "revision" );
 		$this->skipWhitespace();
 
 		$this->assertTextNode( "id", $id );
+		if( $parentid ) {
+			$this->assertTextNode( "parentid", $parentid );
+		}
 		$this->assertTextNode( "timestamp", false );
 
 		$this->assertNodeStart( "contributor" );
@@ -313,14 +319,39 @@ abstract class DumpTestCase extends MediaWikiTestCase {
 		$this->skipWhitespace();
 
 		$this->assertTextNode( "comment", $summary );
+		$this->skipWhitespace();
+
+		if ( $this->xml->name == "text" ) {
+			// note: <text> tag may occur here or at the very end.
+			$text_found = true;
+			$this->assertText( $id, $text_id, $text_bytes, $text );
+		} else {
+			$text_found = false;
+		}
+
+		$this->assertTextNode( "sha1", $text_sha1 );
+
+		$this->assertTextNode( "model", $model );
+		$this->skipWhitespace();
+
+		$this->assertTextNode( "format", $format );
+		$this->skipWhitespace();
 
+		if ( !$text_found ) {
+			$this->assertText( $id, $text_id, $text_bytes, $text );
+		}
+
+		$this->assertNodeEnd( "revision" );
+		$this->skipWhitespace();
+	}
+
+	protected function assertText( $id, $text_id, $text_bytes, $text ) {
 		$this->assertNodeStart( "text", false );
 		if ( $text_bytes !== false ) {
 			$this->assertEquals( $this->xml->getAttribute( "bytes" ), $text_bytes,
 				"Attribute 'bytes' of revision " . $id );
 		}
 
-
 		if ( $text === false ) {
 			// Testing for a stub
 			$this->assertEquals( $this->xml->getAttribute( "id" ), $text_id,
@@ -342,10 +373,7 @@ abstract class DumpTestCase extends MediaWikiTestCase {
 			$this->skipWhitespace();
 		}
 
-		$this->assertTextNode( "sha1", $text_sha1 );
-
 		$this->assertNodeEnd( "revision" );
 		$this->skipWhitespace();
 	}
-
 }