fix tests

4 files changed, 21 insertions, 43 deletions

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 6c2fdc2..6827f5d 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -29,27 +29,16 @@ use OCP\IRequest;
 
 class PageController extends Controller
 {
-    /** @var FileOperationService */
-    protected $service;
-
-    /** @var int */
-    private $userId;
 
     /**
      * @param string   $appName
      * @param IRequest $request
-     * @param FileOperationService $service
-     * @param string   $userId
      */
     public function __construct(
         $appName,
-        IRequest $request,
-        FileOperationService $service,
-        $userId
+        IRequest $request
     ) {
         parent::__construct($appName, $request);
-        $this->service = $service;
-        $this->userId = $userId;
     }
 
     /**
diff --git a/tests/Unit/BackgroundJob/CleanUpJobTest.php b/tests/Unit/BackgroundJob/CleanUpJobTest.php
index d5018c2..4b41370 100644
--- a/tests/Unit/BackgroundJob/CleanUpJobTest.php
+++ b/tests/Unit/BackgroundJob/CleanUpJobTest.php
@@ -23,6 +23,7 @@ namespace OCA\RansomwareDetection\tests\Unit\BackgroundJob;
 
 use OCA\RansomwareDetection\BackgroundJob\CleanUpJob;
 use OCA\RansomwareDetection\Db\FileOperationMapper;
+use OCA\RansomwareDetection\Db\RecoveredFileOperationMapper;
 use OCA\RansomwareDetection\Service\FileOperationService;
 use OCA\RansomwareDetection\Tests\Unit\Db\MapperTestUtility;
 use OCP\IConfig;
@@ -46,8 +47,12 @@ class CleanUpJobTest extends MapperTestUtility
             ->setMethods(['deleteFileOperationsBefore'])
             ->setConstructorArgs([$this->db])
             ->getMock();
+        $recoveredFileOperationMapper = $this->getMockBuilder(RecoveredFileOperationMapper::class)
+            ->setMethods(['deleteFileOperationsBefore'])
+            ->setConstructorArgs([$this->db])
+            ->getMock();
         $this->fileOperationService = $this->getMockBuilder(FileOperationService::class)
-            ->setConstructorArgs([$fileOperationMapper, 'john'])
+            ->setConstructorArgs([$fileOperationMapper, $recoveredFileOperationMapper, 'john'])
             ->getMock();
         $this->config = $this->createMock(IConfig::class);
         $this->cleanUpJob = new CleanUpJob($this->fileOperationService, $this->config);
diff --git a/tests/Unit/Controller/RecoverControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
index 9be4ef5..0dc0dfb 100644
--- a/tests/Unit/Controller/RecoverControllerTest.php
+++ b/tests/Unit/Controller/PageControllerTest.php
@@ -21,28 +21,27 @@
 
 namespace OCA\RansomwareDetection\tests\Unit\Controller;
 
-use OCA\RansomwareDetection\Controller\RecoverController;
+use OCA\RansomwareDetection\Controller\PageController;
+use OCA\RansomwareDetection\Db\FileOperationMapper;
+use OCA\RansomwareDetection\Db\RecoveredFileOperationMapper;
+use OCA\RansomwareDetection\Service\FileOperationService;
 use OCP\AppFramework\Http\TemplateResponse;
 use Test\TestCase;
 
-class RecoverControllerTest extends TestCase
+class PageControllerTest extends TestCase
 {
     /** @var RecoverController */
     protected $controller;
 
-    /** @var string */
-    private $userId = 'john';
-
     public function setUp(): void
     {
         parent::setUp();
 
         $request = $this->getMockBuilder('OCP\IRequest')->getMock();
 
-        $this->controller = new RecoverController(
+        $this->controller = new PageController(
             'ransomware_detection',
-            $request,
-            $this->userId
+            $request
         );
     }
 
diff --git a/tests/Unit/Controller/BasicControllerTest.php b/tests/Unit/Controller/SettingsControllerTest.php
index 8d5bc15..7ebff04 100644
--- a/tests/Unit/Controller/BasicControllerTest.php
+++ b/tests/Unit/Controller/SettingsControllerTest.php
@@ -21,14 +21,14 @@
 
 namespace OCA\RansomwareDetection\tests\Unit\Controller;
 
-use OCA\RansomwareDetection\Controller\BasicController;
+use OCA\RansomwareDetection\Controller\SettingsController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use Test\TestCase;
 
-class BasicControllerTest extends TestCase
+class SettingsControllerTest extends TestCase
 {
     /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
     protected $request;
@@ -54,9 +54,9 @@ class BasicControllerTest extends TestCase
             ->getMock();
     }
 
-    public function testGetDebugMode()
+    public function testGetSettings()
     {
-        $controller = new BasicController(
+        $controller = new SettingsController(
             'ransomware_detection',
             $this->request,
             $this->userSession,
@@ -64,29 +64,14 @@ class BasicControllerTest extends TestCase
             'john'
         );
 
-        $result = $controller->getDebugMode();
-        $this->assertTrue($result instanceof JSONResponse);
-        $this->assertEquals($result->getStatus(), Http::STATUS_ACCEPTED);
-    }
-
-    public function testGetColorMode()
-    {
-        $controller = new BasicController(
-            'ransomware_detection',
-            $this->request,
-            $this->userSession,
-            $this->config,
-            'john'
-        );
-
-        $result = $controller->getColorMode();
+        $result = $controller->findAll();
         $this->assertTrue($result instanceof JSONResponse);
         $this->assertEquals($result->getStatus(), Http::STATUS_ACCEPTED);
     }
 
     public function testChangeColorMode()
     {
-        $controller = new BasicController(
+        $controller = new SettingsController(
             'ransomware_detection',
             $this->request,
             $this->userSession,
@@ -94,7 +79,7 @@ class BasicControllerTest extends TestCase
             'john'
         );
 
-        $result = $controller->changeColorMode(1);
+        $result = $controller->update(1, 0);
         $this->assertTrue($result instanceof JSONResponse);
         $this->assertEquals($result->getStatus(), Http::STATUS_ACCEPTED);
     }