Use Article::doEdit(), much, much easier
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Fri, 13 May 2011 09:28:09 +0000 (09:28 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Fri, 13 May 2011 09:28:09 +0000 (09:28 +0000)
tests/phpunit/includes/search/SearchEngineTest.php

index f1b67dd..86ef3a9 100644 (file)
@@ -84,8 +84,7 @@ class SearchEngineTest extends MediaWikiTestCase {
                        $dbw = $this->db;
                        $title = Title::newFromText( $pageName );
 
-                       $userId = 0;
-                       $userText = 'WikiSysop';
+                       $user = User::newFromName( 'WikiSysop' );
                        $comment = 'Search Test';
 
                        // avoid memory leak...?
@@ -93,40 +92,7 @@ class SearchEngineTest extends MediaWikiTestCase {
                        $linkCache->clear();
 
                        $article = new Article( $title );
-                       $pageId = $article->getId();
-                       $created = false;
-                       if ( $pageId == 0 ) {
-                               # must create the page...
-                               $pageId = $article->insertOn( $dbw );
-                               $created = true;
-                       }
-
-                       # FIXME: Use original rev_id optionally (better for backups)
-                       # Insert the row
-                       $revision = new Revision( array(
-                                                       'page'       => $pageId,
-                                                       'text'       => $text,
-                                                       'comment'    => $comment,
-                                                       'user'       => $userId,
-                                                       'user_text'  => $userText,
-                                                       'timestamp'  => 0,
-                                                       'minor_edit' => false,
-                       ) );
-                       $revId = $revision->insertOn( $dbw );
-                       $changed = $article->updateIfNewerOn( $dbw, $revision );
-
-                       $GLOBALS['wgTitle'] = $title;
-                       if ( $created ) {
-                               Article::onArticleCreate( $title );
-                               $article->createUpdates( $revision );
-                       } elseif ( $changed ) {
-                               Article::onArticleEdit( $title );
-                               $article->editUpdates(
-                                       $text, $comment, false, 0, $revId );
-                       }
-
-                       $su = new SearchUpdate( $article->getId(), $pageName, $text );
-                       $su->doUpdate();
+                       $article->doEdit( $text, $comment, 0, false, $user );
 
                        $this->pageList[] = array( $title, $article->getId() );