]> source.dussan.org Git - nextcloud-server.git/commitdiff
Don't end the abstract class name with Test.php
authorJoas Schilling <coding@schilljs.com>
Thu, 27 Apr 2017 07:49:37 +0000 (09:49 +0200)
committerJoas Schilling <coding@schilljs.com>
Thu, 27 Apr 2017 07:49:37 +0000 (09:49 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php
apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php [deleted file]
apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php [new file with mode: 0644]
apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php

index 7468e98102002e29abb08915dd153f542e243554..35fd83f1fe631bfcf38108acb95d8097ff9ad5d4 100644 (file)
@@ -31,7 +31,7 @@ use OCP\AppFramework\Http;
  *
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
-class DeleteTest extends RequestTest {
+class DeleteTest extends RequestTestCase {
        public function testBasicUpload() {
                $user = $this->getUniqueID();
                $view = $this->setupUser($user, 'pass');
index 8aac99e8c545e7f4f4485ec01b951f246a69d2e7..2cb08420f8d3981717c1405011449060529a2001 100644 (file)
@@ -34,7 +34,7 @@ use OCP\Lock\ILockingProvider;
  *
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
-class DownloadTest extends RequestTest {
+class DownloadTest extends RequestTestCase {
        public function testDownload() {
                $user = $this->getUniqueID();
                $view = $this->setupUser($user, 'pass');
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php
deleted file mode 100644 (file)
index 63bd3cf..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest;
-
-use OCA\DAV\Connector\Sabre\Server;
-use OCA\DAV\Connector\Sabre\ServerFactory;
-use OC\Files\View;
-use Sabre\HTTP\Request;
-use Test\TestCase;
-use Test\Traits\MountProviderTrait;
-use Test\Traits\UserTrait;
-
-abstract class RequestTest extends TestCase {
-       use UserTrait;
-       use MountProviderTrait;
-
-       /**
-        * @var \OCA\DAV\Connector\Sabre\ServerFactory
-        */
-       protected $serverFactory;
-
-       protected function getStream($string) {
-               $stream = fopen('php://temp', 'r+');
-               fwrite($stream, $string);
-               fseek($stream, 0);
-               return $stream;
-       }
-
-       protected function setUp() {
-               parent::setUp();
-
-               unset($_SERVER['HTTP_OC_CHUNKED']);
-
-               $this->serverFactory = new ServerFactory(
-                       \OC::$server->getConfig(),
-                       \OC::$server->getLogger(),
-                       \OC::$server->getDatabaseConnection(),
-                       \OC::$server->getUserSession(),
-                       \OC::$server->getMountManager(),
-                       \OC::$server->getTagManager(),
-                       $this->getMockBuilder('\OCP\IRequest')
-                               ->disableOriginalConstructor()
-                               ->getMock(),
-                       \OC::$server->getPreviewManager()
-               );
-       }
-
-       protected function setupUser($name, $password) {
-               $this->createUser($name, $password);
-               $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
-               $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-               $this->loginAsUser($name);
-               return new View('/' . $name . '/files');
-       }
-
-       /**
-        * @param \OC\Files\View $view the view to run the webdav server against
-        * @param string $user
-        * @param string $password
-        * @param string $method
-        * @param string $url
-        * @param resource|string|null $body
-        * @param array|null $headers
-        * @return \Sabre\HTTP\Response
-        * @throws \Exception
-        */
-       protected function request($view, $user, $password, $method, $url, $body = null, $headers = null) {
-               if (is_string($body)) {
-                       $body = $this->getStream($body);
-               }
-               $this->logout();
-               $exceptionPlugin = new ExceptionPlugin('webdav', null);
-               $server = $this->getSabreServer($view, $user, $password, $exceptionPlugin);
-               $request = new Request($method, $url, $headers, $body);
-
-               // since sabre catches all exceptions we need to save them and throw them from outside the sabre server
-
-               $originalServer = $_SERVER;
-
-               if (is_array($headers)) {
-                       foreach ($headers as $header => $value) {
-                               $_SERVER['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
-                       }
-               }
-
-               $result = $this->makeRequest($server, $request);
-
-               foreach ($exceptionPlugin->getExceptions() as $exception) {
-                       throw $exception;
-               }
-               $_SERVER = $originalServer;
-               return $result;
-       }
-
-       /**
-        * @param Server $server
-        * @param Request $request
-        * @return \Sabre\HTTP\Response
-        */
-       protected function makeRequest(Server $server, Request $request) {
-               $sapi = new Sapi($request);
-               $server->sapi = $sapi;
-               $server->httpRequest = $request;
-               $server->exec();
-               return $sapi->getResponse();
-       }
-
-       /**
-        * @param View $view
-        * @param string $user
-        * @param string $password
-        * @param ExceptionPlugin $exceptionPlugin
-        * @return Server
-        */
-       protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
-               $authBackend = new Auth($user, $password);
-
-               $server = $this->serverFactory->createServer('/', 'dummy', $authBackend, function () use ($view) {
-                       return $view;
-               });
-               $server->addPlugin($exceptionPlugin);
-
-               return $server;
-       }
-}
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php
new file mode 100644 (file)
index 0000000..50e228b
--- /dev/null
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Robin Appelman <robin@icewind.nl>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest;
+
+use OCA\DAV\Connector\Sabre\Server;
+use OCA\DAV\Connector\Sabre\ServerFactory;
+use OC\Files\View;
+use Sabre\HTTP\Request;
+use Test\TestCase;
+use Test\Traits\MountProviderTrait;
+use Test\Traits\UserTrait;
+
+abstract class RequestTestCase extends TestCase {
+       use UserTrait;
+       use MountProviderTrait;
+
+       /**
+        * @var \OCA\DAV\Connector\Sabre\ServerFactory
+        */
+       protected $serverFactory;
+
+       protected function getStream($string) {
+               $stream = fopen('php://temp', 'r+');
+               fwrite($stream, $string);
+               fseek($stream, 0);
+               return $stream;
+       }
+
+       protected function setUp() {
+               parent::setUp();
+
+               unset($_SERVER['HTTP_OC_CHUNKED']);
+
+               $this->serverFactory = new ServerFactory(
+                       \OC::$server->getConfig(),
+                       \OC::$server->getLogger(),
+                       \OC::$server->getDatabaseConnection(),
+                       \OC::$server->getUserSession(),
+                       \OC::$server->getMountManager(),
+                       \OC::$server->getTagManager(),
+                       $this->getMockBuilder('\OCP\IRequest')
+                               ->disableOriginalConstructor()
+                               ->getMock(),
+                       \OC::$server->getPreviewManager()
+               );
+       }
+
+       protected function setupUser($name, $password) {
+               $this->createUser($name, $password);
+               $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+               $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+               $this->loginAsUser($name);
+               return new View('/' . $name . '/files');
+       }
+
+       /**
+        * @param \OC\Files\View $view the view to run the webdav server against
+        * @param string $user
+        * @param string $password
+        * @param string $method
+        * @param string $url
+        * @param resource|string|null $body
+        * @param array|null $headers
+        * @return \Sabre\HTTP\Response
+        * @throws \Exception
+        */
+       protected function request($view, $user, $password, $method, $url, $body = null, $headers = null) {
+               if (is_string($body)) {
+                       $body = $this->getStream($body);
+               }
+               $this->logout();
+               $exceptionPlugin = new ExceptionPlugin('webdav', null);
+               $server = $this->getSabreServer($view, $user, $password, $exceptionPlugin);
+               $request = new Request($method, $url, $headers, $body);
+
+               // since sabre catches all exceptions we need to save them and throw them from outside the sabre server
+
+               $originalServer = $_SERVER;
+
+               if (is_array($headers)) {
+                       foreach ($headers as $header => $value) {
+                               $_SERVER['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
+                       }
+               }
+
+               $result = $this->makeRequest($server, $request);
+
+               foreach ($exceptionPlugin->getExceptions() as $exception) {
+                       throw $exception;
+               }
+               $_SERVER = $originalServer;
+               return $result;
+       }
+
+       /**
+        * @param Server $server
+        * @param Request $request
+        * @return \Sabre\HTTP\Response
+        */
+       protected function makeRequest(Server $server, Request $request) {
+               $sapi = new Sapi($request);
+               $server->sapi = $sapi;
+               $server->httpRequest = $request;
+               $server->exec();
+               return $sapi->getResponse();
+       }
+
+       /**
+        * @param View $view
+        * @param string $user
+        * @param string $password
+        * @param ExceptionPlugin $exceptionPlugin
+        * @return Server
+        */
+       protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
+               $authBackend = new Auth($user, $password);
+
+               $server = $this->serverFactory->createServer('/', 'dummy', $authBackend, function () use ($view) {
+                       return $view;
+               });
+               $server->addPlugin($exceptionPlugin);
+
+               return $server;
+       }
+}
index 1db85b1bcaf5be29f173a2c894b3f19856228fb2..5376241c61d9e829fa5b48e0ca9a67c35ea38364 100644 (file)
@@ -35,7 +35,7 @@ use OCP\Lock\ILockingProvider;
  *
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
-class UploadTest extends RequestTest {
+class UploadTest extends RequestTestCase {
        public function testBasicUpload() {
                $user = $this->getUniqueID();
                $view = $this->setupUser($user, 'pass');