X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FBlockTest.php;h=480d7d2e71f79bbf8da2a6000d614ca77aa22882;hb=5988bdee5d0f9b7e5c93bb7ce9496111b6141cd7;hp=02546fa5455e087bacbe9c1c4882552fcbcb0081;hpb=cbec306bba11d8d62e873586d78b9e384f95ec82;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/BlockTest.php b/tests/phpunit/includes/BlockTest.php
index 02546fa545..480d7d2e71 100644
--- a/tests/phpunit/includes/BlockTest.php
+++ b/tests/phpunit/includes/BlockTest.php
@@ -6,7 +6,9 @@
  */
 class BlockTest extends MediaWikiLangTestCase {
 
-	private $block, $madeAt;
+	/** @var Block */
+	private $block;
+	private $madeAt;
 
 	/* variable used to save up the blockID we insert in this test suite */
 	private $blockId;
@@ -59,51 +61,34 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * debug function : dump the ipblocks table
 	 */
 	function dumpBlocks() {
-		$v = $this->db->query( 'SELECT * FROM unittest_ipblocks' );
+		$v = $this->db->select( 'ipblocks', '*' );
 		print "Got " . $v->numRows() . " rows. Full dump follow:\n";
 		foreach ( $v as $row ) {
 			print_r( $row );
 		}
 	}
 
-	function testInitializerFunctionsReturnCorrectBlock() {
-		// $this->dumpBlocks();
-
+	/**
+	 * @covers Block::newFromTarget
+	 */
+	public function testINewFromTargetReturnsCorrectBlock() {
 		$this->assertTrue( $this->block->equals( Block::newFromTarget( 'UTBlockee' ) ), "newFromTarget() returns the same block as the one that was made" );
+	}
 
+	/**
+	 * @covers Block::newFromID
+	 */
+	public function testINewFromIDReturnsCorrectBlock() {
 		$this->assertTrue( $this->block->equals( Block::newFromID( $this->blockId ) ), "newFromID() returns the same block as the one that was made" );
-
 	}
 
 	/**
 	 * per bug 26425
 	 */
-	function testBug26425BlockTimestampDefaultsToTime() {
+	public function testBug26425BlockTimestampDefaultsToTime() {
 		// delta to stop one-off errors when things happen to go over a second mark.
 		$delta = abs( $this->madeAt - $this->block->mTimestamp );
 		$this->assertLessThan( 2, $delta, "If no timestamp is specified, the block is recorded as time()" );
-
-	}
-
-	/**
-	 * This is the method previously used to load block info in CheckUser etc
-	 * passing an empty value (empty string, null, etc) as the ip parameter bypasses IP lookup checks.
-	 *
-	 * This stopped working with r84475 and friends: regression being fixed for bug 29116.
-	 *
-	 * @dataProvider provideBug29116Data
-	 */
-	function testBug29116LoadWithEmptyIp( $vagueTarget ) {
-		$this->hideDeprecated( 'Block::load' );
-
-		$uid = User::idFromName( 'UTBlockee' );
-		$this->assertTrue( ( $uid > 0 ), 'Must be able to look up the target user during tests' );
-
-		$block = new Block();
-		$ok = $block->load( $vagueTarget, $uid );
-		$this->assertTrue( $ok, "Block->load() with empty IP and user ID '$uid' should return a block" );
-
-		$this->assertTrue( $this->block->equals( $block ), "Block->load() returns the same block as the one that was made when given empty ip param " . var_export( $vagueTarget, true ) );
 	}
 
 	/**
@@ -112,8 +97,9 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * had. Regression bug 29116.
 	 *
 	 * @dataProvider provideBug29116Data
+	 * @covers Block::newFromTarget
 	 */
-	function testBug29116NewFromTargetWithEmptyIp( $vagueTarget ) {
+	public function testBug29116NewFromTargetWithEmptyIp( $vagueTarget ) {
 		$block = Block::newFromTarget( 'UTBlockee', $vagueTarget );
 		$this->assertTrue( $this->block->equals( $block ), "newFromTarget() returns the same block as the one that was made when given empty vagueTarget param " . var_export( $vagueTarget, true ) );
 	}
@@ -126,14 +112,16 @@ class BlockTest extends MediaWikiLangTestCase {
 		);
 	}
 
-	function testBlockedUserCanNotCreateAccount() {
+	/**
+	 * @covers Block::prevents
+	 */
+	public function testBlockedUserCanNotCreateAccount() {
 		$username = 'BlockedUserToCreateAccountWith';
 		$u = User::newFromName( $username );
 		$u->setPassword( 'NotRandomPass' );
 		$u->addToDatabase();
 		unset( $u );
 
-
 		// Sanity check
 		$this->assertNull(
 			Block::newFromTarget( $username ),
@@ -187,7 +175,10 @@ class BlockTest extends MediaWikiLangTestCase {
 		);
 	}
 
-	function testCrappyCrossWikiBlocks() {
+	/**
+	 * @covers Block::insert
+	 */
+	public function testCrappyCrossWikiBlocks() {
 		// Delete the last round's block if it's still there
 		$oldBlock = Block::newFromTarget( 'UserOnForeignWiki' );
 		if ( $oldBlock ) {
@@ -346,8 +337,10 @@ class BlockTest extends MediaWikiLangTestCase {
 
 	/**
 	 * @dataProvider providerXff
+	 * @covers Block::getBlocksForIPList
+	 * @covers Block::chooseBlock
 	 */
-	function testBlocksOnXff( $xff, $exCount, $exResult ) {
+	public function testBlocksOnXff( $xff, $exCount, $exResult ) {
 		$list = array_map( 'trim', explode( ',', $xff ) );
 		$xffblocks = Block::getBlocksForIPList( $list, true );
 		$this->assertEquals( $exCount, count( $xffblocks ), 'Number of blocks for ' . $xff );