diff options
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | .scrutinizer.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | appinfo/app.php | 2 | ||||
| -rw-r--r-- | lib/App.php (renamed from lib/app.php) | 0 | ||||
| -rw-r--r-- | lib/AppInfo/Application.php (renamed from appinfo/application.php) | 0 | ||||
| -rw-r--r-- | lib/Capabilities.php (renamed from lib/capabilities.php) | 0 | ||||
| -rw-r--r-- | lib/Controller/EndpointController.php (renamed from controller/endpointcontroller.php) | 0 | ||||
| -rw-r--r-- | lib/Handler.php (renamed from lib/handler.php) | 0 | ||||
| -rw-r--r-- | tests/Integration/app/appinfo/app.php (renamed from tests/integration/app/appinfo/app.php) | 0 | ||||
| -rw-r--r-- | tests/Integration/app/appinfo/info.xml (renamed from tests/integration/app/appinfo/info.xml) | 0 | ||||
| -rw-r--r-- | tests/Integration/app/appinfo/routes.php (renamed from tests/integration/app/appinfo/routes.php) | 0 | ||||
| -rw-r--r-- | tests/Integration/app/controller.php (renamed from tests/integration/app/controller.php) | 0 | ||||
| -rw-r--r-- | tests/Integration/app/notifier.php (renamed from tests/integration/app/notifier.php) | 0 | ||||
| -rw-r--r-- | tests/Integration/composer.json (renamed from tests/integration/composer.json) | 0 | ||||
| -rw-r--r-- | tests/Integration/config/behat.yml (renamed from tests/integration/config/behat.yml) | 0 | ||||
| -rw-r--r-- | tests/Integration/features/bootstrap/FeatureContext.php (renamed from tests/integration/features/bootstrap/FeatureContext.php) | 0 | ||||
| -rw-r--r-- | tests/Integration/features/delete-notifications.feature (renamed from tests/integration/features/delete-notifications.feature) | 0 | ||||
| -rw-r--r-- | tests/Integration/features/notifications-content.feature (renamed from tests/integration/features/notifications-content.feature) | 0 | ||||
| -rw-r--r-- | tests/Integration/features/statuscodes.feature (renamed from tests/integration/features/statuscodes.feature) | 0 | ||||
| -rw-r--r-- | tests/Integration/run.sh (renamed from tests/integration/run.sh) | 0 | ||||
| -rw-r--r-- | tests/Unit/AppInfo/AppTest.php (renamed from tests/unit/appinfo/AppTest.php) | 2 | ||||
| -rw-r--r-- | tests/Unit/AppInfo/ApplicationTest.php (renamed from tests/unit/appinfo/ApplicationTest.php) | 2 | ||||
| -rw-r--r-- | tests/Unit/AppInfo/RoutesTest.php (renamed from tests/unit/appinfo/RoutesTest.php) | 2 | ||||
| -rw-r--r-- | tests/Unit/AppTest.php (renamed from tests/unit/lib/AppTest.php) | 3 | ||||
| -rw-r--r-- | tests/Unit/CapabilitiesTest.php (renamed from tests/unit/lib/CapabilitiesTest.php) | 3 | ||||
| -rw-r--r-- | tests/Unit/Controller/EndpointControllerTest.php (renamed from tests/unit/controller/EndpointControllerTest.php) | 2 | ||||
| -rw-r--r-- | tests/Unit/HandlerTest.php (renamed from tests/unit/lib/HandlerTest.php) | 3 | ||||
| -rw-r--r-- | tests/Unit/TestCase.php (renamed from tests/unit/testcase.php) | 0 | ||||
| -rw-r--r-- | tests/Unit/bootstrap.php (renamed from tests/unit/bootstrap.php) | 0 | ||||
| -rw-r--r-- | tests/Unit/phpunit.xml (renamed from tests/unit/phpunit.xml) | 10 |
31 files changed, 20 insertions, 31 deletions
@@ -51,10 +51,10 @@ nbproject /.buildpath # Tests - auto-generated files -/tests/unit/coverage* -/tests/unit/clover.xml -/tests/unit/js/node_modules +/tests/Unit/coverage* +/tests/Unit/clover.xml +/tests/Unit/js/node_modules -/tests/integration/composer.lock -/tests/integration/output -/tests/integration/vendor +/tests/Integration/composer.lock +/tests/Integration/output +/tests/Integration/vendor diff --git a/.scrutinizer.yml b/.scrutinizer.yml index bc1bdbe..7a3da7a 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,7 +1,5 @@ filter: excluded_paths: - - '3rdparty/*' - - 'js/jquery*' - 'l10n/*' - 'tests/*' diff --git a/.travis.yml b/.travis.yml index 479c869..6dec342 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_install: # Setup behat for integration tests - cd apps/$APP_NAME/ - - cd tests/integration/ + - cd tests/Integration/ - sh -c "if [ '$INTEGRATION' = '1' ]; then composer install; fi" - cd ../../ @@ -45,17 +45,17 @@ script: - cd apps/$APP_NAME/ # Run phpunit tests - - cd tests/unit + - cd tests/Unit - sh -c "if [ '$INTEGRATION' != '1' -a '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then phpunit --configuration phpunit.xml; fi" - cd ../.. # Integration tests - - cd tests/integration + - cd tests/Integration - sh -c "if [ '$INTEGRATION' = '1' ]; then bash run.sh; fi" - cd ../.. # Create coverage report - - cd tests/unit + - cd tests/Unit - sh -c "if [ '$INTEGRATION' != '1' -a '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi" - sh -c "if [ '$INTEGRATION' != '1' -a '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi" - cd ../.. diff --git a/appinfo/app.php b/appinfo/app.php index ea85dfa..7090f62 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -20,8 +20,6 @@ * */ -namespace OCA\Notifications\AppInfo; - use OCA\Notifications\App; use OCA\Notifications\Handler; use OCP\Util; diff --git a/lib/app.php b/lib/App.php index 3d4b6d6..3d4b6d6 100644 --- a/lib/app.php +++ b/lib/App.php diff --git a/appinfo/application.php b/lib/AppInfo/Application.php index 8a95ac8..8a95ac8 100644 --- a/appinfo/application.php +++ b/lib/AppInfo/Application.php diff --git a/lib/capabilities.php b/lib/Capabilities.php index 53004ea..53004ea 100644 --- a/lib/capabilities.php +++ b/lib/Capabilities.php diff --git a/controller/endpointcontroller.php b/lib/Controller/EndpointController.php index 19c248a..19c248a 100644 --- a/controller/endpointcontroller.php +++ b/lib/Controller/EndpointController.php diff --git a/lib/handler.php b/lib/Handler.php index 4cf14c8..4cf14c8 100644 --- a/lib/handler.php +++ b/lib/Handler.php diff --git a/tests/integration/app/appinfo/app.php b/tests/Integration/app/appinfo/app.php index 9b71e91..9b71e91 100644 --- a/tests/integration/app/appinfo/app.php +++ b/tests/Integration/app/appinfo/app.php diff --git a/tests/integration/app/appinfo/info.xml b/tests/Integration/app/appinfo/info.xml index 4eda6d8..4eda6d8 100644 --- a/tests/integration/app/appinfo/info.xml +++ b/tests/Integration/app/appinfo/info.xml diff --git a/tests/integration/app/appinfo/routes.php b/tests/Integration/app/appinfo/routes.php index 20a3be9..20a3be9 100644 --- a/tests/integration/app/appinfo/routes.php +++ b/tests/Integration/app/appinfo/routes.php diff --git a/tests/integration/app/controller.php b/tests/Integration/app/controller.php index afdd642..afdd642 100644 --- a/tests/integration/app/controller.php +++ b/tests/Integration/app/controller.php diff --git a/tests/integration/app/notifier.php b/tests/Integration/app/notifier.php index 14eea74..14eea74 100644 --- a/tests/integration/app/notifier.php +++ b/tests/Integration/app/notifier.php diff --git a/tests/integration/composer.json b/tests/Integration/composer.json index dc8e8d7..dc8e8d7 100644 --- a/tests/integration/composer.json +++ b/tests/Integration/composer.json diff --git a/tests/integration/config/behat.yml b/tests/Integration/config/behat.yml index 0fcead7..0fcead7 100644 --- a/tests/integration/config/behat.yml +++ b/tests/Integration/config/behat.yml diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/Integration/features/bootstrap/FeatureContext.php index 8594d30..8594d30 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/Integration/features/bootstrap/FeatureContext.php diff --git a/tests/integration/features/delete-notifications.feature b/tests/Integration/features/delete-notifications.feature index c2cccb3..c2cccb3 100644 --- a/tests/integration/features/delete-notifications.feature +++ b/tests/Integration/features/delete-notifications.feature diff --git a/tests/integration/features/notifications-content.feature b/tests/Integration/features/notifications-content.feature index 1366eb4..1366eb4 100644 --- a/tests/integration/features/notifications-content.feature +++ b/tests/Integration/features/notifications-content.feature diff --git a/tests/integration/features/statuscodes.feature b/tests/Integration/features/statuscodes.feature index c9a68d3..c9a68d3 100644 --- a/tests/integration/features/statuscodes.feature +++ b/tests/Integration/features/statuscodes.feature diff --git a/tests/integration/run.sh b/tests/Integration/run.sh index 6d51763..6d51763 100644 --- a/tests/integration/run.sh +++ b/tests/Integration/run.sh diff --git a/tests/unit/appinfo/AppTest.php b/tests/Unit/AppInfo/AppTest.php index 2b9be39..a2fe57b 100644 --- a/tests/unit/appinfo/AppTest.php +++ b/tests/Unit/AppInfo/AppTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Notifications\Tests\AppInfo; +namespace OCA\Notifications\Tests\Unit\AppInfo; use OCA\Notifications\Tests\Unit\TestCase; use OCP\IUser; diff --git a/tests/unit/appinfo/ApplicationTest.php b/tests/Unit/AppInfo/ApplicationTest.php index 11fdcf0..c3f4ad1 100644 --- a/tests/unit/appinfo/ApplicationTest.php +++ b/tests/Unit/AppInfo/ApplicationTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Notifications\Tests\AppInfo; +namespace OCA\Notifications\Tests\Unit\AppInfo; use OCA\Notifications\AppInfo\Application; use OCA\Notifications\Tests\Unit\TestCase; diff --git a/tests/unit/appinfo/RoutesTest.php b/tests/Unit/AppInfo/RoutesTest.php index 045b305..60e969f 100644 --- a/tests/unit/appinfo/RoutesTest.php +++ b/tests/Unit/AppInfo/RoutesTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Notifications\Tests\AppInfo; +namespace OCA\Notifications\Tests\Unit\AppInfo; use OCA\Notifications\Tests\Unit\TestCase; diff --git a/tests/unit/lib/AppTest.php b/tests/Unit/AppTest.php index 7d215e6..e3cd99c 100644 --- a/tests/unit/lib/AppTest.php +++ b/tests/Unit/AppTest.php @@ -20,11 +20,10 @@ * */ -namespace OCA\Notifications\Tests\Lib; +namespace OCA\Notifications\Tests\Unit; use OCA\Notifications\App; -use OCA\Notifications\Tests\Unit\TestCase; class AppTest extends TestCase { /** @var \OCA\Notifications\Handler|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/unit/lib/CapabilitiesTest.php b/tests/Unit/CapabilitiesTest.php index 464ee47..f1f82ba 100644 --- a/tests/unit/lib/CapabilitiesTest.php +++ b/tests/Unit/CapabilitiesTest.php @@ -20,10 +20,9 @@ * */ -namespace OCA\Notifications\Tests\Lib; +namespace OCA\Notifications\Tests\Unit; use OCA\Notifications\Capabilities; -use OCA\Notifications\Tests\Unit\TestCase; class CapabilitiesTest extends TestCase { diff --git a/tests/unit/controller/EndpointControllerTest.php b/tests/Unit/Controller/EndpointControllerTest.php index 2a8131a..872364e 100644 --- a/tests/unit/controller/EndpointControllerTest.php +++ b/tests/Unit/Controller/EndpointControllerTest.php @@ -20,7 +20,7 @@ * */ -namespace OCA\Notifications\Tests\Controller; +namespace OCA\Notifications\Tests\Unit\Controller; use OCA\Notifications\Controller\EndpointController; use OCA\Notifications\Tests\Unit\TestCase; diff --git a/tests/unit/lib/HandlerTest.php b/tests/Unit/HandlerTest.php index d4c689e..9f9ff8b 100644 --- a/tests/unit/lib/HandlerTest.php +++ b/tests/Unit/HandlerTest.php @@ -20,11 +20,10 @@ * */ -namespace OCA\Notifications\Tests\Lib; +namespace OCA\Notifications\Tests\Unit; use OCA\Notifications\Handler; -use OCA\Notifications\Tests\Unit\TestCase; /** * Class HandlerTest diff --git a/tests/unit/testcase.php b/tests/Unit/TestCase.php index a60b3b8..a60b3b8 100644 --- a/tests/unit/testcase.php +++ b/tests/Unit/TestCase.php diff --git a/tests/unit/bootstrap.php b/tests/Unit/bootstrap.php index fb650cb..fb650cb 100644 --- a/tests/unit/bootstrap.php +++ b/tests/Unit/bootstrap.php diff --git a/tests/unit/phpunit.xml b/tests/Unit/phpunit.xml index 1b84558..b531a90 100644 --- a/tests/unit/phpunit.xml +++ b/tests/Unit/phpunit.xml @@ -7,17 +7,13 @@ timeoutForLargeTests="900" > <testsuite name='ownCloud - Notifications App Tests'> - <directory suffix='.php'>.</directory> + <directory suffix='Test.php'>.</directory> </testsuite> <!-- filters for code coverage --> <filter> <whitelist> - <directory suffix=".php">../../../notifications</directory> - <exclude> - <directory suffix=".php">../../../notifications/l10n</directory> - <directory suffix=".php">../../../notifications/templates</directory> - <directory suffix=".php">../../../notifications/tests</directory> - </exclude> + <directory suffix=".php">../../../notifications/lib</directory> + <directory suffix=".php">../../../notifications/appinfo</directory> </whitelist> </filter> <logging> |