From f86db05d8df0d7f7795e855b797ca7bb213e8ec2 Mon Sep 17 00:00:00 2001 From: addshore Date: Sat, 25 Jan 2014 14:26:03 +0100 Subject: [PATCH] Remove unused stuff from tests Change-Id: Iddabfbc80378b02fa4a2c58f80d50241be8105d3 --- tests/phpunit/includes/RevisionStorageTest.php | 9 +++++---- tests/phpunit/includes/WikiPageTest.php | 2 -- tests/phpunit/includes/XmlTest.php | 5 +---- tests/phpunit/includes/api/ApiEditPageTest.php | 1 - tests/phpunit/includes/libs/RunningStatTest.php | 2 -- tests/phpunit/includes/objectcache/BagOStuffTest.php | 2 -- tests/phpunit/includes/upload/UploadFromUrlTest.php | 6 +++--- tests/phpunit/includes/utils/UIDGeneratorTest.php | 3 --- 8 files changed, 9 insertions(+), 21 deletions(-) diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php index f69fad42ed..e69660edea 100644 --- a/tests/phpunit/includes/RevisionStorageTest.php +++ b/tests/phpunit/includes/RevisionStorageTest.php @@ -206,10 +206,12 @@ class RevisionStorageTest extends MediaWikiTestCase { */ public function testFetchRevision() { $page = $this->createPage( 'RevisionStorageTest_testFetchRevision', 'one', CONTENT_MODEL_WIKITEXT ); - $id1 = $page->getRevision()->getId(); + + // Hidden process cache assertion below + $page->getRevision()->getId(); $page->doEditContent( new WikitextContent( 'two' ), 'second rev' ); - $id2 = $page->getRevision()->getId(); + $id = $page->getRevision()->getId(); $res = Revision::fetchRevision( $page->getTitle() ); @@ -219,9 +221,8 @@ class RevisionStorageTest extends MediaWikiTestCase { $rows[$row->rev_id] = $row; } - $row = $res->fetchObject(); $this->assertEquals( 1, count( $rows ), 'expected exactly one revision' ); - $this->assertArrayHasKey( $id2, $rows, 'missing revision with id ' . $id2 ); + $this->assertArrayHasKey( $id, $rows, 'missing revision with id ' . $id ); } /** diff --git a/tests/phpunit/includes/WikiPageTest.php b/tests/phpunit/includes/WikiPageTest.php index 6cf658f40f..9b41a9c393 100644 --- a/tests/phpunit/includes/WikiPageTest.php +++ b/tests/phpunit/includes/WikiPageTest.php @@ -593,8 +593,6 @@ class WikiPageTest extends MediaWikiLangTestCase { } $page = $this->createPage( $title, $text, $model ); - $hasLinks = wfGetDB( DB_SLAVE )->selectField( 'pagelinks', 1, - array( 'pl_from' => $page->getId() ), __METHOD__ ); $editInfo = $page->prepareContentForEdit( $page->getContent() ); diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php index 8205029f54..86b4c3556b 100644 --- a/tests/phpunit/includes/XmlTest.php +++ b/tests/phpunit/includes/XmlTest.php @@ -144,10 +144,7 @@ class XmlTest extends MediaWikiTestCase { $prevYear = $curYear - 1; $curMonth = intval( gmdate( 'n' ) ); - $prevMonth = $curMonth - 1; - if ( $prevMonth == 0 ) { - $prevMonth = 12; - } + $nextMonth = $curMonth + 1; if ( $nextMonth == 13 ) { $nextMonth = 1; diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 0a6607eb63..80c2fde26f 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -391,7 +391,6 @@ class ApiEditPageTest extends ApiTestCase { $rpage->doEditContent( new WikitextContent( "#REDIRECT [[$name]]" ), "testing 1", EDIT_NEW, false, self::$users['sysop']->user ); $this->forceRevisionDate( $rpage, '20120101000000' ); - $baseTime = $rpage->getRevision()->getTimestamp(); // new edit to content $page->doEditContent( new WikitextContent( "Foo bar" ), diff --git a/tests/phpunit/includes/libs/RunningStatTest.php b/tests/phpunit/includes/libs/RunningStatTest.php index e24c08877b..dc5db82ce5 100644 --- a/tests/phpunit/includes/libs/RunningStatTest.php +++ b/tests/phpunit/includes/libs/RunningStatTest.php @@ -32,8 +32,6 @@ class RunningStatTest extends MediaWikiTestCase { return pow( $mean - $x, 2 ); }, $this->points ) ) / ( count( $rstat ) - 1 ); $stddev = sqrt( $variance ); - $min = min( $this->points ); - $max = max( $this->points ); $this->assertEquals( count( $rstat ), count( $this->points ) ); $this->assertEquals( $rstat->min, min( $this->points ) ); diff --git a/tests/phpunit/includes/objectcache/BagOStuffTest.php b/tests/phpunit/includes/objectcache/BagOStuffTest.php index aa78394306..1670823d35 100644 --- a/tests/phpunit/includes/objectcache/BagOStuffTest.php +++ b/tests/phpunit/includes/objectcache/BagOStuffTest.php @@ -74,8 +74,6 @@ class BagOStuffTest extends MediaWikiTestCase { $fork &= !$this->cache instanceof MultiWriteBagOStuff; if ( $fork ) { // callback should take awhile now so that we can test concurrent merge attempts - $usleep = 5000; - $pid = pcntl_fork(); if ( $pid == -1 ) { // can't fork, ignore this test... diff --git a/tests/phpunit/includes/upload/UploadFromUrlTest.php b/tests/phpunit/includes/upload/UploadFromUrlTest.php index 397c100bc0..879d82185a 100644 --- a/tests/phpunit/includes/upload/UploadFromUrlTest.php +++ b/tests/phpunit/includes/upload/UploadFromUrlTest.php @@ -224,9 +224,6 @@ class UploadFromUrlTest extends ApiTestCase { $this->deleteFile( 'UploadFromUrlTest.png' ); - $talkRev = Revision::newFromTitle( $talk ); - $talkSize = $talkRev->getSize(); - $exception = false; try { $this->doApiRequest( array( @@ -249,6 +246,9 @@ class UploadFromUrlTest extends ApiTestCase { return; /* // Broken until using leavemessage with ignorewarnings is supported + $talkRev = Revision::newFromTitle( $talk ); + $talkSize = $talkRev->getSize(); + $job->run(); $this->assertFalse( wfLocalFile( 'UploadFromUrlTest.png' )->exists() ); diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php b/tests/phpunit/includes/utils/UIDGeneratorTest.php index 1a1bbaf286..1eab5a347a 100644 --- a/tests/phpunit/includes/utils/UIDGeneratorTest.php +++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php @@ -21,9 +21,6 @@ class UIDGeneratorTest extends MediaWikiTestCase { } $lastId = array_shift( $ids ); - if ( $hostbits ) { - $lastHost = substr( wfBaseConvert( $lastId, 10, 2, $bits ), -$hostbits ); - } $this->assertArrayEquals( array_unique( $ids ), $ids, "All generated IDs are unique." ); -- 2.20.1