Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/gallery.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Paroz <github@oparoz.com>2015-09-05 04:24:47 +0300
committerOlivier Paroz <github@oparoz.com>2015-09-05 04:24:47 +0300
commitc051badb88b3ee4419516bc76e63da6d095682eb (patch)
tree1168d35a3f4d298dc240442bdac44d807f1b7a6b /tests/integration
parent06cab3b79141d490cdd586dc9f855f04145919bd (diff)
Simplify ApplicationTest
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/appinfo/ApplicationTest.php73
1 files changed, 19 insertions, 54 deletions
diff --git a/tests/integration/appinfo/ApplicationTest.php b/tests/integration/appinfo/ApplicationTest.php
index 1ec8bdb7..9de923ab 100644
--- a/tests/integration/appinfo/ApplicationTest.php
+++ b/tests/integration/appinfo/ApplicationTest.php
@@ -14,17 +14,6 @@ namespace OCA\Gallery\AppInfo;
use OCA\Gallery\Tests\Integration\GalleryIntegrationTest;
-use OCA\Gallery\Controller\PageController;
-use OCA\Gallery\Controller\ConfigController;
-use OCA\Gallery\Controller\ConfigPublicController;
-use OCA\Gallery\Controller\ConfigApiController;
-use OCA\Gallery\Controller\FilesController;
-use OCA\Gallery\Controller\FilesPublicController;
-use OCA\Gallery\Controller\FilesApiController;
-use OCA\Gallery\Controller\PreviewController;
-use OCA\Gallery\Controller\PreviewPublicController;
-use OCA\Gallery\Controller\PreviewApiController;
-
/**
* Class ApplicationTest
*
@@ -32,52 +21,28 @@ use OCA\Gallery\Controller\PreviewApiController;
*/
class ApplicationTest extends GalleryIntegrationTest {
- public function testConfigController() {
- $controller = $this->container->query(
- 'ConfigController'
- );
-
- $this->assertTrue($controller instanceof ConfigController);
- }
-
- public function testConfigPublicController() {
- $controller = $this->container->query(
- 'ConfigPublicController'
- );
-
- $this->assertTrue($controller instanceof ConfigPublicController);
- }
-
- public function testFilesController() {
- $controller = $this->container->query(
- 'FilesController'
- );
-
- $this->assertTrue($controller instanceof FilesController);
- }
-
- public function testFilesPublicController() {
- $controller = $this->container->query(
- 'FilesPublicController'
- );
-
- $this->assertTrue($controller instanceof FilesPublicController);
+ public function providesServiceData() {
+ return [
+ ['ConfigController', 'OCA\Gallery\Controller\ConfigController'],
+ ['ConfigPublicController', 'OCA\Gallery\Controller\ConfigPublicController'],
+ ['FilesController', 'OCA\Gallery\Controller\FilesController'],
+ ['FilesPublicController', 'OCA\Gallery\Controller\FilesPublicController'],
+ ['PreviewController', 'OCA\Gallery\Controller\PreviewController'],
+ ['PreviewPublicController', 'OCA\Gallery\Controller\PreviewPublicController'],
+ ['L10N', '\OC_L10N']
+ ];
}
- public function testPreviewController() {
- $controller = $this->container->query(
- 'PreviewController'
- );
-
- $this->assertTrue($controller instanceof PreviewController);
- }
-
- public function testPreviewPublicController() {
- $controller = $this->container->query(
- 'PreviewPublicController'
- );
+ /**
+ * @dataProvider providesServiceData
+ *
+ * @param string $registeredService
+ * @param string $expectedClass
+ */
+ public function testContainerQuery($registeredService, $expectedClass) {
+ $service = $this->container->query($registeredService);
- $this->assertTrue($controller instanceof PreviewPublicController);
+ $this->assertTrue($service instanceof $expectedClass);
}
public function testToken() {