dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resourceloader: Avoid isKnownEmpty call for regular (non-embed) modules"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
libs
/
rdbms
/
database
/
DatabaseTest.php
diff --git
a/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
b/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
index
482ab4b
..
93b1bf8
100644
(file)
--- 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\TestingAccessWrapper;
use Wikimedia\Rdbms\DatabaseSqlite;
use Wikimedia\Rdbms\DatabasePostgres;
-use Wikimedia\Rdbms\DatabaseMssql;
use Wikimedia\Rdbms\DBUnexpectedError;
class DatabaseTest extends PHPUnit\Framework\TestCase {
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( 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 ) );
$x = $p + [ 'dbFilePath' => 'some/file.sqlite' ];
$this->assertInstanceOf( DatabaseSqlite::class, Database::factory( 'sqlite', $x, $m ) );
@@
-568,62
+566,74
@@
class DatabaseTest extends PHPUnit\Framework\TestCase {
public function testFlagSetting() {
$db = $this->db;
$origTrx = $db->getFlag( DBO_TRX );
public function testFlagSetting() {
$db = $this->db;
$origTrx = $db->getFlag( DBO_TRX );
- $orig
Ssl = $db->getFlag( DBO_SSL
);
+ $orig
NoBuffer = $db->getFlag( DBO_NOBUFFER
);
$origTrx
? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR )
: $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
$this->assertEquals( !$origTrx, $db->getFlag( DBO_TRX ) );
$origTrx
? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR )
: $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
$this->assertEquals( !$origTrx, $db->getFlag( DBO_TRX ) );
- $orig
Ssl
- ? $db->clearFlag( DBO_
SSL
, $db::REMEMBER_PRIOR )
- : $db->setFlag( DBO_
SSL
, $db::REMEMBER_PRIOR );
- $this->assertEquals( !$orig
Ssl, $db->getFlag( DBO_SSL
) );
+ $orig
NoBuffer
+ ? $db->clearFlag( DBO_
NOBUFFER
, $db::REMEMBER_PRIOR )
+ : $db->setFlag( DBO_
NOBUFFER
, $db::REMEMBER_PRIOR );
+ $this->assertEquals( !$orig
NoBuffer, $db->getFlag( DBO_NOBUFFER
) );
$db->restoreFlags( $db::RESTORE_INITIAL );
$this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) );
$db->restoreFlags( $db::RESTORE_INITIAL );
$this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) );
- $this->assertEquals( $orig
Ssl, $db->getFlag( DBO_SSL
) );
+ $this->assertEquals( $orig
NoBuffer, $db->getFlag( DBO_NOBUFFER
) );
$origTrx
? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR )
: $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
$origTrx
? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR )
: $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
- $orig
Ssl
- ? $db->clearFlag( DBO_
SSL
, $db::REMEMBER_PRIOR )
- : $db->setFlag( DBO_
SSL
, $db::REMEMBER_PRIOR );
+ $orig
NoBuffer
+ ? $db->clearFlag( DBO_
NOBUFFER
, $db::REMEMBER_PRIOR )
+ : $db->setFlag( DBO_
NOBUFFER
, $db::REMEMBER_PRIOR );
$db->restoreFlags();
$db->restoreFlags();
- $this->assertEquals( $orig
Ssl, $db->getFlag( DBO_SSL
) );
+ $this->assertEquals( $orig
NoBuffer, $db->getFlag( DBO_NOBUFFER
) );
$this->assertEquals( !$origTrx, $db->getFlag( DBO_TRX ) );
$db->restoreFlags();
$this->assertEquals( !$origTrx, $db->getFlag( DBO_TRX ) );
$db->restoreFlags();
- $this->assertEquals( $orig
Ssl, $db->getFlag( DBO_SSL
) );
+ $this->assertEquals( $orig
NoBuffer, $db->getFlag( DBO_NOBUFFER
) );
$this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) );
}
$this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) );
}
+ public function provideImmutableDBOFlags() {
+ return [
+ [ Database::DBO_IGNORE ],
+ [ Database::DBO_DEFAULT ],
+ [ Database::DBO_PERSISTENT ]
+ ];
+ }
+
/**
/**
- * @expectedException
UnexpectedValueException
+ * @expectedException
DBUnexpectedError
* @covers Wikimedia\Rdbms\Database::setFlag
* @covers Wikimedia\Rdbms\Database::setFlag
+ * @dataProvider provideImmutableDBOFlags
+ * @param int $flag
*/
*/
- public function testDBO
IgnoreSet(
) {
+ public function testDBO
CannotSet( $flag
) {
$db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->setMethods( null )
->getMock();
$db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->setMethods( null )
->getMock();
- $db->setFlag(
Database::DBO_IGNORE
);
+ $db->setFlag(
$flag
);
}
/**
}
/**
- * @expectedException
UnexpectedValueException
+ * @expectedException
DBUnexpectedError
* @covers Wikimedia\Rdbms\Database::clearFlag
* @covers Wikimedia\Rdbms\Database::clearFlag
+ * @dataProvider provideImmutableDBOFlags
+ * @param int $flag
*/
*/
- public function testDBO
IgnoreClear(
) {
+ public function testDBO
CannotClear( $flag
) {
$db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->setMethods( null )
->getMock();
$db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->setMethods( null )
->getMock();
- $db->clearFlag(
Database::DBO_IGNORE
);
+ $db->clearFlag(
$flag
);
}
/**
}
/**