diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-12-22 14:15:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-22 14:15:05 +0300 |
commit | ce2c08da6a91c1726a7523ee6cddb9840d49cec9 (patch) | |
tree | 44394c126f105b8e8a4432cee2b15bf90abddeaa /tests | |
parent | 0bbb1fa6bab9256112e609709201b067ac984cc3 (diff) | |
parent | 92b264cc09e3292e6cee90e6f9ff0e608014bb06 (diff) |
Merge pull request #12617 from nextcloud/backport/10839/stable14
[stable14] adjust Calendar resource / room interfaces to use class implementation
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/Calendar/Resource/ManagerTest.php | 45 | ||||
-rw-r--r-- | tests/lib/Calendar/Room/ManagerTest.php | 45 |
2 files changed, 74 insertions, 16 deletions
diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/lib/Calendar/Resource/ManagerTest.php index ccc6bbf182b..1d9229856db 100644 --- a/tests/lib/Calendar/Resource/ManagerTest.php +++ b/tests/lib/Calendar/Resource/ManagerTest.php @@ -25,6 +25,7 @@ namespace Test\Calendar\Resource; use \OC\Calendar\Resource\Manager; use \OCP\Calendar\Resource\IBackend; +use OCP\IServerContainer; use \Test\TestCase; class ManagerTest extends TestCase { @@ -32,27 +33,39 @@ class ManagerTest extends TestCase { /** @var Manager */ private $manager; + /** @var IServerContainer */ + private $server; + protected function setUp() { parent::setUp(); - $this->manager = new Manager(); + $this->server = $this->createMock(IServerContainer::class); + $this->manager = new Manager($this->server); } public function testRegisterUnregisterBackend() { $backend1 = $this->createMock(IBackend::class); $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1')); + $this->server->expects($this->at(0)) + ->method('query') + ->with('calendar_resource_backend1') + ->will($this->returnValue($backend1)); $backend2 = $this->createMock(IBackend::class); $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2')); + $this->server->expects($this->at(1)) + ->method('query') + ->with('calendar_resource_backend2') + ->will($this->returnValue($backend2)); - $this->manager->registerBackend($backend1); - $this->manager->registerBackend($backend2); + $this->manager->registerBackend('calendar_resource_backend1'); + $this->manager->registerBackend('calendar_resource_backend2'); $this->assertEquals([ $backend1, $backend2 ], $this->manager->getBackends()); - $this->manager->unregisterBackend($backend1); + $this->manager->unregisterBackend('calendar_resource_backend1'); $this->assertEquals([ $backend2 @@ -62,12 +75,20 @@ class ManagerTest extends TestCase { public function testGetBackend() { $backend1 = $this->createMock(IBackend::class); $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1')); + $this->server->expects($this->at(0)) + ->method('query') + ->with('calendar_resource_backend1') + ->will($this->returnValue($backend1)); $backend2 = $this->createMock(IBackend::class); $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2')); + $this->server->expects($this->at(1)) + ->method('query') + ->with('calendar_resource_backend2') + ->will($this->returnValue($backend2)); - $this->manager->registerBackend($backend1); - $this->manager->registerBackend($backend2); + $this->manager->registerBackend('calendar_resource_backend1'); + $this->manager->registerBackend('calendar_resource_backend2'); $this->assertEquals($backend1, $this->manager->getBackend('backend_1')); $this->assertEquals($backend2, $this->manager->getBackend('backend_2')); @@ -76,12 +97,20 @@ class ManagerTest extends TestCase { public function testClear() { $backend1 = $this->createMock(IBackend::class); $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1')); + $this->server->expects($this->at(0)) + ->method('query') + ->with('calendar_resource_backend1') + ->will($this->returnValue($backend1)); $backend2 = $this->createMock(IBackend::class); $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2')); + $this->server->expects($this->at(1)) + ->method('query') + ->with('calendar_resource_backend2') + ->will($this->returnValue($backend2)); - $this->manager->registerBackend($backend1); - $this->manager->registerBackend($backend2); + $this->manager->registerBackend('calendar_resource_backend1'); + $this->manager->registerBackend('calendar_resource_backend2'); $this->assertEquals([ $backend1, $backend2 diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/lib/Calendar/Room/ManagerTest.php index 34d69d127e2..52347f439fa 100644 --- a/tests/lib/Calendar/Room/ManagerTest.php +++ b/tests/lib/Calendar/Room/ManagerTest.php @@ -25,6 +25,7 @@ namespace Test\Calendar\Room; use \OC\Calendar\Room\Manager; use \OCP\Calendar\Room\IBackend; +use OCP\IServerContainer; use \Test\TestCase; class ManagerTest extends TestCase { @@ -32,27 +33,39 @@ class ManagerTest extends TestCase { /** @var Manager */ private $manager; + /** @var IServerContainer */ + private $server; + protected function setUp() { parent::setUp(); - $this->manager = new Manager(); + $this->server = $this->createMock(IServerContainer::class); + $this->manager = new Manager($this->server); } public function testRegisterUnregisterBackend() { $backend1 = $this->createMock(IBackend::class); $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1')); + $this->server->expects($this->at(0)) + ->method('query') + ->with('calendar_room_backend1') + ->will($this->returnValue($backend1)); $backend2 = $this->createMock(IBackend::class); $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2')); + $this->server->expects($this->at(1)) + ->method('query') + ->with('calendar_room_backend2') + ->will($this->returnValue($backend2)); - $this->manager->registerBackend($backend1); - $this->manager->registerBackend($backend2); + $this->manager->registerBackend('calendar_room_backend1'); + $this->manager->registerBackend('calendar_room_backend2'); $this->assertEquals([ $backend1, $backend2 ], $this->manager->getBackends()); - $this->manager->unregisterBackend($backend1); + $this->manager->unregisterBackend('calendar_room_backend1'); $this->assertEquals([ $backend2 @@ -62,12 +75,20 @@ class ManagerTest extends TestCase { public function testGetBackend() { $backend1 = $this->createMock(IBackend::class); $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1')); + $this->server->expects($this->at(0)) + ->method('query') + ->with('calendar_room_backend1') + ->will($this->returnValue($backend1)); $backend2 = $this->createMock(IBackend::class); $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2')); + $this->server->expects($this->at(1)) + ->method('query') + ->with('calendar_room_backend2') + ->will($this->returnValue($backend2)); - $this->manager->registerBackend($backend1); - $this->manager->registerBackend($backend2); + $this->manager->registerBackend('calendar_room_backend1'); + $this->manager->registerBackend('calendar_room_backend2'); $this->assertEquals($backend1, $this->manager->getBackend('backend_1')); $this->assertEquals($backend2, $this->manager->getBackend('backend_2')); @@ -76,12 +97,20 @@ class ManagerTest extends TestCase { public function testClear() { $backend1 = $this->createMock(IBackend::class); $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1')); + $this->server->expects($this->at(0)) + ->method('query') + ->with('calendar_room_backend1') + ->will($this->returnValue($backend1)); $backend2 = $this->createMock(IBackend::class); $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2')); + $this->server->expects($this->at(1)) + ->method('query') + ->with('calendar_room_backend2') + ->will($this->returnValue($backend2)); - $this->manager->registerBackend($backend1); - $this->manager->registerBackend($backend2); + $this->manager->registerBackend('calendar_room_backend1'); + $this->manager->registerBackend('calendar_room_backend2'); $this->assertEquals([ $backend1, $backend2 |