Refactor paths and fix travis

owncloud · Nov 28, 2018 · 468f910 · 468f910
1 parent 083f261
commit 468f910
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ php:
 env:
   global:
     - CORE_BRANCH=master
+    - APP_NAME=richdocuments
   matrix:
     - DB=sqlite
 
@@ -17,7 +18,9 @@ branches:
 sudo: true
 before_install:
   - wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh
-  - bash ./before_install.sh richdocuments $CORE_BRANCH $DB
+  - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+  - cd ../core
+  - php occ app:enable $APP_NAME
 
 script:
   # Test lint

diff --git a/appinfo/app.php b/appinfo/app.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * ownCloud - Richdocuments App
  *
@@ -21,11 +20,9 @@
  *
  */
 
-namespace OCA\Richdocuments\AppInfo;
+use OCA\Richdocuments\AppInfo\Application;
 
 $app = new Application();
 $app->registerScripts();
 
 \OCP\App::registerAdmin('richdocuments', 'admin');
-
-
diff --git a/lib/appconfig.php → lib/AppConfig.php b/lib/appconfig.php → lib/AppConfig.php
diff --git a/lib/appinfo/application.php → lib/AppInfo/Application.php b/lib/appinfo/application.php → lib/AppInfo/Application.php
diff --git a/lib/controller/documentcontroller.php → lib/Controller/DocumentController.php b/lib/controller/documentcontroller.php → lib/Controller/DocumentController.php
@@ -13,7 +13,7 @@
 
 use \OC\Files\View;
 use \OCP\AppFramework\Controller;
-use OCP\Constants;
+use \OCP\Constants;
 use \OCP\IRequest;
 use \OCP\IConfig;
 use \OCP\IL10N;
@@ -28,20 +28,8 @@
 use \OCA\Richdocuments\Db;
 use \OCA\Richdocuments\Helper;
 use \OCA\Richdocuments\Storage;
-use \OCA\Richdocuments\DownloadResponse;
-
-class ResponseException extends \Exception {
-	private $hint;
-
-	public function __construct($description, $hint = '') {
-		parent::__construct($description);
-		$this->hint = $hint;
-	}
-
-	public function getHint() {
-		return $this->hint;
-	}
-}
+use \OCA\Richdocuments\Http\DownloadResponse;
+use \OCA\Richdocuments\Http\ResponseException;
 
 class DocumentController extends Controller {
 

diff --git a/lib/controller/settingscontroller.php → lib/Controller/SettingsController.php b/lib/controller/settingscontroller.php → lib/Controller/SettingsController.php
diff --git a/lib/db.php → lib/Db.php b/lib/db.php → lib/Db.php
diff --git a/lib/db/storage.php → lib/Db/Storage.php b/lib/db/storage.php → lib/Db/Storage.php
diff --git a/lib/db/wopi.php → lib/Db/Wopi.php b/lib/db/wopi.php → lib/Db/Wopi.php
diff --git a/lib/filter.php → lib/Filter.php b/lib/filter.php → lib/Filter.php
diff --git a/lib/helper.php → lib/Helper.php b/lib/helper.php → lib/Helper.php
diff --git a/lib/hookhandler.php → lib/HookHandler.php b/lib/hookhandler.php → lib/HookHandler.php
diff --git a/lib/downloadresponse.php → lib/Http/DownloadResponse.php b/lib/downloadresponse.php → lib/Http/DownloadResponse.php
@@ -9,7 +9,7 @@
  * later.
  */
 
-namespace OCA\Richdocuments;
+namespace OCA\Richdocuments\Http;
 
 use \OCP\AppFramework\Http;
 use \OCP\IRequest;

diff --git a/lib/Http/ResponseException.php b/lib/Http/ResponseException.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * ownCloud - Richdocuments App
+ *
+ * @author Piotr Mrowczynski <piotr@owncloud.com>
+ * @copyright 2018 Piotr Mrowczynski <piotr@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+namespace OCA\Richdocuments\Http;
+
+class ResponseException extends \Exception {
+	private $hint;
+
+	public function __construct($description, $hint = '') {
+		parent::__construct($description);
+		$this->hint = $hint;
+	}
+
+	public function getHint() {
+		return $this->hint;
+	}
+}
diff --git a/lib/storage.php → lib/Storage.php b/lib/storage.php → lib/Storage.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -7,7 +7,7 @@
 		 timeoutForLargeTests="900"
 		>
 	<testsuite name='unit'>
-		<directory suffix='test.php'>./tests/unit</directory>
+		<directory suffix='Test.php'>./tests/unit</directory>
 	</testsuite>
 	<!-- filters for code coverage -->
 	<filter>

diff --git a/tests/unit/appinfo/applicationtest.php → tests/unit/AppInfo/ApplicationTest.php b/tests/unit/appinfo/applicationtest.php → tests/unit/AppInfo/ApplicationTest.php
@@ -8,7 +8,7 @@
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  */
-namespace OCA\Richdocuments\Tests\unit;
+namespace OCA\Richdocuments\Tests\AppInfo;
 
 use \OC_Hook;
 use OCA\Richdocuments\AppInfo\Application;
@@ -18,7 +18,7 @@
  *
  * @group DB
  *
- * @package OCA\Richdocuments\Tests\Unit
+ * @package OCA\Richdocuments\Tests\AppInfo
  */
 class ApplicationTest extends \Test\TestCase {
 

diff --git a/...nit/controller/documentcontrollertest.php → ...nit/Controller/DocumentControllerTest.php b/...nit/controller/documentcontrollertest.php → ...nit/Controller/DocumentControllerTest.php
@@ -8,7 +8,7 @@
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  */
-namespace OCA\Richdocuments\Tests\unit;
+namespace OCA\Richdocuments\Tests\Controller;
 
 use \OCA\Richdocuments\Controller\DocumentController;
 use \OCP\IRequest;
@@ -22,9 +22,9 @@
 /**
  * Class DocumentControllerTest
  *
- * @package OCA\Richdocuments\Tests\Unit
+ * @package OCA\Richdocuments\Tests\Controller
  */
-class DocumentControllerTest extends \PHPUnit_Framework_TestCase {
+class DocumentControllerTest extends \Test\TestCase {
 
 	/**
 	 * @var IRequest
@@ -50,13 +50,13 @@ class DocumentControllerTest extends \PHPUnit_Framework_TestCase {
 	 * @var ILogger
 	 */
 	private $logger;
-
 	/**
 	 * @var Storage
 	 */
 	private $storage;
 
 	public function setUp(){
+		parent::setUp();
 		$this->request = $this->createMock(IRequest::class);
 		$this->settings = $this->createMock(IConfig::class);
 		$this->appConfig = $this->createMock(AppConfig::class);