diff options
Diffstat (limited to 'apps/dav/tests/unit')
| -rw-r--r-- | apps/dav/tests/unit/CardDAV/ConverterTest.php | 14 | ||||
| -rw-r--r-- | apps/dav/tests/unit/DAV/HookManagerTest.php | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php index 757d69659e8..dbb035a33d3 100644 --- a/apps/dav/tests/unit/CardDAV/ConverterTest.php +++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php @@ -32,7 +32,6 @@ use OCP\IDBConnection; use OCP\IImage; use OCP\IUser; use PHPUnit_Framework_MockObject_MockObject; -use Symfony\Component\EventDispatcher\EventDispatcher; use Test\TestCase; class ConverterTest extends TestCase { @@ -40,19 +39,10 @@ class ConverterTest extends TestCase { /** @var AccountManager | PHPUnit_Framework_MockObject_MockObject */ private $accountManager; - /** @var EventDispatcher | PHPUnit_Framework_MockObject_MockObject */ - private $eventDispatcher; - - /** @var IDBConnection | PHPUnit_Framework_MockObject_MockObject */ - private $databaseConnection; - public function setUp() { parent::setUp(); - $this->databaseConnection = $this->getMockBuilder(IDBConnection::class)->getMock(); - $this->eventDispatcher = $this->getMockBuilder(EventDispatcher::class) - ->disableOriginalConstructor()->getMock(); - $this->accountManager = $this->getMockBuilder(AccountManager::class) - ->disableOriginalConstructor()->getMock(); + + $this->accountManager = $this->createMock(AccountManager::class); } public function getAccountManager(IUser $user) { diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index 25219b7a8f2..75baf8257da 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -36,19 +36,19 @@ use OCA\DAV\HookManager; use OCP\IL10N; use OCP\IUser; use OCP\IUserManager; -use Symfony\Component\EventDispatcher\EventDispatcher; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; class HookManagerTest extends TestCase { /** @var IL10N */ private $l10n; - /** @var EventDispatcher | \PHPUnit_Framework_MockObject_MockObject */ + /** @var EventDispatcherInterface | \PHPUnit_Framework_MockObject_MockObject */ private $eventDispatcher; public function setUp() { parent::setUp(); - $this->eventDispatcher = $this->getMockBuilder(EventDispatcher::class)->disableOriginalConstructor()->getMock(); + $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); $this->l10n = $this->createMock(IL10N::class); $this->l10n ->expects($this->any()) |