Make setUp and tearDown protected in tests

[lhc/web/wiklou.git] / tests / phpunit / includes / diff / DifferenceEngineTest.php

diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php
index a10c024..f95eb5e 100644 (file)
--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
@@ -16,7 +16,7 @@ class DifferenceEngineTest extends MediaWikiTestCase {
 
        private static $revisions;
 
-       public function setUp() {
+       protected function setUp() {
                parent::setUp();
 
                $title = $this->getTitle();
@@ -47,7 +47,7 @@ class DifferenceEngineTest extends MediaWikiTestCase {
                $strings = array( "it is a kitten", "two kittens", "three kittens", "four kittens" );
                $revisions = array();
 
-               foreach( $strings as $string ) {
+               foreach ( $strings as $string ) {
                        $content = ContentHandler::makeContent( $string, $title );
                        $page->doEditContent( $content, 'edit page' );
                        $revisions[] = $page->getLatest();
@@ -59,7 +59,7 @@ class DifferenceEngineTest extends MediaWikiTestCase {
        public function testMapDiffPrevNext() {
                $cases = $this->getMapDiffPrevNextCases();
 
-               foreach( $cases as $case ) {
+               foreach ( $cases as $case ) {
                        list( $expected, $old, $new, $message ) = $case;
 
                        $diffEngine = new DifferenceEngine( $this->context, $old, $new, 2, true, false );
@@ -81,14 +81,14 @@ class DifferenceEngineTest extends MediaWikiTestCase {
        public function testLoadRevisionData() {
                $cases = $this->getLoadRevisionDataCases();
 
-               foreach( $cases as $case ) {
+               foreach ( $cases as $case ) {
                        list( $expectedOld, $expectedNew, $old, $new, $message ) = $case;
 
                        $diffEngine = new DifferenceEngine( $this->context, $old, $new, 2, true, false );
                        $diffEngine->loadRevisionData();
 
-                       $this->assertEquals( $diffEngine->mOldid, $expectedOld, $message );
-                       $this->assertEquals( $diffEngine->mNewid, $expectedNew, $message );
+                       $this->assertEquals( $diffEngine->getOldid(), $expectedOld, $message );
+                       $this->assertEquals( $diffEngine->getNewid(), $expectedNew, $message );
                }
        }