Fix manager creation and testing

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/Comments/ManagerFactory.php b/lib/private/Comments/ManagerFactory.php
index 44edf32cf9c39330bd792318924c2f1253abb04f..a5ac2d6554541fb1f0ad8f713261e5d7cd2bcc67 100644 (file)
--- a/lib/private/Comments/ManagerFactory.php
+++ b/lib/private/Comments/ManagerFactory.php
@@ -56,11 +56,6 @@ class ManagerFactory implements ICommentsManagerFactory {
         * @since 9.0.0
         */
        public function getManager() {
-               return new Manager(
-                       $this->serverContainer->getDatabaseConnection(),
-                       $this->serverContainer->get(LoggerInterface::class),
-                       $this->serverContainer->getConfig(),
-                       $this->serverContainer->get(IInitialStateService::class)
-               );
+               return $this->serverContainer->get(Manager::class);
        }
 }

diff --git a/tests/lib/Comments/FakeManager.php b/tests/lib/Comments/FakeManager.php
index 91c8d4b7d587e41772358d696cdad502c407db5b..29fb393436209441c7d570338c925ba62eb7ab78 100644 (file)
--- a/tests/lib/Comments/FakeManager.php
+++ b/tests/lib/Comments/FakeManager.php
@@ -30,7 +30,8 @@ class FakeManager implements ICommentsManager {
                string $objectId,
                int $lastKnownCommentId,
                string $sortDirection = 'asc',
-               int $limit = 30
+               int $limit = 30,
+               bool $includeLastKnown = false
        ): array {
                return [];
        }
@@ -86,4 +87,20 @@ class FakeManager implements ICommentsManager {
 
        public function load(): void {
        }
+
+       public function searchForObjects(string $search, string $objectType, array $objectIds, string $verb, int $offset, int $limit = 50): array {
+               return [];
+       }
+
+       public function getNumberOfCommentsForObjectSinceComment(string $objectType, string $objectId, int $lastRead, string $verb = ''): int {
+               return 0;
+       }
+
+       public function getLastCommentBeforeDate(string $objectType, string $objectId, \DateTime $beforeDate, string $verb = ''): int {
+               return 0;
+       }
+
+       public function getLastCommentDateByActor(string $objectType, string $objectId, string $verb, string $actorType, array $actors): array {
+               return [];
+       }
 }

diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php
index def00fd0dcc011474d4fdfd369e3f830e05b9e2a..a75330625766975c4958fcba2331d14a5c457cf1 100644 (file)
--- a/tests/lib/Comments/ManagerTest.php
+++ b/tests/lib/Comments/ManagerTest.php
@@ -3,13 +3,18 @@
 namespace Test\Comments;
 
 use OC\Comments\Comment;
+use OC\Comments\Manager;
 use OC\Comments\ManagerFactory;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsEventHandler;
 use OCP\Comments\ICommentsManager;
 use OCP\Comments\NotFoundException;
+use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\IInitialStateService;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 /**
@@ -63,8 +68,13 @@ class ManagerTest extends TestCase {
        }
 
        protected function getManager() {
-               $factory = new ManagerFactory(\OC::$server);
-               return $factory->getManager();
+               return new Manager(
+                       $this->connection,
+                       $this->createMock(LoggerInterface::class),
+                       $this->createMock(IConfig::class),
+                       $this->createMock(ITimeFactory::class),
+                       $this->createMock(IInitialStateService::class)
+               );
        }