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 "(bug 17808) (bug 21167) use real links for search suggestions"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
CdbTest.php
diff --git
a/tests/phpunit/includes/CdbTest.php
b/tests/phpunit/includes/CdbTest.php
index
97fffda
..
32c84ef
100644
(file)
--- a/
tests/phpunit/includes/CdbTest.php
+++ b/
tests/phpunit/includes/CdbTest.php
@@
-7,6
+7,7
@@
class CdbTest extends MediaWikiTestCase {
protected function setUp() {
class CdbTest extends MediaWikiTestCase {
protected function setUp() {
+ parent::setUp();
if ( !CdbReader::haveExtension() ) {
$this->markTestSkipped( 'Native CDB support is not available' );
}
if ( !CdbReader::haveExtension() ) {
$this->markTestSkipped( 'Native CDB support is not available' );
}
@@
-18,8
+19,11
@@
class CdbTest extends MediaWikiTestCase {
$this->markTestSkipped( "Temp dir isn't writable" );
}
$this->markTestSkipped( "Temp dir isn't writable" );
}
- $w1 = new CdbWriter_PHP( "$dir/php.cdb" );
- $w2 = new CdbWriter_DBA( "$dir/dba.cdb" );
+ $phpcdbfile = $this->getNewTempFile();
+ $dbacdbfile = $this->getNewTempFile();
+
+ $w1 = new CdbWriter_PHP( $phpcdbfile );
+ $w2 = new CdbWriter_DBA( $dbacdbfile );
$data = array();
for ( $i = 0; $i < 1000; $i++ ) {
$data = array();
for ( $i = 0; $i < 1000; $i++ ) {
@@
-37,13
+41,13
@@
class CdbTest extends MediaWikiTestCase {
$w2->close();
$this->assertEquals(
$w2->close();
$this->assertEquals(
- md5_file(
"$dir/dba.cdb"
),
- md5_file(
"$dir/php.cdb"
),
+ md5_file(
$phpcdbfile
),
+ md5_file(
$dbacdbfile
),
'same hash'
);
'same hash'
);
- $r1 = new CdbReader_PHP(
"$dir/php.cdb"
);
- $r2 = new CdbReader_DBA(
"$dir/dba.cdb"
);
+ $r1 = new CdbReader_PHP(
$phpcdbfile
);
+ $r2 = new CdbReader_DBA(
$dbacdbfile
);
foreach ( $data as $key => $value ) {
if ( $key === '' ) {
foreach ( $data as $key => $value ) {
if ( $key === '' ) {
@@
-61,8
+65,6
@@
class CdbTest extends MediaWikiTestCase {
$this->cdbAssert( "DBA error", $key, $v2, $value );
}
$this->cdbAssert( "DBA error", $key, $v2, $value );
}
- unlink( "$dir/dba.cdb" );
- unlink( "$dir/php.cdb" );
}
private function randomString() {
}
private function randomString() {