summaryrefslogtreecommitdiffstats
path: root/tests/lib/Calendar
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/Calendar')
-rw-r--r--tests/lib/Calendar/ManagerTest.php24
-rw-r--r--tests/lib/Calendar/Resource/ManagerTest.php24
-rw-r--r--tests/lib/Calendar/Room/ManagerTest.php24
3 files changed, 36 insertions, 36 deletions
diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php
index fa459203dac..5f98188799b 100644
--- a/tests/lib/Calendar/ManagerTest.php
+++ b/tests/lib/Calendar/ManagerTest.php
@@ -44,19 +44,19 @@ class ManagerTest extends TestCase {
public function testSearch($search1, $search2, $expected) {
/** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */
$calendar1 = $this->createMock(ICalendar::class);
- $calendar1->method('getKey')->will($this->returnValue('simple:1'));
+ $calendar1->method('getKey')->willReturn('simple:1');
$calendar1->expects($this->once())
->method('search')
->with('', [], [], null, null)
- ->will($this->returnValue($search1));
+ ->willReturn($search1);
/** @var ICalendar | PHPUnit_Framework_MockObject_MockObject $calendar2 */
$calendar2 = $this->createMock(ICalendar::class);
- $calendar2->method('getKey')->will($this->returnValue('simple:2'));
+ $calendar2->method('getKey')->willReturn('simple:2');
$calendar2->expects($this->once())
->method('search')
->with('', [], [], null, null)
- ->will($this->returnValue($search2));
+ ->willReturn($search2);
$this->manager->registerCalendar($calendar1);
$this->manager->registerCalendar($calendar2);
@@ -71,21 +71,21 @@ class ManagerTest extends TestCase {
public function testSearchOptions($search1, $search2, $expected) {
/** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */
$calendar1 = $this->createMock(ICalendar::class);
- $calendar1->method('getKey')->will($this->returnValue('simple:1'));
+ $calendar1->method('getKey')->willReturn('simple:1');
$calendar1->expects($this->once())
->method('search')
->with('searchTerm', ['SUMMARY', 'DESCRIPTION'],
['timerange' => ['start' => null, 'end' => null]], 5, 20)
- ->will($this->returnValue($search1));
+ ->willReturn($search1);
/** @var ICalendar | PHPUnit_Framework_MockObject_MockObject $calendar2 */
$calendar2 = $this->createMock(ICalendar::class);
- $calendar2->method('getKey')->will($this->returnValue('simple:2'));
+ $calendar2->method('getKey')->willReturn('simple:2');
$calendar2->expects($this->once())
->method('search')
->with('searchTerm', ['SUMMARY', 'DESCRIPTION'],
['timerange' => ['start' => null, 'end' => null]], 5, 20)
- ->will($this->returnValue($search2));
+ ->willReturn($search2);
$this->manager->registerCalendar($calendar1);
$this->manager->registerCalendar($calendar2);
@@ -152,11 +152,11 @@ class ManagerTest extends TestCase {
public function testRegisterUnregister() {
/** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */
$calendar1 = $this->createMock(ICalendar::class);
- $calendar1->method('getKey')->will($this->returnValue('key1'));
+ $calendar1->method('getKey')->willReturn('key1');
/** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar2 */
$calendar2 = $this->createMock(ICalendar::class);
- $calendar2->method('getKey')->will($this->returnValue('key2'));
+ $calendar2->method('getKey')->willReturn('key2');
$this->manager->registerCalendar($calendar1);
$this->manager->registerCalendar($calendar2);
@@ -176,11 +176,11 @@ class ManagerTest extends TestCase {
public function testGetCalendars() {
/** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */
$calendar1 = $this->createMock(ICalendar::class);
- $calendar1->method('getKey')->will($this->returnValue('key1'));
+ $calendar1->method('getKey')->willReturn('key1');
/** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar2 */
$calendar2 = $this->createMock(ICalendar::class);
- $calendar2->method('getKey')->will($this->returnValue('key2'));
+ $calendar2->method('getKey')->willReturn('key2');
$this->manager->registerCalendar($calendar1);
$this->manager->registerCalendar($calendar2);
diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/lib/Calendar/Resource/ManagerTest.php
index 71679a86a8c..30b0e16c948 100644
--- a/tests/lib/Calendar/Resource/ManagerTest.php
+++ b/tests/lib/Calendar/Resource/ManagerTest.php
@@ -45,18 +45,18 @@ class ManagerTest extends TestCase {
public function testRegisterUnregisterBackend() {
$backend1 = $this->createMock(IBackend::class);
- $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1'));
+ $backend1->method('getBackendIdentifier')->willReturn('backend_1');
$this->server->expects($this->at(0))
->method('query')
->with('calendar_resource_backend1')
- ->will($this->returnValue($backend1));
+ ->willReturn($backend1);
$backend2 = $this->createMock(IBackend::class);
- $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2'));
+ $backend2->method('getBackendIdentifier')->willReturn('backend_2');
$this->server->expects($this->at(1))
->method('query')
->with('calendar_resource_backend2')
- ->will($this->returnValue($backend2));
+ ->willReturn($backend2);
$this->manager->registerBackend('calendar_resource_backend1');
$this->manager->registerBackend('calendar_resource_backend2');
@@ -74,18 +74,18 @@ class ManagerTest extends TestCase {
public function testGetBackend() {
$backend1 = $this->createMock(IBackend::class);
- $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1'));
+ $backend1->method('getBackendIdentifier')->willReturn('backend_1');
$this->server->expects($this->at(0))
->method('query')
->with('calendar_resource_backend1')
- ->will($this->returnValue($backend1));
+ ->willReturn($backend1);
$backend2 = $this->createMock(IBackend::class);
- $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2'));
+ $backend2->method('getBackendIdentifier')->willReturn('backend_2');
$this->server->expects($this->at(1))
->method('query')
->with('calendar_resource_backend2')
- ->will($this->returnValue($backend2));
+ ->willReturn($backend2);
$this->manager->registerBackend('calendar_resource_backend1');
$this->manager->registerBackend('calendar_resource_backend2');
@@ -96,18 +96,18 @@ class ManagerTest extends TestCase {
public function testClear() {
$backend1 = $this->createMock(IBackend::class);
- $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1'));
+ $backend1->method('getBackendIdentifier')->willReturn('backend_1');
$this->server->expects($this->at(0))
->method('query')
->with('calendar_resource_backend1')
- ->will($this->returnValue($backend1));
+ ->willReturn($backend1);
$backend2 = $this->createMock(IBackend::class);
- $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2'));
+ $backend2->method('getBackendIdentifier')->willReturn('backend_2');
$this->server->expects($this->at(1))
->method('query')
->with('calendar_resource_backend2')
- ->will($this->returnValue($backend2));
+ ->willReturn($backend2);
$this->manager->registerBackend('calendar_resource_backend1');
$this->manager->registerBackend('calendar_resource_backend2');
diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/lib/Calendar/Room/ManagerTest.php
index 56f05544e29..b01d16945ad 100644
--- a/tests/lib/Calendar/Room/ManagerTest.php
+++ b/tests/lib/Calendar/Room/ManagerTest.php
@@ -45,18 +45,18 @@ class ManagerTest extends TestCase {
public function testRegisterUnregisterBackend() {
$backend1 = $this->createMock(IBackend::class);
- $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1'));
+ $backend1->method('getBackendIdentifier')->willReturn('backend_1');
$this->server->expects($this->at(0))
->method('query')
->with('calendar_room_backend1')
- ->will($this->returnValue($backend1));
+ ->willReturn($backend1);
$backend2 = $this->createMock(IBackend::class);
- $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2'));
+ $backend2->method('getBackendIdentifier')->willReturn('backend_2');
$this->server->expects($this->at(1))
->method('query')
->with('calendar_room_backend2')
- ->will($this->returnValue($backend2));
+ ->willReturn($backend2);
$this->manager->registerBackend('calendar_room_backend1');
$this->manager->registerBackend('calendar_room_backend2');
@@ -74,18 +74,18 @@ class ManagerTest extends TestCase {
public function testGetBackend() {
$backend1 = $this->createMock(IBackend::class);
- $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1'));
+ $backend1->method('getBackendIdentifier')->willReturn('backend_1');
$this->server->expects($this->at(0))
->method('query')
->with('calendar_room_backend1')
- ->will($this->returnValue($backend1));
+ ->willReturn($backend1);
$backend2 = $this->createMock(IBackend::class);
- $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2'));
+ $backend2->method('getBackendIdentifier')->willReturn('backend_2');
$this->server->expects($this->at(1))
->method('query')
->with('calendar_room_backend2')
- ->will($this->returnValue($backend2));
+ ->willReturn($backend2);
$this->manager->registerBackend('calendar_room_backend1');
$this->manager->registerBackend('calendar_room_backend2');
@@ -96,18 +96,18 @@ class ManagerTest extends TestCase {
public function testClear() {
$backend1 = $this->createMock(IBackend::class);
- $backend1->method('getBackendIdentifier')->will($this->returnValue('backend_1'));
+ $backend1->method('getBackendIdentifier')->willReturn('backend_1');
$this->server->expects($this->at(0))
->method('query')
->with('calendar_room_backend1')
- ->will($this->returnValue($backend1));
+ ->willReturn($backend1);
$backend2 = $this->createMock(IBackend::class);
- $backend2->method('getBackendIdentifier')->will($this->returnValue('backend_2'));
+ $backend2->method('getBackendIdentifier')->willReturn('backend_2');
$this->server->expects($this->at(1))
->method('query')
->with('calendar_room_backend2')
- ->will($this->returnValue($backend2));
+ ->willReturn($backend2);
$this->manager->registerBackend('calendar_room_backend1');
$this->manager->registerBackend('calendar_room_backend2');