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
Move trivially compatible tests to the unit tests suite
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
RevisionTest.php
diff --git
a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index
98f2980
..
d62e4c7
100644
(file)
--- a/
tests/phpunit/includes/RevisionTest.php
+++ b/
tests/phpunit/includes/RevisionTest.php
@@
-438,10
+438,11
@@
class RevisionTest extends MediaWikiTestCase {
$lb = $this->getMockBuilder( LoadBalancer::class )
->disableOriginalConstructor()
->getMock();
$lb = $this->getMockBuilder( LoadBalancer::class )
->disableOriginalConstructor()
->getMock();
-
+ $access = MediaWikiServices::getInstance()->getExternalStoreAccess();
$cache = $this->getWANObjectCache();
$cache = $this->getWANObjectCache();
- $blobStore = new SqlBlobStore( $lb, $cache );
+ $blobStore = new SqlBlobStore( $lb, $access, $cache );
+
return $blobStore;
}
return $blobStore;
}
@@
-807,7
+808,7
@@
class RevisionTest extends MediaWikiTestCase {
public function testGetRevisionText_external_noOldId() {
$this->setService(
'ExternalStoreFactory',
public function testGetRevisionText_external_noOldId() {
$this->setService(
'ExternalStoreFactory',
- new ExternalStoreFactory( [ 'ForTesting' ] )
+ new ExternalStoreFactory( [ 'ForTesting' ]
, [ 'ForTesting://cluster1' ], 'test-id'
)
);
$this->assertSame(
'AAAABBAAA',
);
$this->assertSame(
'AAAABBAAA',
@@
-829,14
+830,15
@@
class RevisionTest extends MediaWikiTestCase {
$this->setService(
'ExternalStoreFactory',
$this->setService(
'ExternalStoreFactory',
- new ExternalStoreFactory( [ 'ForTesting' ] )
+ new ExternalStoreFactory( [ 'ForTesting' ]
, [ 'ForTesting://cluster1' ], 'test-id'
)
);
$lb = $this->getMockBuilder( LoadBalancer::class )
->disableOriginalConstructor()
->getMock();
);
$lb = $this->getMockBuilder( LoadBalancer::class )
->disableOriginalConstructor()
->getMock();
+ $access = MediaWikiServices::getInstance()->getExternalStoreAccess();
- $blobStore = new SqlBlobStore( $lb, $cache );
+ $blobStore = new SqlBlobStore( $lb, $
access, $
cache );
$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
$this->assertSame(
$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
$this->assertSame(