X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2Frdbms%2Fdatabase%2FDatabaseTest.php;h=fddbab2b370fad60a34d6daa34cd0b1a809bdfe9;hp=a775dd70e3e4a741df214da8f17d2ab22ef284f9;hb=9e8439e79d67788916d488f645108f79016d9aca;hpb=63541200513fe472b95d17ea6bda187ef2e63807

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
index a775dd70e3..fddbab2b37 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
@@ -9,7 +9,6 @@ use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\TestingAccessWrapper;
 use Wikimedia\Rdbms\DatabaseSqlite;
 use Wikimedia\Rdbms\DatabasePostgres;
-use Wikimedia\Rdbms\DatabaseMssql;
 use Wikimedia\Rdbms\DBUnexpectedError;
 
 class DatabaseTest extends PHPUnit\Framework\TestCase {
@@ -37,7 +36,6 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 		$this->assertInstanceOf( DatabasePostgres::class, Database::factory( 'Postgres', $p, $m ) );
 
 		$x = $p + [ 'port' => 10000, 'UseWindowsAuth' => false ];
-		$this->assertInstanceOf( DatabaseMssql::class, Database::factory( 'mssql', $x, $m ) );
 
 		$x = $p + [ 'dbFilePath' => 'some/file.sqlite' ];
 		$this->assertInstanceOf( DatabaseSqlite::class, Database::factory( 'sqlite', $x, $m ) );
@@ -492,13 +490,13 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 		$db->method( 'isOpen' )->willReturn( true );
 		$db->method( 'getDBname' )->willReturn( 'unittest' );
 
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 		$this->assertEquals( true, $db->lockIsFree( 'x', __METHOD__ ) );
 		$this->assertEquals( true, $db->lock( 'x', __METHOD__ ) );
 		$this->assertEquals( false, $db->lockIsFree( 'x', __METHOD__ ) );
 		$this->assertEquals( true, $db->unlock( 'x', __METHOD__ ) );
 		$this->assertEquals( true, $db->lockIsFree( 'x', __METHOD__ ) );
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 
 		$db->setFlag( DBO_TRX );
 		$this->assertEquals( true, $db->lockIsFree( 'x', __METHOD__ ) );
@@ -509,7 +507,7 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 		$db->clearFlag( DBO_TRX );
 
 		// Pending writes with DBO_TRX
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 		$this->assertTrue( $db->lockIsFree( 'meow', __METHOD__ ) );
 		$db->setFlag( DBO_TRX );
 		$db->query( "DELETE FROM test WHERE t = 1" ); // trigger DBO_TRX transaction before lock
@@ -523,7 +521,7 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 		$db->rollback( __METHOD__, IDatabase::FLUSHING_ALL_PEERS );
 		// Pending writes without DBO_TRX
 		$db->clearFlag( DBO_TRX );
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 		$this->assertTrue( $db->lockIsFree( 'meow2', __METHOD__ ) );
 		$db->begin( __METHOD__ );
 		$db->query( "DELETE FROM test WHERE t = 1" ); // trigger DBO_TRX transaction before lock
@@ -537,17 +535,17 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 		$db->rollback( __METHOD__ );
 		// No pending writes, with DBO_TRX
 		$db->setFlag( DBO_TRX );
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 		$this->assertTrue( $db->lockIsFree( 'wuff', __METHOD__ ) );
 		$db->query( "SELECT 1", __METHOD__ );
 		$this->assertEquals( 1, $db->trxLevel() );
 		$lock = $db->getScopedLockAndFlush( 'wuff', __METHOD__, 1 );
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 		$this->assertFalse( $db->lockIsFree( 'wuff', __METHOD__ ), 'Lock already acquired' );
 		$db->rollback( __METHOD__, IDatabase::FLUSHING_ALL_PEERS );
 		// No pending writes, without DBO_TRX
 		$db->clearFlag( DBO_TRX );
-		$this->assertEquals( 0, $db->trxLevel() );
+		$this->assertSame( 0, $db->trxLevel() );
 		$this->assertTrue( $db->lockIsFree( 'wuff2', __METHOD__ ) );
 		$db->begin( __METHOD__ );
 		try {