diff options
Diffstat (limited to 'apps/federation/tests')
-rw-r--r-- | apps/federation/tests/BackgroundJob/GetSharedSecretTest.php | 38 | ||||
-rw-r--r-- | apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php | 37 |
2 files changed, 0 insertions, 75 deletions
diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php index 7bd9208136b..6da3ba68940 100644 --- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php @@ -28,7 +28,6 @@ namespace OCA\Federation\Tests\BackgroundJob; use GuzzleHttp\Exception\ConnectException; -use GuzzleHttp\Ring\Exception\RingException; use OCA\Federation\BackgroundJob\GetSharedSecret; use OCA\Federation\TrustedServers; use OCA\Files_Sharing\Tests\TestCase; @@ -298,41 +297,4 @@ class GetSharedSecretTest extends TestCase { $this->assertTrue($this->invokePrivate($this->getSharedSecret, 'retainJob')); } - - public function testRunRingException() { - $target = 'targetURL'; - $source = 'sourceURL'; - $token = 'token'; - - $argument = ['url' => $target, 'token' => $token]; - - $this->timeFactory->method('getTime') - ->willReturn(42); - - $this->urlGenerator - ->expects($this->once()) - ->method('getAbsoluteURL') - ->with('/') - ->willReturn($source); - $this->httpClient->expects($this->once())->method('get') - ->with( - $target . '/ocs/v2.php/apps/federation/api/v1/shared-secret', - [ - 'query' => - [ - 'url' => $source, - 'token' => $token, - 'format' => 'json', - ], - 'timeout' => 3, - 'connect_timeout' => 3, - ] - )->willThrowException($this->createMock(RingException::class)); - - $this->trustedServers->expects($this->never())->method('addSharedSecret'); - - $this->invokePrivate($this->getSharedSecret, 'run', [$argument]); - - $this->assertTrue($this->invokePrivate($this->getSharedSecret, 'retainJob')); - } } diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php index cb912d1676b..f03c5aa2a2b 100644 --- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php @@ -27,7 +27,6 @@ namespace OCA\Federation\Tests\BackgroundJob; use GuzzleHttp\Exception\ConnectException; -use GuzzleHttp\Ring\Exception\RingException; use OCA\Federation\BackgroundJob\RequestSharedSecret; use OCA\Federation\TrustedServers; use OCP\AppFramework\Http; @@ -279,40 +278,4 @@ class RequestSharedSecretTest extends TestCase { $this->invokePrivate($this->requestSharedSecret, 'run', [$argument]); $this->assertTrue($this->invokePrivate($this->requestSharedSecret, 'retainJob')); } - - public function testRunRingException() { - $target = 'targetURL'; - $source = 'sourceURL'; - $token = 'token'; - - $argument = ['url' => $target, 'token' => $token]; - - $this->timeFactory->method('getTime')->willReturn(42); - - $this->urlGenerator - ->expects($this->once()) - ->method('getAbsoluteURL') - ->with('/') - ->willReturn($source); - - $this->httpClient - ->expects($this->once()) - ->method('post') - ->with( - $target . '/ocs/v2.php/apps/federation/api/v1/request-shared-secret', - [ - 'body' => - [ - 'url' => $source, - 'token' => $token, - 'format' => 'json', - ], - 'timeout' => 3, - 'connect_timeout' => 3, - ] - )->willThrowException($this->createMock(RingException::class)); - - $this->invokePrivate($this->requestSharedSecret, 'run', [$argument]); - $this->assertTrue($this->invokePrivate($this->requestSharedSecret, 'retainJob')); - } } |