Merged in darojas/processmaker (pull request #374)

Se agregan unit test para cases 7_12. Se resuelven conflictos de merge. Se agregan unit test para INPUT DOCUMENTS y se agregan validaciones.
2014-04-07 16:19:03 -04:00
parent 6517d4b817 e08ff8d215
commit a5662a9ff1
7 changed files with 802 additions and 287 deletions
--- a/features/backend/application_cases/case_actions/main_tests_cases_actions.feature
+++ b/features/backend/application_cases/case_actions/main_tests_cases_actions.feature
@@ -49,7 +49,7 @@ Scenario: Returns a list of the cases for the logged in user (Paused)
    And the response has 12 records


-Scenario: Returns information about a given case of the list Inbox
+Scenario:  Returns information about a given case of the list Inbox of process "Derivation rules - Parallel"
    Given I request "cases/220090038533b0c40688174019225585"
    Then the response status code should be 200
    And the response charset is "UTF-8"
@@ -59,7 +59,7 @@ Scenario: Returns information about a given case of the list Inbox
    And the "app_name" property equals "#137"
    And the "app_status" property equals "TO_DO"
    And the "app_init_usr_uid" property equals "00000000000000000000000000000001"
-    And the "app_init_usr_username" property equals "Administrator  "
+    And the "app_init_usr_username" property equals "Administrator"
    And the "pro_uid" property equals "35894775350ec7daa099378048029617"
    And the "pro_name" property equals "Derivation rules - Parallel"
    And the "app_create_date" property equals "2014-04-01 14:58:08"
--- a/workflow/engine/src/BusinessModel/Cases.php
+++ b/workflow/engine/src/BusinessModel/Cases.php
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -608,14 +608,18 @@ class Cases
            }
            \G::LoadClass('wsBase');
            $ws = new \wsBase();
-            $fields = $ws->reassignCase($userUid, $applicationUid, $delIndex, $userUidSource, $userUidTarget);
+            $fields = $ws->reassignCase($userUid, $applicationUid, $delIndex, $userUidTarget, $userUidSource);
            $array = json_decode(json_encode($fields), true);
