mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unit tests

This commit is contained in:
Roeland Jago Douma 2016-02-04 12:07:25 +01:00 committed by Björn Schießle
parent 33c3f75dde
commit fad85ad19f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/lib/app.php
View File

@ -312,6 +312,7 @@ class Test_App extends \Test\TestCase {
'appforgroup1',
'appforgroup12',
'dav',
'federatedfilesharing',
),
false
),
@ -325,6 +326,7 @@ class Test_App extends \Test\TestCase {
'appforgroup12',
'appforgroup2',
'dav',
'federatedfilesharing',
),
false
),
@ -339,6 +341,7 @@ class Test_App extends \Test\TestCase {
'appforgroup12',
'appforgroup2',
'dav',
'federatedfilesharing',
),
false
),
@ -353,6 +356,7 @@ class Test_App extends \Test\TestCase {
'appforgroup12',
'appforgroup2',
'dav',
'federatedfilesharing',
),
false,
),
@ -367,6 +371,7 @@ class Test_App extends \Test\TestCase {
'appforgroup12',
'appforgroup2',
'dav',
'federatedfilesharing',
),
true,
),
@ -444,11 +449,11 @@ class Test_App extends \Test\TestCase {
);
$apps = \OC_App::getEnabledApps(true);
$this->assertEquals(array('files', 'app3', 'dav'), $apps);
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing',), $apps);
// mock should not be called again here
$apps = \OC_App::getEnabledApps(false);
$this->assertEquals(array('files', 'app3', 'dav'), $apps);
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing',), $apps);
$this->restoreAppConfig();
\OC_User::setUserId(null);

6
tests/lib/app/manager.php
View File

@ -282,7 +282,7 @@ class Manager extends TestCase {
$this->appConfig->setValue('test1', 'enabled', 'yes');
$this->appConfig->setValue('test2', 'enabled', 'no');
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
$this->assertEquals(['dav', 'files', 'test1', 'test3'], $this->manager->getInstalledApps());
$this->assertEquals(['dav', 'federatedfilesharing', 'files', 'test1', 'test3'], $this->manager->getInstalledApps());
}
public function testGetAppsForUser() {
@ -296,7 +296,7 @@ class Manager extends TestCase {
$this->appConfig->setValue('test2', 'enabled', 'no');
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
$this->appConfig->setValue('test4', 'enabled', '["asd"]');
$this->assertEquals(['dav', 'files', 'test1', 'test3'], $this->manager->getEnabledAppsForUser($user));
$this->assertEquals(['dav', 'federatedfilesharing', 'files', 'test1', 'test3'], $this->manager->getEnabledAppsForUser($user));
}
public function testGetAppsNeedingUpgrade() {
@ -308,6 +308,7 @@ class Manager extends TestCase {
$appInfos = [
'dav' => ['id' => 'dav'],
'files' => ['id' => 'files'],
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '9.0.0'],
'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
@ -348,6 +349,7 @@ class Manager extends TestCase {
$appInfos = [
'dav' => ['id' => 'dav'],
'files' => ['id' => 'files'],
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '8.0.0'],
'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],