diff options
Diffstat (limited to 'apps/federation/tests')
| -rw-r--r-- | apps/federation/tests/API/OCSAuthAPITest.php (renamed from apps/federation/tests/api/ocsauthapitest.php) | 0 | ||||
| -rw-r--r-- | apps/federation/tests/BackgroundJob/GetSharedSecretTest.php (renamed from apps/federation/tests/backgroundjob/getsharedsecrettest.php) | 0 | ||||
| -rw-r--r-- | apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php (renamed from apps/federation/tests/backgroundjob/requestsharedsecrettest.php) | 6 | ||||
| -rw-r--r-- | apps/federation/tests/Controller/SettingsControllerTest.php (renamed from apps/federation/tests/controller/settingscontrollertest.php) | 0 | ||||
| -rw-r--r-- | apps/federation/tests/DAV/FedAuthTest.php (renamed from apps/federation/tests/dav/fedauthtest.php) | 0 | ||||
| -rw-r--r-- | apps/federation/tests/DbHandlerTest.php (renamed from apps/federation/tests/lib/dbhandlertest.php) | 2 | ||||
| -rw-r--r-- | apps/federation/tests/HooksTest.php (renamed from apps/federation/tests/lib/hookstest.php) | 2 | ||||
| -rw-r--r-- | apps/federation/tests/Middleware/AddServerMiddlewareTest.php (renamed from apps/federation/tests/middleware/addservermiddlewaretest.php) | 0 | ||||
| -rw-r--r-- | apps/federation/tests/SyncFederationAddressbooksTest.php (renamed from apps/federation/tests/lib/syncfederationaddressbookstest.php) | 4 | ||||
| -rw-r--r-- | apps/federation/tests/TrustedServersTest.php (renamed from apps/federation/tests/lib/trustedserverstest.php) | 16 |
10 files changed, 20 insertions, 10 deletions
diff --git a/apps/federation/tests/api/ocsauthapitest.php b/apps/federation/tests/API/OCSAuthAPITest.php index d3e61c0641a..d3e61c0641a 100644 --- a/apps/federation/tests/api/ocsauthapitest.php +++ b/apps/federation/tests/API/OCSAuthAPITest.php diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php index 25f7502741d..25f7502741d 100644 --- a/apps/federation/tests/backgroundjob/getsharedsecrettest.php +++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php diff --git a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php index 5b4a1f87a5f..2fc4fe881a6 100644 --- a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php +++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php @@ -24,7 +24,13 @@ namespace OCA\Federation\Tests\BackgroundJob; use OCA\Federation\BackgroundJob\RequestSharedSecret; +use OCA\Federation\DbHandler; +use OCA\Federation\TrustedServers; use OCP\AppFramework\Http; +use OCP\BackgroundJob\IJobList; +use OCP\Http\Client\IClient; +use OCP\Http\Client\IResponse; +use OCP\IURLGenerator; use Test\TestCase; class RequestSharedSecretTest extends TestCase { diff --git a/apps/federation/tests/controller/settingscontrollertest.php b/apps/federation/tests/Controller/SettingsControllerTest.php index 65f7d5f91d3..65f7d5f91d3 100644 --- a/apps/federation/tests/controller/settingscontrollertest.php +++ b/apps/federation/tests/Controller/SettingsControllerTest.php diff --git a/apps/federation/tests/dav/fedauthtest.php b/apps/federation/tests/DAV/FedAuthTest.php index b716084a45d..b716084a45d 100644 --- a/apps/federation/tests/dav/fedauthtest.php +++ b/apps/federation/tests/DAV/FedAuthTest.php diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/DbHandlerTest.php index 3ded486d36a..6e5b8f2f06c 100644 --- a/apps/federation/tests/lib/dbhandlertest.php +++ b/apps/federation/tests/DbHandlerTest.php @@ -21,7 +21,7 @@ */ -namespace OCA\Federation\Tests\lib; +namespace OCA\Federation\Tests; use OCA\Federation\DbHandler; diff --git a/apps/federation/tests/lib/hookstest.php b/apps/federation/tests/HooksTest.php index 71569226dd2..014829d9cf6 100644 --- a/apps/federation/tests/lib/hookstest.php +++ b/apps/federation/tests/HooksTest.php @@ -20,7 +20,7 @@ */ -namespace OCA\Federation\Tests\lib; +namespace OCA\Federation\Tests; use OCA\Federation\Hooks; diff --git a/apps/federation/tests/middleware/addservermiddlewaretest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php index be1d97c4035..be1d97c4035 100644 --- a/apps/federation/tests/middleware/addservermiddlewaretest.php +++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php diff --git a/apps/federation/tests/lib/syncfederationaddressbookstest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php index aa2bd9ac2cb..4c266fae3a0 100644 --- a/apps/federation/tests/lib/syncfederationaddressbookstest.php +++ b/apps/federation/tests/SyncFederationAddressbooksTest.php @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OCA\Federation\Tests\lib; +namespace OCA\Federation\Tests; use OCA\Federation\DbHandler; use OCA\Federation\SyncFederationAddressBooks; @@ -52,6 +52,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase { $syncService->expects($this->once())->method('syncRemoteAddressBook') ->willReturn(1); + /** @var \OCA\DAV\CardDAV\SyncService $syncService */ $s = new SyncFederationAddressBooks($dbHandler, $syncService); $s->syncThemAll(function($url, $ex) { $this->callBacks[] = [$url, $ex]; @@ -79,6 +80,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase { $syncService->expects($this->once())->method('syncRemoteAddressBook') ->willThrowException(new \Exception('something did not work out')); + /** @var \OCA\DAV\CardDAV\SyncService $syncService */ $s = new SyncFederationAddressBooks($dbHandler, $syncService); $s->syncThemAll(function($url, $ex) { $this->callBacks[] = [$url, $ex]; diff --git a/apps/federation/tests/lib/trustedserverstest.php b/apps/federation/tests/TrustedServersTest.php index a8c7c7afb1f..e49db2556be 100644 --- a/apps/federation/tests/lib/trustedserverstest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -21,7 +21,7 @@ */ -namespace OCA\Federation\Tests\lib; +namespace OCA\Federation\Tests; use OCA\Federation\DbHandler; @@ -38,7 +38,7 @@ use Test\TestCase; class TrustedServersTest extends TestCase { - /** @var TrustedServers */ + /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers */ private $trustedServers; /** @var \PHPUnit_Framework_MockObject_MockObject | DbHandler */ @@ -101,7 +101,7 @@ class TrustedServersTest extends TestCase { * @param bool $success */ public function testAddServer($success) { - /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServer */ + /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers $trustedServers */ $trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers') ->setConstructorArgs( [ @@ -172,7 +172,7 @@ class TrustedServersTest extends TestCase { ->with('federation', 'autoAddServers', '1')->willReturn($status); $this->assertSame($expected, - $this->trustedServers->getAutoAddServers($status) + $this->trustedServers->getAutoAddServers() ); } @@ -208,6 +208,7 @@ class TrustedServersTest extends TestCase { function($eventId, $event) { $this->assertSame($eventId, 'OCP\Federation\TrustedServerEvent::remove'); $this->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event); + /** @var \Symfony\Component\EventDispatcher\GenericEvent $event */ $this->assertSame('url_hash', $event->getSubject()); } ); @@ -215,9 +216,10 @@ class TrustedServersTest extends TestCase { } public function testGetServers() { - $this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(true); + $this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(['servers']); - $this->assertTrue( + $this->assertEquals( + ['servers'], $this->trustedServers->getServers() ); } @@ -257,7 +259,7 @@ class TrustedServersTest extends TestCase { $server = 'server1'; - /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServer */ + /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServers */ $trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers') ->setConstructorArgs( [ |