Merge pull request #21792 from owncloud/systemtags-managerfactory

Allow custom implementation of system tag managers

3 files changed, 9 insertions, 1 deletions

diff --git a/tests/lib/comments/fakefactory.php b/tests/lib/comments/fakefactory.php
index 837bcb10585..ff8dfd3a259 100644
--- a/tests/lib/comments/fakefactory.php
+++ b/tests/lib/comments/fakefactory.php
@@ -2,11 +2,16 @@
 
 namespace Test\Comments;
 
+use OCP\IServerContainer;
+
 /**
  * Class FakeFactory
  */
 class FakeFactory implements \OCP\Comments\ICommentsManagerFactory {
 
+	public function __construct(IServerContainer $serverContainer) {
+	}
+
 	public function getManager() {
 		return new FakeManager();
 	}
diff --git a/tests/lib/comments/manager.php b/tests/lib/comments/manager.php
index 248de683253..cc2eebb64d1 100644
--- a/tests/lib/comments/manager.php
+++ b/tests/lib/comments/manager.php
@@ -50,7 +50,7 @@ class Test_Comments_Manager extends TestCase
 	}
 
 	protected function getManager() {
-		$factory = new \OC\Comments\ManagerFactory();
+		$factory = new \OC\Comments\ManagerFactory(\OC::$server);
 		return $factory->getManager();
 	}
 
diff --git a/tests/lib/server.php b/tests/lib/server.php
index 44e1aac5cce..684e6a97361 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -155,6 +155,9 @@ class Server extends \Test\TestCase {
 			['TempManager', '\OC\TempManager'],
 			['TempManager', '\OCP\ITempManager'],
 			['TrustedDomainHelper', '\OC\Security\TrustedDomainHelper'],
+
+			['SystemTagManager', '\OCP\SystemTag\ISystemTagManager'],
+			['SystemTagObjectMapper', '\OCP\SystemTag\ISystemTagObjectMapper'],
 		];
 	}