Standardize CI and move unit tests to Unit folder

owncloud · Dec 6, 2018 · 9e10d2f · 9e10d2f
1 parent 28d448b
commit 9e10d2f
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 96 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -5,7 +5,7 @@ workspace:
 branches: [master, release*, release/*]
 
 pipeline:
-  install-server:
+  install-core:
     image: owncloudci/core
     version: ${OC_VERSION}
     pull: true
@@ -16,7 +16,7 @@ pipeline:
     db_password: owncloud
     when:
       matrix:
-        NEED_SERVER: true
+        NEED_CORE: true
 
   install-app:
     image: owncloudci/php:${PHP_VERSION}
@@ -85,7 +85,6 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     environment:
-      - PHP_VERSION=${PHP_VERSION}
       - COVERAGE=${COVERAGE}
     commands:
       - if [ -z "${COVERAGE}" ]; then make test-php-unit; fi
@@ -98,20 +97,20 @@ pipeline:
     image: plugins/codecov:2
     secrets: [codecov_token]
     pull: true
-    files:
-      - tests/output/clover.xml
+    paths:
+      - tests/output/*.xml
     when:
       matrix:
         COVERAGE: true
 
   notify:
     image: plugins/slack:1
     pull: true
-    secrets: [ slack_webhook ]
+    secrets: [slack_webhook]
     channel: builds
     when:
-      status: [ failure, changed ]
-      event: [ push, tag ]
+      status: [failure, changed]
+      event: [push, tag]
 
 services:
   mysql:
@@ -168,24 +167,28 @@ matrix:
     - PHP_VERSION: 7.2
       OC_VERSION: daily-master-qa
       TEST_SUITE: codecheck
+      NEED_CORE: true
       NEED_SERVER: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.2
       OC_VERSION: daily-master-qa
       TEST_SUITE: codecheck-deprecations
+      NEED_CORE: true
       NEED_SERVER: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: codecheck
+      NEED_CORE: true
       NEED_SERVER: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: codecheck-deprecations
+      NEED_CORE: true
       NEED_SERVER: true
       NEED_INSTALL_APP: true
 
@@ -195,71 +198,71 @@ matrix:
       TEST_SUITE: phpunit
       DB_TYPE: sqlite
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-master-qa
       TEST_SUITE: phpunit
       DB_TYPE: mysql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-master-qa
       TEST_SUITE: phpunit
       DB_TYPE: pgsql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-master-qa
       TEST_SUITE: phpunit
       DB_TYPE: oci
       DB_NAME: XE
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.2
       OC_VERSION: daily-master-qa
       TEST_SUITE: phpunit
       DB_TYPE: mysql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 5.6
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: phpunit
       DB_TYPE: sqlite
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 5.6
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: phpunit
       DB_TYPE: mysql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.0
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: phpunit
       DB_TYPE: mysql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.0
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: phpunit
       DB_TYPE: pgsql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
       COVERAGE: true
 
@@ -268,21 +271,21 @@ matrix:
       TEST_SUITE: phpunit
       DB_TYPE: oci
       DB_NAME: XE
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: phpunit
       DB_TYPE: mysql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
 
     - PHP_VERSION: 7.2
       OC_VERSION: daily-stable10-qa
       TEST_SUITE: phpunit
       DB_TYPE: mysql
       DB_NAME: owncloud
-      NEED_SERVER: true
+      NEED_CORE: true
       NEED_INSTALL_APP: true
diff --git a/.gitignore b/.gitignore
@@ -50,19 +50,14 @@ nbproject
 .well-known
 /.buildpath
 
-# Tests - auto-generated files
-/tests/coverage*
-/tests/clover.xml
-/tests/output/clover.xml
-/tests/js/node_modules
-/tests/output/
-
-build
-
+/build/
+/l10n/.transifexrc
 .php_cs.cache
 
 # Composer
-composer.phar
 vendor/
 vendor-bin/**/composer.lock
 vendor-bin/**/vendor
+
+# Tests - auto-generated files
+/tests/output
diff --git a/phpunit.xml b/phpunit.xml
@@ -2,12 +2,13 @@
 <phpunit bootstrap="../../tests/bootstrap.php"
 		 strict="true"
 		 verbose="true"
+		 failOnWarning="true"
 		 timeoutForSmallTests="900"
 		 timeoutForMediumTests="900"
 		 timeoutForLargeTests="900"
-		>
+>
 	<testsuite name='unit'>
-		<directory suffix='Test.php'>./tests</directory>
+		<directory suffix='Test.php'>./tests/Unit</directory>
 	</testsuite>
 	<!-- filters for code coverage -->
 	<filter>
@@ -21,4 +22,3 @@
 		<log type="coverage-clover" target="./tests/output/clover.xml"/>
 	</logging>
 </phpunit>
-
diff --git a/tests/Activity/ExtensionTest.php → tests/Unit/Activity/ExtensionTest.php b/tests/Activity/ExtensionTest.php → tests/Unit/Activity/ExtensionTest.php
@@ -19,11 +19,11 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests\Activity;
+namespace OCA\AnnouncementCenter\Tests\Unit\Activity;
 
 use OCA\AnnouncementCenter\Activity\Extension;
 use OCA\AnnouncementCenter\Manager;
-use OCA\AnnouncementCenter\Tests\TestCase;
+use OCA\AnnouncementCenter\Tests\Unit\TestCase;
 use OCP\Activity\IExtension;
 use OCP\Activity\IManager;
 use OCP\IL10N;

diff --git a/tests/AppInfo/AppTest.php → tests/Unit/AppInfo/AppTest.php b/tests/AppInfo/AppTest.php → tests/Unit/AppInfo/AppTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests;
+namespace OCA\AnnouncementCenter\Tests\Unit;
 
 /**
  * Class AppTest
@@ -94,7 +94,7 @@ public function testAppActivity() {
 				$this->assertInstanceOf('\OCA\AnnouncementCenter\Activity\Extension', $navigation);
 			});
 
-		include(__DIR__ . '/../../appinfo/app.php');
+		include(__DIR__ . '/../../../appinfo/app.php');
 	}
 
 	public function testAppNotification() {
@@ -118,6 +118,6 @@ public function testAppNotification() {
 				$this->assertInternalType('string', $info['name']);
 			});
 
-		include(__DIR__ . '/../../appinfo/app.php');
+		include(__DIR__ . '/../../../appinfo/app.php');
 	}
 }
diff --git a/tests/AppInfo/ApplicationTest.php → tests/Unit/AppInfo/ApplicationTest.php b/tests/AppInfo/ApplicationTest.php → tests/Unit/AppInfo/ApplicationTest.php
@@ -19,10 +19,10 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests\AppInfo;
+namespace OCA\AnnouncementCenter\Tests\Unit\AppInfo;
 
 use OCA\AnnouncementCenter\AppInfo\Application;
-use OCA\AnnouncementCenter\Tests\TestCase;
+use OCA\AnnouncementCenter\Tests\Unit\TestCase;
 
 /**
  * Class ApplicationTest

diff --git a/tests/AppInfo/RoutesTest.php → tests/Unit/AppInfo/RoutesTest.php b/tests/AppInfo/RoutesTest.php → tests/Unit/AppInfo/RoutesTest.php
@@ -19,11 +19,11 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests;
+namespace OCA\AnnouncementCenter\Tests\Unit;
 
 class RoutesTest extends TestCase {
 	public function testRoutes() {
-		$routes = include(__DIR__ . '/../../appinfo/routes.php');
+		$routes = include(__DIR__ . '/../../../appinfo/routes.php');
 		$this->assertInternalType('array', $routes);
 		$this->assertCount(1, $routes);
 		$this->assertArrayHasKey('routes', $routes);

diff --git a/tests/BackgroundJobTest.php → tests/Unit/BackgroundJobTest.php b/tests/BackgroundJobTest.php → tests/Unit/BackgroundJobTest.php
@@ -19,11 +19,10 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests;
+namespace OCA\AnnouncementCenter\Tests\Unit;
 
 use OCA\AnnouncementCenter\Manager;
 use OCP\Activity\IManager;
-use OCP\AppFramework\Http;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;

diff --git a/tests/Controller/PageControllerTest.php → tests/Unit/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php → tests/Unit/Controller/PageControllerTest.php
@@ -19,10 +19,10 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests\Controller;
+namespace OCA\AnnouncementCenter\Tests\Unit\Controller;
 
 use OCA\AnnouncementCenter\Manager;
-use OCA\AnnouncementCenter\Tests\TestCase;
+use OCA\AnnouncementCenter\Tests\Unit\TestCase;
 use OCP\AppFramework\Http;
 use OCP\BackgroundJob\IJobList;
 use OCP\IGroupManager;

diff --git a/tests/ManagerTest.php → tests/Unit/ManagerTest.php b/tests/ManagerTest.php → tests/Unit/ManagerTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests;
+namespace OCA\AnnouncementCenter\Tests\Unit;
 
 use OCA\AnnouncementCenter\Manager;
 

diff --git a/tests/Notification/NotifierTest.php → tests/Unit/Notification/NotifierTest.php b/tests/Notification/NotifierTest.php → tests/Unit/Notification/NotifierTest.php
@@ -19,11 +19,11 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests\Notification;
+namespace OCA\AnnouncementCenter\Tests\Unit\Notification;
 
 use OCA\AnnouncementCenter\Notification\Notifier;
 use OCA\AnnouncementCenter\Manager;
-use OCA\AnnouncementCenter\Tests\TestCase;
+use OCA\AnnouncementCenter\Tests\Unit\TestCase;
 use OCP\IL10N;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;

diff --git a/tests/TestCase.php → tests/Unit/TestCase.php b/tests/TestCase.php → tests/Unit/TestCase.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\AnnouncementCenter\Tests;
+namespace OCA\AnnouncementCenter\Tests\Unit;
 
 abstract class TestCase extends \Test\TestCase {
 	/** @var array */

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      *
      */
-    namespace OCA\AnnouncementCenter\Tests;
+    namespace OCA\AnnouncementCenter\Tests\Unit;
     use OCA\AnnouncementCenter\Manager;
@@ Expand Down @@