From 197e94457ffb43b8307f5d0009313b7a7a4208fd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 1 Jul 2016 16:04:25 +0200 Subject: Fix AvatarControllerTest with phpunit 5.2+ --- tests/core/controller/avatarcontrollertest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/core/controller/avatarcontrollertest.php b/tests/core/controller/avatarcontrollertest.php index 8e5e58904a7..c99b69228b1 100644 --- a/tests/core/controller/avatarcontrollertest.php +++ b/tests/core/controller/avatarcontrollertest.php @@ -93,7 +93,7 @@ class AvatarControllerTest extends \Test\TestCase { $this->container['UserSession']->method('getUser')->willReturn($this->userMock); $this->avatarFile = $this->getMock('OCP\Files\File'); - $this->avatarFile->method('getContnet')->willReturn('image data'); + $this->avatarFile->method('getContent')->willReturn('image data'); $this->avatarFile->method('getMimeType')->willReturn('image type'); $this->avatarFile->method('getEtag')->willReturn('my etag'); } -- cgit v1.2.3 From ea9c79b7c0d22cead5b470a09653cd9ae6ff022e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 1 Jul 2016 16:05:00 +0200 Subject: Fix Appframework tests with phpunit 5.2+ --- tests/lib/appframework/db/mappertest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/lib/appframework/db/mappertest.php b/tests/lib/appframework/db/mappertest.php index c8b999ad62c..e2a70d9423a 100644 --- a/tests/lib/appframework/db/mappertest.php +++ b/tests/lib/appframework/db/mappertest.php @@ -236,7 +236,9 @@ class MapperTest extends MapperTestUtility { $entity->resetUpdatedFields(); $this->db->expects($this->never()) - ->method('prepareQuery'); + ->method('prepare'); + $this->db->expects($this->never()) + ->method('prepare'); $this->mapper->update($entity); } -- cgit v1.2.3 From 777dbec369937aa4ac87720bfeeb413a2a8801db Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 1 Jul 2016 16:05:16 +0200 Subject: Fix Notification tests with phpunit 5.2+ --- tests/lib/notification/notificationtest.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php index ee9454c77a0..bb9440a34d9 100644 --- a/tests/lib/notification/notificationtest.php +++ b/tests/lib/notification/notificationtest.php @@ -517,6 +517,7 @@ class NotificationTest extends TestCase { ->setMethods([ 'isValidCommon', 'getSubject', + 'getParsedSubject', ]) ->getMock(); @@ -547,6 +548,7 @@ class NotificationTest extends TestCase { $notification = $this->getMockBuilder('\OC\Notification\Notification') ->setMethods([ 'isValidCommon', + 'getSubject', 'getParsedSubject', ]) ->getMock(); -- cgit v1.2.3 From 75c172a062579a5f28551eeb37d9145c451f1867 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 1 Jul 2016 16:08:26 +0200 Subject: Fix Share Manager tests with phpunit 5.2+ --- tests/lib/share20/managertest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php index ece4ae23847..8f3417d53fd 100644 --- a/tests/lib/share20/managertest.php +++ b/tests/lib/share20/managertest.php @@ -590,7 +590,7 @@ class ManagerTest extends \Test\TestCase { $share->method('getShareType')->willReturn($type); $share->method('getSharedWith')->willReturn($sharedWith); $share->method('getSharedBy')->willReturn($sharedBy); - $share->method('getSharedOwner')->willReturn($shareOwner); + $share->method('getShareOwner')->willReturn($shareOwner); $share->method('getNode')->willReturn($path); $share->method('getPermissions')->willReturn($permissions); $share->method('getExpirationDate')->willReturn($expireDate); -- cgit v1.2.3 From ce6009e475557404c462ca1d3b94c126ddbb95df Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 1 Jul 2016 16:41:46 +0200 Subject: Fix Single execution of preview tests --- tests/lib/preview/movie.php | 5 +++++ tests/lib/preview/office.php | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'tests') diff --git a/tests/lib/preview/movie.php b/tests/lib/preview/movie.php index c6b0c0f7322..ef290092fc2 100644 --- a/tests/lib/preview/movie.php +++ b/tests/lib/preview/movie.php @@ -21,6 +21,11 @@ namespace Test\Preview; +/** + * Class Movie + * @package Test\Preview + * @group DB + */ class Movie extends Provider { public function setUp() { diff --git a/tests/lib/preview/office.php b/tests/lib/preview/office.php index 22eeb0aed33..9fcdd621031 100644 --- a/tests/lib/preview/office.php +++ b/tests/lib/preview/office.php @@ -21,6 +21,11 @@ namespace Test\Preview; +/** + * Class Office + * @package Test\Preview + * @group DB + */ class Office extends Provider { public function setUp() { -- cgit v1.2.3