aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/AppFramework/Http
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/AppFramework/Http')
-rw-r--r--tests/lib/AppFramework/Http/DataResponseTest.php2
-rw-r--r--tests/lib/AppFramework/Http/DispatcherTest.php11
-rw-r--r--tests/lib/AppFramework/Http/DownloadResponseTest.php3
-rw-r--r--tests/lib/AppFramework/Http/HttpTest.php2
-rw-r--r--tests/lib/AppFramework/Http/JSONResponseTest.php1
-rw-r--r--tests/lib/AppFramework/Http/OCSResponseTest.php5
-rw-r--r--tests/lib/AppFramework/Http/PublicTemplateResponseTest.php2
-rw-r--r--tests/lib/AppFramework/Http/RedirectResponseTest.php2
-rw-r--r--tests/lib/AppFramework/Http/RequestStream.php22
-rw-r--r--tests/lib/AppFramework/Http/RequestTest.php4
-rw-r--r--tests/lib/AppFramework/Http/ResponseTest.php1
-rw-r--r--tests/lib/AppFramework/Http/StreamResponseTest.php1
-rw-r--r--tests/lib/AppFramework/Http/TemplateResponseTest.php1
13 files changed, 14 insertions, 43 deletions
diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php
index cd7b64a1caa..e7624c92d7e 100644
--- a/tests/lib/AppFramework/Http/DataResponseTest.php
+++ b/tests/lib/AppFramework/Http/DataResponseTest.php
@@ -84,6 +84,4 @@ class DataResponseTest extends \Test\TestCase {
$this->assertEquals(Http::STATUS_NOT_FOUND, $this->response->getStatus());
$this->assertEquals(['hi', 'yo'], $this->response->getData());
}
-
-
}
diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php
index bb6f68c40bb..74dbf68c28a 100644
--- a/tests/lib/AppFramework/Http/DispatcherTest.php
+++ b/tests/lib/AppFramework/Http/DispatcherTest.php
@@ -70,7 +70,6 @@ class TestController extends Controller {
'text' => [$int, $bool, $test, $test2]
]);
}
-
}
@@ -142,15 +141,14 @@ class DispatcherTest extends \Test\TestCase {
private function setMiddlewareExpectations($out=null,
$httpHeaders=null, $responseHeaders=[],
$ex=false, $catchEx=true) {
-
- if($ex) {
+ if ($ex) {
$exception = new \Exception();
$this->middlewareDispatcher->expects($this->once())
->method('beforeController')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
->will($this->throwException($exception));
- if($catchEx) {
+ if ($catchEx) {
$this->middlewareDispatcher->expects($this->once())
->method('afterException')
->with($this->equalTo($this->controller),
@@ -272,7 +270,6 @@ class DispatcherTest extends \Test\TestCase {
$this->controller,
$this->controllerMethod
);
-
}
@@ -488,8 +485,4 @@ class DispatcherTest extends \Test\TestCase {
$this->assertEquals('{"text":[3,true,4,1]}', $response[3]);
}
-
-
-
-
}
diff --git a/tests/lib/AppFramework/Http/DownloadResponseTest.php b/tests/lib/AppFramework/Http/DownloadResponseTest.php
index b3437a351f9..1ad53f5db13 100644
--- a/tests/lib/AppFramework/Http/DownloadResponseTest.php
+++ b/tests/lib/AppFramework/Http/DownloadResponseTest.php
@@ -26,7 +26,6 @@ namespace Test\AppFramework\Http;
use OCP\AppFramework\Http\DownloadResponse;
class ChildDownloadResponse extends DownloadResponse {
-
};
@@ -49,6 +48,4 @@ class DownloadResponseTest extends \Test\TestCase {
$this->assertContains('attachment; filename="file"', $headers['Content-Disposition']);
$this->assertContains('content', $headers['Content-Type']);
}
-
-
}
diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php
index 14097a2a581..009bb39260d 100644
--- a/tests/lib/AppFramework/Http/HttpTest.php
+++ b/tests/lib/AppFramework/Http/HttpTest.php
@@ -26,7 +26,6 @@ namespace Test\AppFramework\Http;
use OC\AppFramework\Http;
class HttpTest extends \Test\TestCase {
-
private $server;
/**
@@ -93,5 +92,4 @@ class HttpTest extends \Test\TestCase {
$this->assertEquals('HTTP/1.0 302 Found', $header);
}
// TODO: write unittests for http codes
-
}
diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php
index 56e6d43096d..504876b2d88 100644
--- a/tests/lib/AppFramework/Http/JSONResponseTest.php
+++ b/tests/lib/AppFramework/Http/JSONResponseTest.php
@@ -116,5 +116,4 @@ class JSONResponseTest extends \Test\TestCase {
$this->assertEquals(Http::STATUS_NOT_FOUND, $this->json->getStatus());
$this->assertEquals(['hi', 'yo'], $this->json->getData());
}
-
}
diff --git a/tests/lib/AppFramework/Http/OCSResponseTest.php b/tests/lib/AppFramework/Http/OCSResponseTest.php
index ec1b422ddd9..e33f1399b84 100644
--- a/tests/lib/AppFramework/Http/OCSResponseTest.php
+++ b/tests/lib/AppFramework/Http/OCSResponseTest.php
@@ -26,8 +26,6 @@ namespace Test\AppFramework\Http;
use OCP\AppFramework\Http\OCSResponse;
class OCSResponseTest extends \Test\TestCase {
-
-
public function testHeadersJSON() {
$response = new OCSResponse('json', 1, 2, 3);
$type = $response->getHeaders()['Content-Type'];
@@ -62,8 +60,5 @@ class OCSResponseTest extends \Test\TestCase {
"</ocs>\n";
$this->assertEquals($expected, $out);
-
}
-
-
}
diff --git a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php b/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php
index 90fb8cceca1..cbf8f8303c3 100644
--- a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php
+++ b/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php
@@ -29,7 +29,6 @@ use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use Test\TestCase;
class PublicTemplateResponseTest extends TestCase {
-
public function testSetParamsConstructor() {
$template = new PublicTemplateResponse('app', 'home', ['key' => 'value']);
$this->assertContains('core/js/public/publicpage', \OC_Util::$scripts);
@@ -79,5 +78,4 @@ class PublicTemplateResponseTest extends TestCase {
$this->assertEquals(['key' => 'value'], $template->getParams());
$this->assertEquals('public', $template->getRenderAs());
}
-
}
diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/lib/AppFramework/Http/RedirectResponseTest.php
index 3c210092ca8..5130d36937f 100644
--- a/tests/lib/AppFramework/Http/RedirectResponseTest.php
+++ b/tests/lib/AppFramework/Http/RedirectResponseTest.php
@@ -50,6 +50,4 @@ class RedirectResponseTest extends \Test\TestCase {
public function testGetRedirectUrl() {
$this->assertEquals('/url', $this->response->getRedirectUrl());
}
-
-
}
diff --git a/tests/lib/AppFramework/Http/RequestStream.php b/tests/lib/AppFramework/Http/RequestStream.php
index 97951ea4b9f..1dcfbce46d1 100644
--- a/tests/lib/AppFramework/Http/RequestStream.php
+++ b/tests/lib/AppFramework/Http/RequestStream.php
@@ -44,28 +44,28 @@ class RequestStream {
switch ($whence) {
case SEEK_SET:
if ($offset < strlen($GLOBALS[$this->varname]) && $offset >= 0) {
- $this->position = $offset;
- return true;
+ $this->position = $offset;
+ return true;
} else {
- return false;
+ return false;
}
break;
case SEEK_CUR:
if ($offset >= 0) {
- $this->position += $offset;
- return true;
+ $this->position += $offset;
+ return true;
} else {
- return false;
+ return false;
}
break;
case SEEK_END:
if (strlen($GLOBALS[$this->varname]) + $offset >= 0) {
- $this->position = strlen($GLOBALS[$this->varname]) + $offset;
- return true;
+ $this->position = strlen($GLOBALS[$this->varname]) + $offset;
+ return true;
} else {
- return false;
+ return false;
}
break;
@@ -97,10 +97,10 @@ class RequestStream {
}
function stream_metadata($path, $option, $var) {
- if($option == STREAM_META_TOUCH) {
+ if ($option == STREAM_META_TOUCH) {
$url = parse_url($path);
$varname = $url["host"];
- if(!isset($GLOBALS[$varname])) {
+ if (!isset($GLOBALS[$varname])) {
$GLOBALS[$varname] = '';
}
return true;
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index 819eb666d7b..2004bd2e6b5 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -77,7 +77,6 @@ class RequestTest extends \Test\TestCase {
$this->assertSame('Joey', $request->get['nickname']);
// Always returns null if variable not set.
$this->assertSame(null, $request->{'flickname'});
-
}
// urlParams has precedence over POST which has precedence over GET
@@ -326,11 +325,10 @@ class RequestTest extends \Test\TestCase {
try {
$resource = $request->put;
- } catch(\LogicException $e) {
+ } catch (\LogicException $e) {
return;
}
$this->fail('Expected LogicException.');
-
}
diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php
index 7ff12b7fa67..3978326d130 100644
--- a/tests/lib/AppFramework/Http/ResponseTest.php
+++ b/tests/lib/AppFramework/Http/ResponseTest.php
@@ -269,7 +269,6 @@ class ResponseTest extends \Test\TestCase {
$this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']);
$this->assertEquals('max-age=33, must-revalidate',
$headers['Cache-Control']);
-
}
public function testThrottle() {
diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php
index fb4eb5dc91c..97aced01506 100644
--- a/tests/lib/AppFramework/Http/StreamResponseTest.php
+++ b/tests/lib/AppFramework/Http/StreamResponseTest.php
@@ -95,5 +95,4 @@ class StreamResponseTest extends \Test\TestCase {
$response->callback($this->output);
}
-
}
diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php
index 0faa78998cb..6cbf112494e 100644
--- a/tests/lib/AppFramework/Http/TemplateResponseTest.php
+++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php
@@ -82,5 +82,4 @@ class TemplateResponseTest extends \Test\TestCase {
$this->assertEquals(Http::STATUS_NOT_FOUND, $this->tpl->getStatus());
$this->assertEquals(['hi' => 'yo'], $this->tpl->getParams());
}
-
}