diff options
Diffstat (limited to 'tests/lib/AppFramework/Controller')
3 files changed, 60 insertions, 37 deletions
diff --git a/tests/lib/AppFramework/Controller/ApiControllerTest.php b/tests/lib/AppFramework/Controller/ApiControllerTest.php index 783eecf93e5..74231b8d6ac 100644 --- a/tests/lib/AppFramework/Controller/ApiControllerTest.php +++ b/tests/lib/AppFramework/Controller/ApiControllerTest.php @@ -32,27 +32,31 @@ class ChildApiController extends ApiController {}; class ApiControllerTest extends \Test\TestCase { - /** @var ChildApiController */ - protected $controller; - - public function testCors() { - $request = new Request( - ['server' => ['HTTP_ORIGIN' => 'test']], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') - ); - $this->controller = new ChildApiController('app', $request, 'verbs', - 'headers', 100); - - $response = $this->controller->preflightedCors(); - - $headers = $response->getHeaders(); - - $this->assertEquals('test', $headers['Access-Control-Allow-Origin']); - $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']); - $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']); - $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']); - $this->assertEquals(100, $headers['Access-Control-Max-Age']); - } + /** @var ChildApiController */ + protected $controller; + + public function testCors() { + $request = new Request( + ['server' => ['HTTP_ORIGIN' => 'test']], + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() + ); + $this->controller = new ChildApiController('app', $request, 'verbs', + 'headers', 100); + + $response = $this->controller->preflightedCors(); + + $headers = $response->getHeaders(); + + $this->assertEquals('test', $headers['Access-Control-Allow-Origin']); + $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']); + $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']); + $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']); + $this->assertEquals(100, $headers['Access-Control-Max-Age']); + } } diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 521799a46ce..63cc2873575 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -76,12 +76,18 @@ class ControllerTest extends \Test\TestCase { 'session' => ['sezession' => 'kein'], 'method' => 'hi', ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); - $this->app = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', - array('getAppName'), array('test')); + $this->app = $this->getMockBuilder('OC\AppFramework\DependencyInjection\DIContainer') + ->setMethods(['getAppName']) + ->setConstructorArgs(['test']) + ->getMock(); $this->app->expects($this->any()) ->method('getAppName') ->will($this->returnValue('apptemplate_advanced')); diff --git a/tests/lib/AppFramework/Controller/OCSControllerTest.php b/tests/lib/AppFramework/Controller/OCSControllerTest.php index f69740d4496..7dcbd189cd5 100644 --- a/tests/lib/AppFramework/Controller/OCSControllerTest.php +++ b/tests/lib/AppFramework/Controller/OCSControllerTest.php @@ -33,9 +33,6 @@ class ChildOCSController extends OCSController {} class OCSControllerTest extends \Test\TestCase { - - private $controller; - public function testCors() { $request = new Request( [ @@ -43,8 +40,12 @@ class OCSControllerTest extends \Test\TestCase { 'HTTP_ORIGIN' => 'test', ], ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $controller = new ChildOCSController('app', $request, 'verbs', 'headers', 100); @@ -64,8 +65,12 @@ class OCSControllerTest extends \Test\TestCase { public function testXML() { $controller = new ChildOCSController('app', new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() )); $expected = "<?xml version=\"1.0\"?>\n" . "<ocs>\n" . @@ -96,8 +101,12 @@ class OCSControllerTest extends \Test\TestCase { public function testXMLDataResponse() { $controller = new ChildOCSController('app', new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() )); $expected = "<?xml version=\"1.0\"?>\n" . "<ocs>\n" . @@ -128,8 +137,12 @@ class OCSControllerTest extends \Test\TestCase { public function testJSON() { $controller = new ChildOCSController('app', new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() )); $expected = '{"ocs":{"meta":{"status":"failure","statuscode":400,"message":"OK",' . '"totalitems":"","itemsperpage":""},"data":{"test":"hi"}}}'; |