diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/core/controller/avatarcontrollertest.php | 2 | ||||
| -rw-r--r-- | tests/lib/appframework/db/mappertest.php | 7 | ||||
| -rw-r--r-- | tests/lib/notification/notificationtest.php | 2 | ||||
| -rw-r--r-- | tests/lib/share20/managertest.php | 2 |
4 files changed, 8 insertions, 5 deletions
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'); } diff --git a/tests/lib/appframework/db/mappertest.php b/tests/lib/appframework/db/mappertest.php index c8b999ad62c..108e4eee28e 100644 --- a/tests/lib/appframework/db/mappertest.php +++ b/tests/lib/appframework/db/mappertest.php @@ -22,10 +22,11 @@ */ -namespace OCP\AppFramework\Db; +namespace Test\AppFramework\Db; use \OCP\IDBConnection; -use Test\AppFramework\Db\MapperTestUtility; +use \OCP\AppFramework\Db\Entity; +use \OCP\AppFramework\Db\Mapper; /** * @method integer getId() @@ -236,7 +237,7 @@ class MapperTest extends MapperTestUtility { $entity->resetUpdatedFields(); $this->db->expects($this->never()) - ->method('prepareQuery'); + ->method('prepare'); $this->mapper->update($entity); } diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php index ee9454c77a0..c6ededf0142 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(); @@ -548,6 +549,7 @@ class NotificationTest extends TestCase { ->setMethods([ 'isValidCommon', 'getParsedSubject', + 'getSubject', ]) ->getMock(); diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php index d8eb3e0a31e..d173f86f091 100644 --- a/tests/lib/share20/managertest.php +++ b/tests/lib/share20/managertest.php @@ -579,7 +579,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); |