diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-25 17:59:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 17:59:01 +0200 |
| commit | 097a9ec8b0f93c2c5e4c56ea9182db2386bd3918 (patch) | |
| tree | 1af0af2a301f88d8f06239705452486422f2df26 | |
| parent | fa4bf7b0b0f42732f4369eec63611e108311d4ce (diff) | |
| parent | 0c637c8d737f4fd6ac3f1af2f3effe8015042e07 (diff) | |
| download | nextcloud-server-097a9ec8b0f93c2c5e4c56ea9182db2386bd3918.tar.gz nextcloud-server-097a9ec8b0f93c2c5e4c56ea9182db2386bd3918.zip | |
Merge pull request #1878 from nextcloud/downstream-25936
Adjust unit tests to upstream
| -rw-r--r-- | tests/Settings/Controller/CheckSetupControllerTest.php | 14 | ||||
| -rw-r--r-- | tests/phpunit-autotest.xml | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index c465ee79ed1..f087fec2105 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -42,23 +42,23 @@ use OC\IntegrityCheck\Checker; * @package Tests\Settings\Controller */ class CheckSetupControllerTest extends TestCase { - /** @var CheckSetupController */ + /** @var CheckSetupController | \PHPUnit_Framework_MockObject_MockObject */ private $checkSetupController; - /** @var IRequest */ + /** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */ private $request; - /** @var IConfig */ + /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ private $config; - /** @var IClientService */ + /** @var IClientService | \PHPUnit_Framework_MockObject_MockObject*/ private $clientService; - /** @var IURLGenerator */ + /** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */ private $urlGenerator; /** @var OC_Util */ private $util; - /** @var IL10N */ + /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ private $l10n; /** @var ILogger */ private $logger; - /** @var Checker */ + /** @var Checker | \PHPUnit_Framework_MockObject_MockObject */ private $checker; public function setUp() { diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 3a82a56ebbf..ba16bbdbaac 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -10,6 +10,7 @@ <directory suffix='.php'>lib/</directory> <directory suffix='.php'>Settings/</directory> <directory suffix='.php'>Core/</directory> + <directory suffix='.php'>ocs-provider/</directory> <file>apps.php</file> </testsuite> <!-- filters for code coverage --> |