adjust existing tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
parent
d5dec527c9
commit
821e287805
|
@ -37,7 +37,7 @@ class SyncServiceTest extends TestCase {
|
|||
$backend = $this->getBackendMock(0, 0, 0);
|
||||
|
||||
$ss = $this->getSyncServiceMock($backend, []);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$this->assertEquals('sync-token-1', $return);
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ class SyncServiceTest extends TestCase {
|
|||
$backend->method('getCard')->willReturn(false);
|
||||
|
||||
$ss = $this->getSyncServiceMock($backend, ['0' => [200 => '']]);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$this->assertEquals('sync-token-1', $return);
|
||||
}
|
||||
|
||||
|
@ -55,7 +55,7 @@ class SyncServiceTest extends TestCase {
|
|||
$backend->method('getCard')->willReturn(true);
|
||||
|
||||
$ss = $this->getSyncServiceMock($backend, ['0' => [200 => '']]);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$this->assertEquals('sync-token-1', $return);
|
||||
}
|
||||
|
||||
|
@ -63,7 +63,7 @@ class SyncServiceTest extends TestCase {
|
|||
$backend = $this->getBackendMock(0, 0, 1);
|
||||
|
||||
$ss = $this->getSyncServiceMock($backend, ['0' => [404 => '']]);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$return = $ss->syncRemoteAddressBook('', 'system', 'system', '1234567890', null, '1', 'principals/system/system', []);
|
||||
$this->assertEquals('sync-token-1', $return);
|
||||
}
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@ use OCP\Http\Client\IClient;
|
|||
use OCP\Http\Client\IResponse;
|
||||
use OCP\ILogger;
|
||||
use OCP\IURLGenerator;
|
||||
use OCP\OCS\IDiscoveryService;
|
||||
|
||||
/**
|
||||
* Class GetSharedSecretTest
|
||||
|
@ -67,6 +68,9 @@ class GetSharedSecretTest extends TestCase {
|
|||
/** @var \PHPUnit_Framework_MockObject_MockObject | IResponse */
|
||||
private $response;
|
||||
|
||||
/** @var \PHPUnit_Framework_MockObject_MockObject | IDiscoveryService */
|
||||
private $discoverService;
|
||||
|
||||
/** @var GetSharedSecret */
|
||||
private $getSharedSecret;
|
||||
|
||||
|
@ -82,6 +86,9 @@ class GetSharedSecretTest extends TestCase {
|
|||
->disableOriginalConstructor()->getMock();
|
||||
$this->logger = $this->getMockBuilder(ILogger::class)->getMock();
|
||||
$this->response = $this->getMockBuilder(IResponse::class)->getMock();
|
||||
$this->discoverService = $this->getMockBuilder(IDiscoveryService::class)->getMock();
|
||||
|
||||
$this->discoverService->expects($this->any())->method('discover')->willReturn([]);
|
||||
|
||||
$this->getSharedSecret = new GetSharedSecret(
|
||||
$this->httpClient,
|
||||
|
@ -89,7 +96,8 @@ class GetSharedSecretTest extends TestCase {
|
|||
$this->jobList,
|
||||
$this->trustedServers,
|
||||
$this->logger,
|
||||
$this->dbHandler
|
||||
$this->dbHandler,
|
||||
$this->discoverService
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -109,7 +117,8 @@ class GetSharedSecretTest extends TestCase {
|
|||
$this->jobList,
|
||||
$this->trustedServers,
|
||||
$this->logger,
|
||||
$this->dbHandler
|
||||
$this->dbHandler,
|
||||
$this->discoverService
|
||||
]
|
||||
)->setMethods(['parentExecute'])->getMock();
|
||||
$this->invokePrivate($getSharedSecret, 'argument', [['url' => 'url']]);
|
||||
|
|
|
@ -33,6 +33,7 @@ use OCP\BackgroundJob\IJobList;
|
|||
use OCP\Http\Client\IClient;
|
||||
use OCP\Http\Client\IResponse;
|
||||
use OCP\IURLGenerator;
|
||||
use OCP\OCS\IDiscoveryService;
|
||||
use Test\TestCase;
|
||||
|
||||
class RequestSharedSecretTest extends TestCase {
|
||||
|
@ -55,6 +56,9 @@ class RequestSharedSecretTest extends TestCase {
|
|||
/** @var \PHPUnit_Framework_MockObject_MockObject | IResponse */
|
||||
private $response;
|
||||
|
||||
/** @var \PHPUnit_Framework_MockObject_MockObject | IDiscoveryService */
|
||||
private $discoveryService;
|
||||
|
||||
/** @var RequestSharedSecret */
|
||||
private $requestSharedSecret;
|
||||
|
||||
|
@ -69,13 +73,17 @@ class RequestSharedSecretTest extends TestCase {
|
|||
$this->dbHandler = $this->getMockBuilder(DbHandler::class)
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->response = $this->getMockBuilder(IResponse::class)->getMock();
|
||||
$this->discoveryService = $this->getMockBuilder(IDiscoveryService::class)->getMock();
|
||||
|
||||
$this->discoveryService->expects($this->any())->method('discover')->willReturn([]);
|
||||
|
||||
$this->requestSharedSecret = new RequestSharedSecret(
|
||||
$this->httpClient,
|
||||
$this->urlGenerator,
|
||||
$this->jobList,
|
||||
$this->trustedServers,
|
||||
$this->dbHandler
|
||||
$this->dbHandler,
|
||||
$this->discoveryService
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -94,7 +102,8 @@ class RequestSharedSecretTest extends TestCase {
|
|||
$this->urlGenerator,
|
||||
$this->jobList,
|
||||
$this->trustedServers,
|
||||
$this->dbHandler
|
||||
$this->dbHandler,
|
||||
$this->discoveryService
|
||||
]
|
||||
)->setMethods(['parentExecute'])->getMock();
|
||||
$this->invokePrivate($requestSharedSecret, 'argument', [['url' => 'url']]);
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
*/
|
||||
namespace OCA\Federation\Tests;
|
||||
|
||||
use OC\OCS\DiscoveryService;
|
||||
use OCA\Federation\DbHandler;
|
||||
use OCA\Federation\SyncFederationAddressBooks;
|
||||
|
||||
|
@ -32,7 +33,18 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
|
|||
/** @var array */
|
||||
private $callBacks = [];
|
||||
|
||||
function testSync() {
|
||||
/** @var \PHPUnit_Framework_MockObject_MockObject | DiscoveryService */
|
||||
private $discoveryService;
|
||||
|
||||
public function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->discoveryService = $this->getMockBuilder(DiscoveryService::class)
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->discoveryService->expects($this->any())->method('discover')->willReturn([]);
|
||||
}
|
||||
|
||||
public function testSync() {
|
||||
/** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $dbHandler */
|
||||
$dbHandler = $this->getMockBuilder('OCA\Federation\DbHandler')->
|
||||
disableOriginalConstructor()->
|
||||
|
@ -55,14 +67,14 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
|
|||
->willReturn(1);
|
||||
|
||||
/** @var \OCA\DAV\CardDAV\SyncService $syncService */
|
||||
$s = new SyncFederationAddressBooks($dbHandler, $syncService);
|
||||
$s = new SyncFederationAddressBooks($dbHandler, $syncService, $this->discoveryService);
|
||||
$s->syncThemAll(function($url, $ex) {
|
||||
$this->callBacks[] = [$url, $ex];
|
||||
});
|
||||
$this->assertEquals(1, count($this->callBacks));
|
||||
}
|
||||
|
||||
function testException() {
|
||||
public function testException() {
|
||||
/** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $dbHandler */
|
||||
$dbHandler = $this->getMockBuilder('OCA\Federation\DbHandler')->
|
||||
disableOriginalConstructor()->
|
||||
|
@ -83,7 +95,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
|
|||
->willThrowException(new \Exception('something did not work out'));
|
||||
|
||||
/** @var \OCA\DAV\CardDAV\SyncService $syncService */
|
||||
$s = new SyncFederationAddressBooks($dbHandler, $syncService);
|
||||
$s = new SyncFederationAddressBooks($dbHandler, $syncService, $this->discoveryService);
|
||||
$s->syncThemAll(function($url, $ex) {
|
||||
$this->callBacks[] = [$url, $ex];
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue