From 17eb1f343d915445d9625815f2f31b1d5eb4a3f0 Mon Sep 17 00:00:00 2001
From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 21 Jun 2012 19:11:08 +0200
Subject: [PATCH] check for </revision> only once. fix parameter list.

Change-Id: Ib88d094efa63baf289c1856ca3cd97a20de9ceb9
---
 tests/phpunit/maintenance/DumpTestCase.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/maintenance/DumpTestCase.php b/tests/phpunit/maintenance/DumpTestCase.php
index 3dbd9edcc1..dc69e6b1c7 100644
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -299,9 +299,8 @@ abstract class DumpTestCase extends MediaWikiLangTestCase {
 	 * @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, 
-						$model = CONTENT_MODEL_WIKITEXT, $format = CONTENT_FORMAT_WIKITEXT,
-						$parentid = false ) {
+	protected function assertRevision( $id, $summary, $text_id, $text_bytes, $text_sha1, $text = false, $parentid = false,
+						$model = CONTENT_MODEL_WIKITEXT, $format = CONTENT_FORMAT_WIKITEXT ) {
 
 		$this->assertNodeStart( "revision" );
 		$this->skipWhitespace();
@@ -372,8 +371,5 @@ abstract class DumpTestCase extends MediaWikiLangTestCase {
 			$this->assertNodeEnd( "text" );
 			$this->skipWhitespace();
 		}
-
-		$this->assertNodeEnd( "revision" );
-		$this->skipWhitespace();
 	}
 }
-- 
2.20.1