Skip to content

Phpunit warning fixes appframework #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Jul 11, 2016
Merged

Phpunit warning fixes appframework #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fa9e67
Fix phpunit-5.4 wargning
rullzer Jul 10, 2016
937c951
Mock logger
rullzer Jul 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions tests/lib/AppFramework/Controller/ApiControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
}

}
14 changes: 10 additions & 4 deletions tests/lib/AppFramework/Controller/ControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,18 @@ protected function setUp(){
'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'));
Expand Down
35 changes: 24 additions & 11 deletions tests/lib/AppFramework/Controller/OCSControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,19 @@ class ChildOCSController extends OCSController {}


class OCSControllerTest extends \Test\TestCase {

private $controller;

public function testCors() {
$request = new Request(
[
'server' => [
'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);
Expand All @@ -64,8 +65,12 @@ public function testCors() {
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" .
Expand Down Expand Up @@ -96,8 +101,12 @@ public function testXML() {
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" .
Expand Down Expand Up @@ -128,8 +137,12 @@ public function testXMLDataResponse() {
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"}}}';
Expand Down
19 changes: 13 additions & 6 deletions tests/lib/AppFramework/DependencyInjection/DIContainerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ class DIContainerTest extends \Test\TestCase {

protected function setUp(){
parent::setUp();
$this->container = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
['isAdminUser'], ['name']
);
$this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi'));
$this->container = $this->getMockBuilder('OC\AppFramework\DependencyInjection\DIContainer')
->setMethods(['isAdminUser'])
->setConstructorArgs(['name'])
->getMock();
$this->api = $this->getMockBuilder('OC\AppFramework\Core\API')
->setConstructorArgs(['hi'])
->getMock();
}

public function testProvidesAPI(){
Expand Down Expand Up @@ -75,8 +78,12 @@ public function testAppNameIsSetCorrectly(){
public function testMiddlewareDispatcherIncludesSecurityMiddleware(){
$this->container['Request'] = new Request(
['method' => 'GET'],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$security = $this->container['SecurityMiddleware'];
$dispatcher = $this->container['MiddlewareDispatcher'];
Expand Down
56 changes: 41 additions & 15 deletions tests/lib/AppFramework/Http/DispatcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,11 @@ protected function setUp() {
'\OC\AppFramework\Middleware\MiddlewareDispatcher')
->disableOriginalConstructor()
->getMock();
$this->controller = $this->getMock(
'\OCP\AppFramework\Controller',
array($this->controllerMethod), array($app, $request));
$this->controller = $this->getMockBuilder(
'\OCP\AppFramework\Controller')
->setMethods([$this->controllerMethod])
->setConstructorArgs([$app, $request])
->getMock();

$this->request = $this->getMockBuilder(
'\OC\AppFramework\Http\Request')
Expand Down Expand Up @@ -296,8 +298,12 @@ public function testControllerParametersInjected() {
],
'method' => 'POST'
],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
Expand All @@ -323,8 +329,12 @@ public function testControllerParametersInjectedDefaultOverwritten() {
],
'method' => 'POST',
],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
Expand Down Expand Up @@ -353,8 +363,12 @@ public function testResponseTransformedByUrlFormat() {
],
'method' => 'GET'
],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
Expand Down Expand Up @@ -382,8 +396,12 @@ public function testResponseTransformsDataResponse() {
],
'method' => 'GET'
],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
Expand Down Expand Up @@ -412,8 +430,12 @@ public function testResponseTransformedByAcceptHeader() {
],
'method' => 'PUT'
],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
Expand Down Expand Up @@ -444,8 +466,12 @@ public function testResponsePrimarilyTransformedByParameterFormat() {
],
'method' => 'POST'
],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')
->disableOriginalConstructor()
->getMock(),
$this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()
->getMock()
);
$this->dispatcher = new Dispatcher(
$this->http, $this->middlewareDispatcher, $this->reflector,
Expand Down
4 changes: 3 additions & 1 deletion tests/lib/AppFramework/Http/StreamResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ class StreamResponseTest extends \Test\TestCase {

protected function setUp() {
parent::setUp();
$this->output = $this->getMock('OCP\\AppFramework\\Http\\IOutput');
$this->output = $this->getMockBuilder('OCP\\AppFramework\\Http\\IOutput')
->disableOriginalConstructor()
->getMock();
}

public function testOutputNotModified(){
Expand Down
6 changes: 4 additions & 2 deletions tests/lib/AppFramework/Http/TemplateResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ class TemplateResponseTest extends \Test\TestCase {
protected function setUp() {
parent::setUp();

$this->api = $this->getMock('OC\AppFramework\Core\API',
array('getAppName'), array('test'));
$this->api = $this->getMockBuilder('OC\AppFramework\Core\API')
->setMethods(['getAppName'])
->setConstructorArgs(['test'])
->getMock();
$this->api->expects($this->any())
->method('getAppName')
->will($this->returnValue('app'));
Expand Down
26 changes: 13 additions & 13 deletions tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,15 @@ protected function setUp() {


private function getControllerMock(){
return $this->getMock(
'OCP\AppFramework\Controller',
['method'],
['app',
return $this->getMockBuilder('OCP\AppFramework\Controller')
->setMethods(['method'])
->setConstructorArgs(['app',
new Request(
['method' => 'GET'],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(),
$this->getMockBuilder('\OCP\IConfig')->getMock()
)
]
);
])->getMock();
}


Expand All @@ -149,13 +147,15 @@ private function getMiddleware($beforeControllerThrowsEx=false){

public function testAfterExceptionShouldReturnResponseOfMiddleware(){
$response = new Response();
$m1 = $this->getMock('\OCP\AppFramework\Middleware',
array('afterException', 'beforeController'));
$m1 = $this->getMockBuilder('\OCP\AppFramework\Middleware')
->setMethods(['afterException', 'beforeController'])
->getMock();
$m1->expects($this->never())
->method('afterException');

$m2 = $this->getMock('OCP\AppFramework\Middleware',
array('afterException', 'beforeController'));
$m2 = $this->getMockBuilder('OCP\AppFramework\Middleware')
->setMethods(['afterException', 'beforeController'])
->getMock();
$m2->expects($this->once())
->method('afterException')
->will($this->returnValue($response));
Expand Down Expand Up @@ -274,7 +274,7 @@ public function testBeforeOutputOrder(){
public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares(){
$m1 = $this->getMiddleware();
$m2 = $this->getMiddleware(true);
$m3 = $this->getMock('\OCP\AppFramework\Middleware');
$m3 = $this->getMockBuilder('\OCP\AppFramework\Middleware')->getMock();
$m3->expects($this->never())
->method('afterException');
$m3->expects($this->never())
Expand Down
19 changes: 8 additions & 11 deletions tests/lib/AppFramework/Middleware/MiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,22 @@ protected function setUp(){

$this->middleware = new ChildMiddleware();

$this->api = $this->getMockBuilder(
'OC\AppFramework\DependencyInjection\DIContainer')
$this->api = $this->getMockBuilder('OC\AppFramework\DependencyInjection\DIContainer')
->disableOriginalConstructor()
->getMock();

$this->controller = $this->getMock(
'OCP\AppFramework\Controller',
[],
[
$this->controller = $this->getMockBuilder('OCP\AppFramework\Controller')
->setMethods([])
->setConstructorArgs([
$this->api,
new Request(
[],
$this->getMock('\OCP\Security\ISecureRandom'),
$this->getMock('\OCP\IConfig')
$this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(),
$this->getMockBuilder('\OCP\IConfig')->getMock()
)
]
);
])->getMock();
$this->exception = new \Exception();
$this->response = $this->getMock('OCP\AppFramework\Http\Response');
$this->response = $this->getMockBuilder('OCP\AppFramework\Http\Response')->getMock();
}


Expand Down
Loading