X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fuser%2FUserTest.php;h=f24255b8da3f0f24f089e00e46ab1e16e719eecb;hp=2d87c78cdc469f00de4d2c8290002b46c7700da9;hb=9e8439e79d67788916d488f645108f79016d9aca;hpb=32a07dfb3efee9e93dcc252aa87e944ef3791c7c

diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php
index 2d87c78cdc..f24255b8da 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -31,7 +31,6 @@ class UserTest extends MediaWikiTestCase {
 		$this->setMwGlobals( [
 			'wgGroupPermissions' => [],
 			'wgRevokePermissions' => [],
-			'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
 		] );
 
 		$this->setUpPermissionGlobals();
@@ -560,10 +559,10 @@ class UserTest extends MediaWikiTestCase {
 		$this->markTestSkippedIfDbType( 'postgres' );
 
 		$users = User::findUsersByGroup( [] );
-		$this->assertEquals( 0, iterator_count( $users ) );
+		$this->assertSame( 0, iterator_count( $users ) );
 
 		$users = User::findUsersByGroup( 'foo' );
-		$this->assertEquals( 0, iterator_count( $users ) );
+		$this->assertSame( 0, iterator_count( $users ) );
 
 		$user = $this->getMutableTestUser( [ 'foo' ] )->getUser();
 		$users = User::findUsersByGroup( 'foo' );
@@ -1075,83 +1074,6 @@ class UserTest extends MediaWikiTestCase {
 			'User::newFromActorId works for an anonymous user' );
 	}
 
-	/**
-	 * Actor tests with SCHEMA_COMPAT_READ_OLD
-	 *
-	 * The only thing different from testActorId() is the behavior if the actor
-	 * row doesn't exist in the DB, since with SCHEMA_COMPAT_READ_NEW that
-	 * situation can't happen. But we copy all the other tests too just for good measure.
-	 *
-	 * @covers User::newFromActorId
-	 */
-	public function testActorId_old() {
-		$this->setMwGlobals( [
-			'wgActorTableSchemaMigrationStage' => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
-		] );
-
-		$domain = MediaWikiServices::getInstance()->getDBLoadBalancer()->getLocalDomainID();
-		$this->hideDeprecated( 'User::selectFields' );
-
-		// Newly-created user has an actor ID
-		$user = User::createNew( 'UserTestActorIdOld1' );
-		$id = $user->getId();
-		$this->assertTrue( $user->getActorId() > 0, 'User::createNew sets an actor ID' );
-
-		$user = User::newFromName( 'UserTestActorIdOld2' );
-		$user->addToDatabase();
-		$this->assertTrue( $user->getActorId() > 0, 'User::addToDatabase sets an actor ID' );
-
-		$user = User::newFromName( 'UserTestActorIdOld1' );
-		$this->assertTrue( $user->getActorId() > 0, 'Actor ID can be retrieved for user loaded by name' );
-
-		$user = User::newFromId( $id );
-		$this->assertTrue( $user->getActorId() > 0, 'Actor ID can be retrieved for user loaded by ID' );
-
-		$user2 = User::newFromActorId( $user->getActorId() );
-		$this->assertEquals( $user->getId(), $user2->getId(),
-			'User::newFromActorId works for an existing user' );
-
-		$row = $this->db->selectRow( 'user', User::selectFields(), [ 'user_id' => $id ], __METHOD__ );
-		$user = User::newFromRow( $row );
-		$this->assertTrue( $user->getActorId() > 0,
-			'Actor ID can be retrieved for user loaded with User::selectFields()' );
-
-		$this->db->delete( 'actor', [ 'actor_user' => $id ], __METHOD__ );
-		User::purge( $domain, $id );
-		// Because WANObjectCache->delete() stupidly doesn't delete from the process cache.
-
-		MediaWikiServices::getInstance()->getMainWANObjectCache()->clearProcessCache();
-
-		$user = User::newFromId( $id );
-		$this->assertFalse( $user->getActorId() > 0, 'No Actor ID by default if none in database' );
-		$this->assertTrue( $user->getActorId( $this->db ) > 0, 'Actor ID can be created if none in db' );
-
-		$user->setName( 'UserTestActorIdOld4-renamed' );
-		$user->saveSettings();
-		$this->assertEquals(
-			$user->getName(),
-			$this->db->selectField(
-				'actor', 'actor_name', [ 'actor_id' => $user->getActorId() ], __METHOD__
-			),
-			'User::saveSettings updates actor table for name change'
-		);
-
-		// For sanity
-		$ip = '192.168.12.34';
-		$this->db->delete( 'actor', [ 'actor_name' => $ip ], __METHOD__ );
-
-		$user = User::newFromName( $ip, false );
-		$this->assertFalse( $user->getActorId() > 0, 'Anonymous user has no actor ID by default' );
-		$this->assertTrue( $user->getActorId( $this->db ) > 0,
-			'Actor ID can be created for an anonymous user' );
-
-		$user = User::newFromName( $ip, false );
-		$this->assertTrue( $user->getActorId() > 0, 'Actor ID can be loaded for an anonymous user' );
-		$user2 = User::newFromActorId( $user->getActorId() );
-		$this->assertEquals( $user->getName(), $user2->getName(),
-			'User::newFromActorId works for an anonymous user' );
-	}
-
 	/**
 	 * @covers User::newFromAnyId
 	 */
@@ -1566,10 +1488,6 @@ class UserTest extends MediaWikiTestCase {
 		// logged in users should be inmune to cookie block of type ip/range
 		$this->assertNull( $user->getBlock() );
 
-		// cookie is being cleared
-		$cookies = $request->response()->getCookies();
-		$this->assertEquals( '', $cookies['wikiBlockID']['value'] );
-
 		// clean up
 		$block->delete();
 	}