-            if ($array ["status_code"] != 0) {
-                throw (new \Exception($array ["message"]));
+            if (array_key_exists("status_code", $array)) {
+                if ($array ["status_code"] != 0) {
+                    throw (new \Exception($array ["message"]));
+                } else {
+                    unset($array['status_code']);
+                    unset($array['message']);
+                    unset($array['timestamp']);
+                }
            } else {
-                unset($array['status_code']);
-                unset($array['message']);
-                unset($array['timestamp']);
+                throw (new \Exception('The Application with app_uid: '.$applicationUid.' doesn\'t exist'));
            }
        } catch (\Exception $e) {
            throw $e;
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
@@ -58,6 +58,10 @@ class InputDocument
    public function getCasesInputDocument($applicationUid, $userUid, $inputDocumentUid)
    {
        try {
+            $oAppDocument = \AppDocumentPeer::retrieveByPK( $inputDocumentUid, 1 );
+            if (is_null( $oAppDocument ) || $oAppDocument->getAppDocStatus() == 'DELETED') {
+                throw (new \Exception('This input document with id: '.$inputDocumentUid.' doesn\'t exist!'));
+            }
            $sApplicationUID = $applicationUid;
            $sUserUID = $userUid;
            \G::LoadClass('case');
--- a/workflow/engine/src/Tests/BusinessModel/CasesTest.php
+++ b/workflow/engine/src/Tests/BusinessModel/CasesTest.php
--- a/workflow/engine/src/Tests/BusinessModel/CasesTest7_12.php
+++ b/workflow/engine/src/Tests/BusinessModel/CasesTest7_12.php
@@ -83,6 +83,34 @@ class CasesTest extends \PHPUnit_Framework_TestCase
        return true;
    }

+    /**
+     * Test error for incorrect value of process in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::addCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage Invalid process 12345678912345678912345678912345678
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testAddCaseErrorIncorrectProcessValueArray()
+    {
+        $this->oCases->addCase('12345678912345678912345678912345678', self::$tasUid, self::$usrUid, array());
+    }
+
+    /**
+     * Test error for incorrect value of task in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::addCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage Task invalid or the user is not assigned to the task
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testAddCaseErrorIncorrectTaskValueArray()
+    {
+        $this->oCases->addCase(self::$proUid, '12345678912345678912345678912345678', self::$usrUid, array());
+    }
+
    /**
     * Test add Case
     *
@@ -98,6 +126,20 @@ class CasesTest extends \PHPUnit_Framework_TestCase
        return $aResponse;
    }

+    /**
+     * Test error for incorrect value of case in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::getTaskCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage Incorrect or unavailable information about this case: 12345678912345678912345678912345678
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testGetTaskCaseErrorIncorrectCaseValueArray()
+    {
+        $this->oCases->getTaskCase('12345678912345678912345678912345678', self::$usrUid);
+    }
+
    /**
     * Test get Task Case
     *
@@ -113,6 +155,20 @@ class CasesTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(is_array($response));
    }

+    /**
+     * Test error for incorrect value of case in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::getCaseInfo
+     * @expectedException        Exception
+     * @expectedExceptionMessage The Application row '12345678912345678912345678912345678' doesn't exist!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testGetCaseInfoErrorIncorrectCaseValueArray()
+    {
+        $this->oCases->getCaseInfo('12345678912345678912345678912345678', self::$usrUid);
+    }
+
    /**
     * Test get Case Info
     *
@@ -128,10 +184,40 @@ class CasesTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(is_object($response));
    }

+    /**
+     * Test error for incorrect value of user delegation in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::updateReassignCase
+     * @depends testAddCase
+     * @param array $aResponse
+     * @expectedException        Exception
+     * @expectedExceptionMessage Invalid Case Delegation index for this user
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testUpdateReassignCaseErrorIncorrectUserValueArray(array $aResponse)
+    {
+        $this->oCases->updateReassignCase($aResponse['app_uid'], self::$usrUid, null, self::$usrUid, self::$usrUid2);
+    }
+
+    /**
+     * Test error for incorrect value of case in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::updateReassignCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage The Application with app_uid: 12345678912345678912345678912345678 doesn't exist
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testUpdateReassignCaseErrorIncorrectCaseValueArray()
+    {
+        $this->oCases->updateReassignCase('12345678912345678912345678912345678', self::$usrUid, null, self::$usrUid2, self::$usrUid);
+    }
+
    /**
     * Test put reassign case
     *
-     * @covers \ProcessMaker\BusinessModel\Cases::getCaseInfo
+     * @covers \ProcessMaker\BusinessModel\Cases::updateReassignCase
     * @depends testAddCase
     * @param array $aResponse
     *
@@ -139,7 +225,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase
     */
    public function testUpdateReassignCase(array $aResponse)
    {
-        $response = $this->oCases->updateReassignCase($aResponse['app_uid'], self::$usrUid, null, self::$usrUid, self::$usrUid2);
+        $response = $this->oCases->updateReassignCase($aResponse['app_uid'], self::$usrUid, null, self::$usrUid2, self::$usrUid);
        $this->assertTrue(empty($response));
    }

@@ -158,6 +244,20 @@ class CasesTest extends \PHPUnit_Framework_TestCase
        return $aResponseRouteCase;
    }

+    /**
+     * Test error for incorrect value of case in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::updateRouteCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage The row '12345678912345678912345678912345678, ' in table AppDelegation doesn't exist!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testUpdateRouteCaseErrorIncorrectCaseValueArray()
+    {
+        $this->oCases->updateRouteCase('12345678912345678912345678912345678', self::$usrUid, null);
+    }
+
    /**
     * Test put route case
     *
@@ -173,6 +273,35 @@ class CasesTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(empty($response));
    }

+    /**
+     * Test error for incorrect value of process in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::addCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage Invalid process 12345678912345678912345678912345678
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testAddCaseImpersonateErrorIncorrectProcessValueArray()
+    {
+        $this->oCases->addCaseImpersonate('12345678912345678912345678912345678', self::$usrUid2, self::$tasUid, array());
+    }
+
+    /**
+     * Test error for incorrect value of task in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases::addCase
+     * @expectedException        Exception
+     * @expectedExceptionMessage User not registered! 12345678912345678912345678912345678!!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testAddCaseImpersonateErrorIncorrectTaskValueArray()
+    {
+        $this->oCases->addCaseImpersonate(self::$proUid, '12345678912345678912345678912345678', self::$tasUid, array());
+    }
+
+
    /**
     * Test add Case impersonate
     *
--- a/workflow/engine/src/Tests/BusinessModel/InputDocumentsCasesTest.php
+++ b/workflow/engine/src/Tests/BusinessModel/InputDocumentsCasesTest.php
@@ -18,6 +18,53 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase
    protected $oInputDocument;
    protected $idCase = '';

+    protected static $usrUid = "00000000000000000000000000000001";
+    protected static $proUid = "00000000000000000000000000000002";
+    protected static $tasUid = "00000000000000000000000000000003";
+    protected static $inpUid = "00000000000000000000000000000004";
+    protected static $steUid = "00000000000000000000000000000005";
+
+    public static function setUpBeforeClass()
+    {
+        $process = new \Process();
+        $process->create(array("type"=>"classicProject", "PRO_TITLE"=> "NEW TEST PHP UNIT", "PRO_DESCRIPTION"=> "465",
+            "PRO_CATEGORY"=> "", "PRO_CREATE_USER"=> "00000000000000000000000000000001",
+            "PRO_UID"=> self::$proUid, "USR_UID"=> "00000000000000000000000000000001"), false);
+
+        $task = new \Task();
+        $task->create(array("TAS_START"=>"TRUE", "TAS_UID"=> self::$tasUid, "PRO_UID"=> self::$proUid, "TAS_TITLE" => "NEW TASK TEST PHP UNIT",
+            "TAS_POSX"=> 581, "TAS_POSY"=> 17, "TAS_WIDTH"=> 165, "TAS_HEIGHT"=> 40), false);
+
+        $inputDocument = new \InputDocument();
+        $inputDocument->create(array("INP_DOC_UID"=> self::$inpUid, "PRO_UID"=> self::$proUid, "INP_DOC_TITLE"=> "INPUTDOCUMENT TEST UNIT", "INP_DOC_FORM_NEEDED"=> "VIRTUAL",
+                                     "INP_DOC_ORIGINAL"=> "ORIGINAL", "INP_DOC_DESCRIPTION"=> "", "INP_DOC_VERSIONING"=> "",
+                                     "INP_DOC_DESTINATION_PATH"=> "", "INP_DOC_TAGS"=> "INPUT", "ACCEPT"=> "Save", "BTN_CANCEL"=>"Cancel"));
+
+        $step = new \Step();
+        $step->create(array( "PRO_UID"=> self::$proUid, "TAS_UID"=> self::$tasUid, "STEP_UID"=> self::$steUid, "STEP_TYPE_OBJ" => "INPUT_DOCUMENT", "STEP_UID_OBJ" =>self::$inpUid));
+
+        $assign = new \TaskUser();
+        $assign->create(array("TAS_UID"=> self::$tasUid, "USR_UID"=> self::$usrUid, "TU_TYPE"=>  "1", "TU_RELATION"=> 1));
+    }
+
+    public static function tearDownAfterClass()
+    {
+        $assign = new \TaskUser();
+        $assign->remove(self::$tasUid, self::$usrUid, 1,1);
+
+        $step = new \Step();
+        $step->remove(self::$steUid);
+
+        $inputDocument = new \InputDocument();
+        $inputDocument->remove(self::$inpUid);
+
+        $task = new \Task();
+        $task->remove(self::$tasUid);
+
+        $process = new \Process();
+        $process->remove(self::$proUid);
+    }
+
    /**
     * Set class for test
     *
@@ -39,19 +86,29 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase
    public function testAddInputDocument()
    {
        \G::loadClass('pmFunctions');
-        \G::loadClass('pmFunctions');
-        $usrUid = '00000000000000000000000000000001';//an user id valid
-        $proUid = '1265557095225ff5c688f46031700471';//a process id valid
-        $tasUid = '46941969352af5be2ab3f39001216717';//a task id valid and related to the previous proUid
-        $inpDocUid = '70158392952979dedd77fe0058957493';//a input document id valid and related to the previous task id
-        $idCase = PMFNewCase($proUid, $usrUid, $tasUid, array());
+        $idCase = PMFNewCase(self::$proUid, self::$usrUid, self::$tasUid, array());
        $case = new \Cases();
-        $appDocUid = $case->addInputDocument($inpDocUid, $appDocUid = \G::generateUniqueID(), '', 'INPUT',
+        $appDocUid = $case->addInputDocument(self::$inpUid, $appDocUid = \G::generateUniqueID(), '', 'INPUT',
                                             'PHPUNIT TEST', '', $idCase, \AppDelegation::getCurrentIndex($idCase),
-                                             $tasUid, $usrUid, "xmlform", '/home/user/desarrollo/test.txt', 0, '/home/user/desarrollo/test.txt');
+                                             self::$tasUid, self::$usrUid, "xmlform", PATH_DATA_SITE.'db.php',
+                                             0, PATH_DATA_SITE.'db.php');
        $aResponse = array();
-        $aResponse = array_merge(array("idCase" => $idCase, "appDocUid" => $appDocUid, "inpDocUid" => $inpDocUid), $aResponse);
+        $aResponse = array_merge(array("idCase" => $idCase, "appDocUid" => $appDocUid, "inpDocUid" => self::$inpUid), $aResponse);
        return $aResponse;
+     }
+
+    /**
+     * Test error for incorrect value of case in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::getCasesInputDocuments
+     * @expectedException        Exception
+     * @expectedExceptionMessage The Application row '12345678912345678912345678912345678' doesn't exist!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testGetCasesInputDocumentsErrorIncorrectCaseValueArray()
+    {
+        $this->oInputDocument->getCasesInputDocuments('12345678912345678912345678912345678', self::$usrUid);
    }

    /**
@@ -65,10 +122,42 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase
     */
    public function testGetCasesInputDocuments(array $aResponse)
    {
-        $response = $this->oInputDocument->getCasesInputDocuments($aResponse["idCase"], '00000000000000000000000000000001');
+        $response = $this->oInputDocument->getCasesInputDocuments($aResponse["idCase"], self::$usrUid);
        $this->assertTrue(is_array($response));
    }

+    /**
+     * Test error for incorrect value of task in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::getCasesInputDocument
+     * @depends testAddInputDocument
+     * @param array $aResponse
+     * @expectedException        Exception
+     * @expectedExceptionMessage The Application row '12345678912345678912345678912345678' doesn't exist!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testGetCasesInputDocumentErrorIncorrectCaseValueArray(array $aResponse)
+    {
+        $this->oInputDocument->getCasesInputDocument('12345678912345678912345678912345678', self::$usrUid, $aResponse["appDocUid"]);
+    }
+
+    /**
+     * Test error for incorrect value of input document in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::getCasesInputDocument
+     * @depends testAddInputDocument
+     * @param array $aResponse
+     * @expectedException        Exception
+     * @expectedExceptionMessage This input document with id: 12345678912345678912345678912345678 doesn't exist!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testGetCasesInputDocumentErrorIncorrectInputDocumentValueArray(array $aResponse)
+    {
+        $this->oInputDocument->getCasesInputDocument($aResponse["idCase"], self::$usrUid, '12345678912345678912345678912345678');
+    }
+
    /**
     * Test get InputDocument
     *
@@ -80,10 +169,26 @@ class InputDocumentsCasesTest extends \PHPUnit_Framework_TestCase
     */
    public function testGetCasesInputDocument(array $aResponse)
    {
-        $response = $this->oInputDocument->getCasesInputDocument($aResponse["idCase"], '00000000000000000000000000000001', $aResponse["appDocUid"]);
+        $response = $this->oInputDocument->getCasesInputDocument($aResponse["idCase"], self::$usrUid, $aResponse["appDocUid"]);
        $this->assertTrue(is_object($response));
    }

+    /**
+     * Test error for incorrect value of input document in array
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases\InputDocument::removeInputDocument
+     * @depends testAddInputDocument
+     * @param array $aResponse
+     * @expectedException        Exception
+     * @expectedExceptionMessage This input document with id: 12345678912345678912345678912345678 doesn't exist!
+     *
+     * @copyright Colosa - Bolivia
+     */
+    public function testGetCasesInputDocumentErrorIncorrectApplicationValueArray(array $aResponse)
+    {
+        $this->oInputDocument->removeInputDocument('12345678912345678912345678912345678');
+    }
+
    /**
     * Test remove InputDocument
     *