diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-22 13:04:56 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-08-10 10:45:16 +0200 |
| commit | f0b617b50825566ec1b417eed09688e88de5f0bb (patch) | |
| tree | d7d009ba3d197dd78ff16e83543bba991dbe250f /tests | |
| parent | c80c9819dcc1a4c79b5c2621a3ec07623e1cd140 (diff) | |
| download | nextcloud-server-f0b617b50825566ec1b417eed09688e88de5f0bb.tar.gz nextcloud-server-f0b617b50825566ec1b417eed09688e88de5f0bb.zip | |
Use DI
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/capabilitiesmanager.php | 31 | ||||
| -rw-r--r-- | tests/lib/server.php | 2 |
2 files changed, 15 insertions, 18 deletions
diff --git a/tests/lib/capabilitiesmanager.php b/tests/lib/capabilitiesmanager.php index 738715344e0..b5dac80ee51 100644 --- a/tests/lib/capabilitiesmanager.php +++ b/tests/lib/capabilitiesmanager.php @@ -70,18 +70,14 @@ class CapabilitiesManagerTest extends TestCase { public function testMergedCapabilities() { $manager = new \OC\CapabilitiesManager(); - $simple1 = new SimpleCapability(); - $simple2 = new SimpleCapability2(); - $simple3 = new SimpleCapability3(); - - $manager->registerCapability(function() use ($simple1) { - return $simple1; + $manager->registerCapability(function() { + return new SimpleCapability(); }); - $manager->registerCapability(function() use ($simple2) { - return $simple2; + $manager->registerCapability(function() { + return new SimpleCapability2(); }); - $manager->registerCapability(function() use ($simple3) { - return $simple3; + $manager->registerCapability(function() { + return new SimpleCapability3(); }); $res = $manager->getCapabilities(); @@ -146,6 +142,14 @@ class SimpleCapability3 implements \OCP\Capabilities\ICapability { } } +class NoCapability { + public function getCapabilities() { + return [ + 'baz' => 'z' + ]; + } +} + class DeepCapability implements \OCP\Capabilities\ICapability { public function getCapabilities() { return [ @@ -158,10 +162,3 @@ class DeepCapability implements \OCP\Capabilities\ICapability { } } -class NoCapability { - public function getCapabilities() { - return [ - 'baz' => 'z' - ]; - } -} diff --git a/tests/lib/server.php b/tests/lib/server.php index 1eb91173deb..9c5c83ceb5c 100644 --- a/tests/lib/server.php +++ b/tests/lib/server.php @@ -51,7 +51,7 @@ class Server extends \Test\TestCase { ['AvatarManager', '\OC\AvatarManager'], ['AvatarManager', '\OCP\IAvatarManager'], - ['CapabilitiesManager', '\OCP\Capabilities\IManager'], + ['CapabilitiesManager', '\OC\CapabilitiesManager'], ['ContactsManager', '\OC\ContactsManager'], ['ContactsManager', '\OCP\Contacts\IManager'], ['Crypto', '\OC\Security\Crypto'], |