From 7d80b5ec31375c20bf15136b2a948a44c4d54a28 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Fri, 17 Mar 2017 11:18:32 +0100
Subject: [PATCH] unit test

---
 core/Controllers/DocserverController.php     |  10 +-
 core/Controllers/DocserverTypeController.php |  94 +++++------
 core/Controllers/ResController.php           |   4 +-
 core/Models/DocserverModelAbstract.php       |  28 +---
 core/Models/DocserverTypeModelAbstract.php   |  24 +--
 core/Test/DocserverControllerTest.php        |  70 ++++----
 core/Test/DocserverTypeControllerTest.php    | 168 +++++++++++--------
 7 files changed, 197 insertions(+), 201 deletions(-)

diff --git a/core/Controllers/DocserverController.php b/core/Controllers/DocserverController.php
index bbb638e3436..a7e19e55195 100644
--- a/core/Controllers/DocserverController.php
+++ b/core/Controllers/DocserverController.php
@@ -35,15 +35,15 @@ class DocserverController
 
     public function getById(RequestInterface $request, ResponseInterface $response, $aArgs)
     {
-        if (isset($aArgs['id'])) {
-            $id = $aArgs['id'];
+        if (isset($aArgs['docserver_id'])) {
+            $id = $aArgs['docserver_id'];
             $obj = DocserverModel::getById([
-                'id' => $id
+                'docserver_id' => $id
             ]);
         } else {
             return $response
                 ->withStatus(500)
-                ->withJson(['errors' => _ID . ' ' . _IS_EMPTY]);
+                ->withJson(['errors' => _DOCSERVER_ID . ' ' . _IS_EMPTY]);
         }
         
         $datas = [
@@ -593,7 +593,7 @@ class DocserverController
 
         $docserverTypeControler = new \Core\Models\DocserverTypeModel();
         $docserverTypeObject = $docserverTypeControler->getById(
-            ['id' => $docserver['docserver_type_id']]
+            ['docserver_type_id' => $docserver['docserver_type_id']]
         );
 
         $docserverTypeObject = $docserverTypeObject[0];
diff --git a/core/Controllers/DocserverTypeController.php b/core/Controllers/DocserverTypeController.php
index 0f0c7c550ab..623c50104aa 100644
--- a/core/Controllers/DocserverTypeController.php
+++ b/core/Controllers/DocserverTypeController.php
@@ -37,15 +37,15 @@ class DocserverTypeController
 
     public function getById(RequestInterface $request, ResponseInterface $response, $aArgs)
     {
-        if (isset($aArgs['id'])) {
-            $id = $aArgs['id'];
+        if (isset($aArgs['docserver_type_id'])) {
+            $id = $aArgs['docserver_type_id'];
             $obj = DocserverTypeModel::getById([
-                'id' => $id
+                'docserver_type_id' => $id
             ]);
         } else {
             return $response
                 ->withStatus(500)
-                ->withJson(['errors' => _ID . ' ' . _IS_EMPTY]);
+                ->withJson(['errors' => _DOCSERVER_TYPE_ID . ' ' . _IS_EMPTY]);
         }
         
         $datas = [
@@ -74,9 +74,9 @@ class DocserverTypeController
         $return = DocserverTypeModel::create($aArgs);
 
         if ($return) {
-            $id = $aArgs['id'];
+            $id = $aArgs['docserver_type_id'];
             $obj = DocserverTypeModel::getById([
-                'id' => $id
+                'docserver_type_id' => $id
             ]);
         } else {
             return $response
@@ -110,9 +110,9 @@ class DocserverTypeController
         $return = DocserverTypeModel::update($aArgs);
 
         if ($return) {
-            $id = $aArgs['id'];
+            $id = $aArgs['docserver_type_id'];
             $obj = DocserverTypeModel::getById([
-                'id' => $id
+                'docserver_type_id' => $id
             ]);
         } else {
             return $response
@@ -131,10 +131,10 @@ class DocserverTypeController
 
     public function delete(RequestInterface $request, ResponseInterface $response, $aArgs)
     {
-        if (isset($aArgs['id'])) {
-            $id = $aArgs['id'];
+        if (isset($aArgs['docserver_type_id'])) {
+            $id = $aArgs['docserver_type_id'];
             $obj = DocserverTypeModel::delete([
-                'id' => $id
+                'docserver_type_id' => $id
             ]);
         } else {
             return $response
@@ -157,94 +157,86 @@ class DocserverTypeController
 
         if ($mode == 'update') {
             $obj = DocserverTypeModel::getById([
-                'id' => $request->getParam('id')
+                'docserver_type_id' => $request->getParam('docserver_type_id')
             ]);
             if (empty($obj)) {
                 array_push(
                     $errors,
-                    _ID . ' ' . $request->getParam('id') . ' ' . _NOT_EXISTS
+                    _DOCSERVER_TYPE_ID . ' ' . $request->getParam('docserver_type_id') . ' ' . _NOT_EXISTS
                 );
             }
         }
 
-        if (!Validator::notEmpty()->validate($request->getParam('id'))) {
-            array_push($errors, _ID . ' ' . _IS_EMPTY);
+        if (!Validator::notEmpty()->validate($request->getParam('docserver_type_id'))) {
+            array_push($errors, _DOCSERVER_TYPE_ID . ' ' . _IS_EMPTY);
         } elseif ($mode == 'create') {
             $obj = DocserverTypeModel::getById([
-                'id' => $request->getParam('id')
+                'docserver_type_id' => $request->getParam('docserver_type_id')
             ]);
             if (!empty($obj)) {
                 array_push(
                     $errors,
-                    _ID . ' ' . $obj[0]['id'] . ' ' . _ALREADY_EXISTS
+                    _DOCSERVER_TYPE_ID . ' ' . $obj[0]['docserver_type_id'] . ' ' . _ALREADY_EXISTS
                 );
             }
         }
 
-        if (!Validator::regex('/^[\w.-]*$/')->validate($request->getParam('id'))) {
-            array_push($errors, _ID . ' ' . _NOT . ' ' . _VALID);
+        if (!Validator::regex('/^[\w.-]*$/')->validate($request->getParam('docserver_type_id'))) {
+            array_push($errors, _DOCSERVER_TYPE_ID . ' ' . _NOT . ' ' . _VALID);
         }
 
-        if (!Validator::notEmpty()->validate($request->getParam('label_status'))) {
-            array_push($errors, _LABEL_STATUS . ' ' . _IS_EMPTY);
+        if (!Validator::notEmpty()->validate($request->getParam('docserver_type_label'))) {
+            array_push($errors, _DOCSERVER_TYPE_LABEL . ' ' . _IS_EMPTY);
         }
 
         if (Validator::notEmpty()
-                ->validate($request->getParam('is_system')) &&
+                ->validate($request->getParam('is_container')) &&
             !Validator::contains('Y')
-                ->validate($request->getParam('is_system')) &&
+                ->validate($request->getParam('is_container')) &&
             !Validator::contains('N')
-                ->validate($request->getParam('is_system'))
+                ->validate($request->getParam('is_container'))
         ) {
-            array_push($errors, _IS_SYSTEM . ' ' . _NOT . ' ' . _VALID);
+            array_push($errors, _IS_CONTAINER . ' ' . _NOT . ' ' . _VALID);
         }
 
         if (Validator::notEmpty()
-                ->validate($request->getParam('is_folder_status')) &&
+                ->validate($request->getParam('is_compressed')) &&
             !Validator::contains('Y')
-                ->validate($request->getParam('is_folder_status')) &&
+                ->validate($request->getParam('is_compressed')) &&
             !Validator::contains('N')
-                ->validate($request->getParam('is_folder_status'))
+                ->validate($request->getParam('is_compressed'))
         ) {
-            array_push($errors, _IS_FOLDER_STATUS . ' ' . _NOT . ' ' . _VALID);
+            array_push($errors, _IS_COMPRESSED . ' ' . _NOT . ' ' . _VALID);
         }
 
         if (Validator::notEmpty()
-                ->validate($request->getParam('img_filename')) &&
-            (!Validator::regex('/^[\w-.]+$/')
-                ->validate($request->getParam('img_filename')) ||
-            !Validator::length(null, 255)
-                ->validate($request->getParam('img_filename')))
-        ) {
-            array_push($errors, _IMG_FILENAME . ' ' . _NOT . ' ' . _VALID);
-        }
-
-        if (Validator::notEmpty()
-                ->validate($request->getParam('maarch_module')) &&
-            !Validator::length(null, 255)
-                ->validate($request->getParam('maarch_module'))
+                ->validate($request->getParam('is_meta')) &&
+            !Validator::contains('Y')
+                ->validate($request->getParam('is_meta')) &&
+            !Validator::contains('N')
+                ->validate($request->getParam('is_meta'))
         ) {
-            array_push($errors, _MAARCH_MODULE . ' ' . _NOT . ' ' . _VALID);
+            array_push($errors, _IS_META . ' ' . _NOT . ' ' . _VALID);
         }
 
         if (Validator::notEmpty()
-                ->validate($request->getParam('can_be_searched')) &&
+                ->validate($request->getParam('is_logged')) &&
             !Validator::contains('Y')
-                ->validate($request->getParam('can_be_searched')) &&
+                ->validate($request->getParam('is_logged')) &&
             !Validator::contains('N')
-                ->validate($request->getParam('can_be_searched'))
+                ->validate($request->getParam('is_logged'))
         ) {
-            array_push($errors, _CAN_BE_SEARCHED . ' ' . _NOT . ' ' . _VALID);
+            array_push($errors, _IS_LOGGED . ' ' . _NOT . ' ' . _VALID);
         }
 
         if (Validator::notEmpty()
-                ->validate($request->getParam('can_be_modified')) &&
+                ->validate($request->getParam('is_signed')) &&
             !Validator::contains('Y')
-                ->validate($request->getParam('can_be_modified')) &&
+                ->validate($request->getParam('is_signed')) &&
             !Validator::contains('N')
-                ->validate($request->getParam('can_be_modified'))
+                ->validate($request->getParam('is_signed'))
         ) {
-            array_push($errors, _CAN_BE_MODIFIED . ' ' . _NOT . ' ' . _VALID);
+            array_push($errors, _IS_SIGNED . ' ' . _NOT . ' ' . _VALID);
         }
 
         return $errors;
diff --git a/core/Controllers/ResController.php b/core/Controllers/ResController.php
index d6b754b066a..aad54b0be22 100644
--- a/core/Controllers/ResController.php
+++ b/core/Controllers/ResController.php
@@ -275,10 +275,10 @@ class ResController
         $filetmp .= $filename;
         
         $docserver = DocserverModel::getById([
-            'id' => $docserverId
+            'docserver_id' => $docserverId
         ]);
         $docserverType = DocserverTypeModel::getById([
-            'id' => $docserver[0]['docserver_type_id']
+            'docserver_type_id' => $docserver[0]['docserver_type_id']
         ]);
 
         $fingerprint = DocserverToolsController::doFingerprint(
diff --git a/core/Models/DocserverModelAbstract.php b/core/Models/DocserverModelAbstract.php
index d6971fdc241..d39a77d6b19 100644
--- a/core/Models/DocserverModelAbstract.php
+++ b/core/Models/DocserverModelAbstract.php
@@ -31,14 +31,14 @@ class DocserverModelAbstract extends \Apps_Table_Service
 
     public static function getById(array $aArgs = [])
     {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
+        static::checkRequired($aArgs, ['docserver_id']);
+        static::checkString($aArgs, ['docserver_id']);
 
         $aReturn = static::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
             'table'     => ['docservers'],
             'where'     => ['docserver_id = ?'],
-            'data'      => [$aArgs['id']]
+            'data'      => [$aArgs['docserver_id']]
         ]);
 
         return $aReturn;
@@ -72,12 +72,12 @@ class DocserverModelAbstract extends \Apps_Table_Service
 
     public static function delete(array $aArgs = [])
     {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
+        static::checkRequired($aArgs, ['docserver_id']);
+        static::checkString($aArgs, ['docserver_id']);
 
         $aReturn = static::deleteFrom([
                 'table' => 'docservers',
-                'where' => ['id = ?'],
+                'where' => ['docserver_id = ?'],
                 'data'  => [$aArgs['id']]
             ]);
 
@@ -100,20 +100,4 @@ class DocserverModelAbstract extends \Apps_Table_Service
 
         return $aReturn;
     }
-
-    public static function setSize(array $aArgs = [])
-    {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
-
-        $where['id'] = $aArgs['id'];
-
-        $aReturn = static::updateTable(
-            $aArgs,
-            'docservers',
-            $where
-        );
-
-        return $aReturn;
-    }
 }
diff --git a/core/Models/DocserverTypeModelAbstract.php b/core/Models/DocserverTypeModelAbstract.php
index 5be79667fee..2dd223fede4 100644
--- a/core/Models/DocserverTypeModelAbstract.php
+++ b/core/Models/DocserverTypeModelAbstract.php
@@ -31,14 +31,14 @@ class DocserverTypeModelAbstract extends \Apps_Table_Service
 
     public static function getById(array $aArgs = [])
     {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
+        static::checkRequired($aArgs, ['docserver_type_id']);
+        static::checkString($aArgs, ['docserver_type_id']);
 
         $aReturn = static::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
             'table'     => ['docserver_types'],
             'where'     => ['docserver_type_id = ?'],
-            'data'      => [$aArgs['id']]
+            'data'      => [$aArgs['docserver_type_id']]
         ]);
 
         return $aReturn;
@@ -46,8 +46,8 @@ class DocserverTypeModelAbstract extends \Apps_Table_Service
 
     public static function create(array $aArgs = [])
     {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
+        static::checkRequired($aArgs, ['docserver_type_id']);
+        static::checkString($aArgs, ['docserver_type_id']);
 
         $aReturn = static::insertInto($aArgs, 'docserver_types');
 
@@ -56,10 +56,10 @@ class DocserverTypeModelAbstract extends \Apps_Table_Service
 
     public static function update(array $aArgs = [])
     {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
+        static::checkRequired($aArgs, ['docserver_type_id']);
+        static::checkString($aArgs, ['docserver_type_id']);
 
-        $where['id'] = $aArgs['id'];
+        $where['docserver_type_id'] = $aArgs['docserver_type_id'];
 
         $aReturn = static::updateTable(
             $aArgs,
@@ -72,13 +72,13 @@ class DocserverTypeModelAbstract extends \Apps_Table_Service
 
     public static function delete(array $aArgs = [])
     {
-        static::checkRequired($aArgs, ['id']);
-        static::checkString($aArgs, ['id']);
+        static::checkRequired($aArgs, ['docserver_type_id']);
+        static::checkString($aArgs, ['docserver_type_id']);
 
         $aReturn = static::deleteFrom([
                 'table' => 'docserver_types',
-                'where' => ['id = ?'],
-                'data'  => [$aArgs['id']]
+                'where' => ['docserver_type_id = ?'],
+                'data'  => [$aArgs['docserver_type_id']]
             ]);
 
         return $aReturn;
diff --git a/core/Test/DocserverControllerTest.php b/core/Test/DocserverControllerTest.php
index 485654c4008..0331349f123 100644
--- a/core/Test/DocserverControllerTest.php
+++ b/core/Test/DocserverControllerTest.php
@@ -13,49 +13,49 @@ require_once __DIR__.'/define.php';
 
 class DocserverControllerTest extends \PHPUnit_Framework_TestCase
 {
-    // public function testGetList()
-    // {
-    //     $action = new \Core\Controllers\DocserverController();
+    public function testGetList()
+    {
+        $action = new \Core\Controllers\DocserverController();
 
-    //     $environment = \Slim\Http\Environment::mock(
-    //         [
-    //             'REQUEST_METHOD' => 'GET',
-    //             //'REQUEST_URI' => '/status',
-    //             //'QUERY_STRING'=>'foo=bar',
-    //         ]
-    //     );
+        $environment = \Slim\Http\Environment::mock(
+            [
+                'REQUEST_METHOD' => 'GET',
+                //'REQUEST_URI' => '/status',
+                //'QUERY_STRING'=>'foo=bar',
+            ]
+        );
 
-    //     $request = \Slim\Http\Request::createFromEnvironment($environment);
-    //     $response = new \Slim\Http\Response();
-    //     $response = $action->getList($request, $response, []);
+        $request = \Slim\Http\Request::createFromEnvironment($environment);
+        $response = new \Slim\Http\Response();
+        $response = $action->getList($request, $response, []);
 
-    //     $this->assertNotNull((string)$response->getBody());
-    // }
+        $this->assertNotNull((string)$response->getBody());
+    }
 
-    // public function testGetById()
-    // {
-    //     $action = new \Core\Controllers\DocserverController();
+    public function testGetById()
+    {
+        $action = new \Core\Controllers\DocserverController();
 
-    //     $environment = \Slim\Http\Environment::mock(
-    //         [
-    //             'REQUEST_METHOD' => 'GET',
-    //         ]
-    //     );
+        $environment = \Slim\Http\Environment::mock(
+            [
+                'REQUEST_METHOD' => 'GET',
+            ]
+        );
 
-    //     $aArgs = [
-    //         'id'=> 'NEW'
-    //     ];
+        $aArgs = [
+            'docserver_id'=> 'NEW'
+        ];
 
-    //     $request = \Slim\Http\Request::createFromEnvironment($environment);
-    //     $response = new \Slim\Http\Response();
-    //     $response = $action->getById($request, $response, $aArgs);
-    //     $compare = '[{"status":[{"id":"NEW","label_status":"Nouveau",'
-    //         . '"is_system":"Y","is_folder_status":"N","img_filename":'
-    //         . '"fm-letter-status-new","maarch_module":"apps",'
-    //         . '"can_be_searched":"Y","can_be_modified":"Y"}]}]';
+        $request = \Slim\Http\Request::createFromEnvironment($environment);
+        $response = new \Slim\Http\Response();
+        $response = $action->getById($request, $response, $aArgs);
+        $compare = '[{"status":[{"id":"NEW","label_status":"Nouveau",'
+            . '"is_system":"Y","is_folder_status":"N","img_filename":'
+            . '"fm-letter-status-new","maarch_module":"apps",'
+            . '"can_be_searched":"Y","can_be_modified":"Y"}]}]';
 
-    //     $this->assertSame((string)$response->getBody(), $compare);
-    // }
+        $this->assertSame((string)$response->getBody(), $compare);
+    }
 
     // public function testCreate()
     // {
diff --git a/core/Test/DocserverTypeControllerTest.php b/core/Test/DocserverTypeControllerTest.php
index 8a891ce8f2b..3eb82641826 100644
--- a/core/Test/DocserverTypeControllerTest.php
+++ b/core/Test/DocserverTypeControllerTest.php
@@ -43,7 +43,7 @@ class DocserverTypeControllerTest extends \PHPUnit_Framework_TestCase
         );
 
         $aArgs = [
-            'id'=> 'FASTHD'
+            'docserver_type_id'=> 'FASTHD'
         ];
 
         $request = \Slim\Http\Request::createFromEnvironment($environment);
@@ -60,84 +60,104 @@ class DocserverTypeControllerTest extends \PHPUnit_Framework_TestCase
         $this->assertSame((string)$response->getBody(), $compare);
     }
 
-    // public function testCreate()
-    // {
-    //     $action = new \Core\Controllers\DocserverTypeController();
+    public function testCreate()
+    {
+        $action = new \Core\Controllers\DocserverTypeController();
 
-    //     $query  = 'id=TEST&';
-    //     $query .= 'label_status=TEST';
+        $query  = 'docserver_type_id=TEST&';
+        $query .= 'docserver_type_label=TEST&';
+        $query .= 'enabled=Y&';
+        $query .= 'is_container=N&';
+        $query .= 'is_compressed=N&';
+        $query .= 'is_meta=N&';
+        $query .= 'is_logged=N&';
+        $query .= 'is_signed=N&';
+        $query .= 'fingerprint_mode=SHA256';
 
-    //     $environment = \Slim\Http\Environment::mock(
-    //         [
-    //             'REQUEST_METHOD' => 'POST',
-    //             'QUERY_STRING'=> $query,
-    //         ]
-    //     );
+        $environment = \Slim\Http\Environment::mock(
+            [
+                'REQUEST_METHOD' => 'POST',
+                'QUERY_STRING'=> $query,
+            ]
+        );
         
-    //     $aArgs = [
-    //         'id'=> 'NEW'
-    //     ];
-
-    //     $request = \Slim\Http\Request::createFromEnvironment($environment);
-    //     $response = new \Slim\Http\Response();
-    //     $response = $action->create($request, $response, $aArgs);
-
-    //     $compare = '[{"docserverType":[{"id":"TEST","label_status":"TEST",'
-    //         . '"is_system":"Y","is_folder_status":"N","img_filename":null,'
-    //         . '"maarch_module":"apps","can_be_searched":"Y",'
-    //         . '"can_be_modified":"Y"}]}]';
+        $aArgs = [
+            'docserver_type_id'=> 'TEST'
+        ];
+
+        $request = \Slim\Http\Request::createFromEnvironment($environment);
+        $response = new \Slim\Http\Response();
+        $response = $action->create($request, $response, $aArgs);
+
+        $compare = '[{"DocserverType":[{"docserver_type_id":"TEST",'
+            . '"docserver_type_label":"TEST","enabled":"Y",'
+            . '"is_container":"N","container_max_number":0,'
+            . '"is_compressed":"N","compression_mode":null,'
+            . '"is_meta":"N","meta_template":null,'
+            . '"is_logged":"N","log_template":null,'
+            . '"is_signed":"N","fingerprint_mode":"SHA256"}]}]';
         
-    //     $this->assertSame((string)$response->getBody(), $compare);
-    // }
-
-    // public function testUpdate()
-    // {
-    //     $action = new \Core\Controllers\DocserverTypeController();
-
-    //     $query  = 'id=TEST&';
-    //     $query .= 'label_status=TEST AFTER UP';
-
-    //     $environment = \Slim\Http\Environment::mock(
-    //         [
-    //             'REQUEST_METHOD' => 'PUT',
-    //             'QUERY_STRING'=> $query,
-    //         ]
-    //     );
+        $this->assertSame((string)$response->getBody(), $compare);
+    }
+
+    public function testUpdate()
+    {
+        $action = new \Core\Controllers\DocserverTypeController();
+
+        $query  = 'docserver_type_id=TEST&';
+        $query .= 'docserver_type_label=TEST&';
+        $query .= 'enabled=Y&';
+        $query .= 'is_container=N&';
+        $query .= 'is_compressed=N&';
+        $query .= 'is_meta=N&';
+        $query .= 'is_logged=N&';
+        $query .= 'is_signed=N&';
+        $query .= 'fingerprint_mode=SHA512';
+
+        $environment = \Slim\Http\Environment::mock(
+            [
+                'REQUEST_METHOD' => 'PUT',
+                'QUERY_STRING'=> $query,
+            ]
+        );
         
-    //     $aArgs = [
-    //         'id'=> 'NEW'
-    //     ];
-
-    //     $request = \Slim\Http\Request::createFromEnvironment($environment);
-    //     $response = new \Slim\Http\Response();
-    //     $response = $action->update($request, $response, $aArgs);
-
-    //     $compare = '[{"docserverType":[{"id":"TEST","label_status":"TEST AFTER UP",'
-    //         . '"is_system":"Y","is_folder_status":"N","img_filename":null,'
-    //         . '"maarch_module":"apps","can_be_searched":"Y",'
-    //         . '"can_be_modified":"Y"}]}]';
+        $aArgs = [
+            'docserver_type_id'=> 'TEST'
+        ];
+
+        $request = \Slim\Http\Request::createFromEnvironment($environment);
+        $response = new \Slim\Http\Response();
+        $response = $action->update($request, $response, $aArgs);
+
+        $compare = '[{"DocserverType":[{"docserver_type_id":"TEST",'
+            . '"docserver_type_label":"TEST","enabled":"Y",'
+            . '"is_container":"N","container_max_number":0,'
+            . '"is_compressed":"N","compression_mode":null,'
+            . '"is_meta":"N","meta_template":null,'
+            . '"is_logged":"N","log_template":null,'
+            . '"is_signed":"N","fingerprint_mode":"SHA512"}]}]';
         
-    //     $this->assertSame((string)$response->getBody(), $compare);
-    // }
-
-    // public function testDelete()
-    // {
-    //     $action = new \Core\Controllers\DocserverTypeController();
-
-    //     $environment = \Slim\Http\Environment::mock(
-    //         [
-    //             'REQUEST_METHOD' => 'DELETE',
-    //         ]
-    //     );
-
-    //     $aArgs = [
-    //         'id'=> 'TEST'
-    //     ];
-
-    //     $request = \Slim\Http\Request::createFromEnvironment($environment);
-    //     $response = new \Slim\Http\Response();
-    //     $response = $action->delete($request, $response, $aArgs);
+        $this->assertSame((string)$response->getBody(), $compare);
+    }
+
+    public function testDelete()
+    {
+        $action = new \Core\Controllers\DocserverTypeController();
+
+        $environment = \Slim\Http\Environment::mock(
+            [
+                'REQUEST_METHOD' => 'DELETE',
+            ]
+        );
+
+        $aArgs = [
+            'docserver_type_id'=> 'TEST'
+        ];
+
+        $request = \Slim\Http\Request::createFromEnvironment($environment);
+        $response = new \Slim\Http\Response();
+        $response = $action->delete($request, $response, $aArgs);
         
-    //     $this->assertSame((string)$response->getBody(), '[{"docserverType":true}]');
-    // }
+        $this->assertSame((string)$response->getBody(), '[{"DocserverType":true}]');
+    }
 }
-- 
GitLab