objectcache: add setMockTime() method to BagOStuff/WANObjectCache

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

diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index 8b644c5..ab067a4 100644 (file)
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -54,7 +54,7 @@ class RevisionTest extends MediaWikiTestCase {
                        ->method( 'getArticleID' )
                        ->will( $this->returnValue( 23 ) );
                $mock->expects( $this->any() )
-                       ->method( 'getModel' )
+                       ->method( 'getContentModel' )
                        ->will( $this->returnValue( $model ) );
 
                return $mock;
@@ -985,7 +985,6 @@ class RevisionTest extends MediaWikiTestCase {
                                'ar_id',
                                'ar_page_id',
                                'ar_rev_id',
-                               'ar_text',
                                'ar_text_id',
                                'ar_timestamp',
                                'ar_user_text',
@@ -1007,7 +1006,6 @@ class RevisionTest extends MediaWikiTestCase {
                                'ar_id',
                                'ar_page_id',
                                'ar_rev_id',
-                               'ar_text',
                                'ar_text_id',
                                'ar_timestamp',
                                'ar_user_text',
@@ -1097,7 +1095,6 @@ class RevisionTest extends MediaWikiTestCase {
                                        'ar_namespace',
                                        'ar_title',
                                        'ar_rev_id',
-                                       'ar_text',
                                        'ar_text_id',
                                        'ar_timestamp',
                                        'ar_minor_edit',
@@ -1129,7 +1126,6 @@ class RevisionTest extends MediaWikiTestCase {
                                        'ar_namespace',
                                        'ar_title',
                                        'ar_rev_id',
-                                       'ar_text',
                                        'ar_text_id',
                                        'ar_timestamp',
                                        'ar_minor_edit',