fernando/luos
1
0
Fork 0
Code Releases Activity

Updating unit tests for BpmnWorkflow and WorkflowBpmn Adapters tests

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-02-10 16:35:24 -04:00
parent 2f5d306d95
commit 29a9ecbdba
4 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -17,12 +17,6 @@ class BpmnWorkflow extends Project\Bpmn
*/
protected $wp;
public function __construct()
{
$this->wp = new Project\Workflow();
}
/**
* OVERRIDES
*/
@@ -62,8 +56,8 @@ class BpmnWorkflow extends Project\Bpmn
$wpData["PRO_CREATE_USER"] = $data["PRJ_AUTHOR"];
}
$wp = new Project\Workflow();
$wp->create($wpData);
$this->wp = new Project\Workflow();
$this->wp->create($wpData);
} catch (\Exception $e) {
$prjUid = $this->getUid();
@@ -101,10 +95,9 @@ class BpmnWorkflow extends Project\Bpmn
public function addActivity($data)
{
parent::addActivity($data);
$taskData = array();
$taskData["TAS_UID"] = $data["ACT_UID"];
$taskData["TAS_UID"] = parent::addActivity($data);
if (array_key_exists("ACT_NAME", $data)) {
$taskData["TAS_TITLE"] = $data["ACT_NAME"];
@@ -375,4 +368,9 @@ class BpmnWorkflow extends Project\Bpmn
return null;
}
public function remove()
{
parent::remove();
$this->wp->remove();
}
}

24
workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
View File

@@ -12,10 +12,28 @@ use ProcessMaker\Util\Hash;
*/
class WorkflowBpmn extends Project\Workflow
{
/**
* @var \ProcessMaker\Project\Bpmn
*/
protected $bp;
/**
* OVERRIDES
*/
public static function load($prjUid)
{
$parent = parent::load($prjUid);
$me = new self();
$me->process = $parent->process;
$me->proUid = $parent->proUid;
$me->bp = Project\Bpmn::load($prjUid);
return $me;
}
public function create($data)
{
try {
@@ -57,4 +75,10 @@ class WorkflowBpmn extends Project\Workflow
));
}
}
public function remove()
{
parent::remove();
$this->bp->remove();
}
}

35
workflow/engine/src/Tests/ProcessMaker/Project/Adapter/BpmnWorkflowTest.php
View File

@@ -15,6 +15,17 @@ if (! class_exists("Propel")) {
*/
class BpmnWorkflowTest extends \PHPUnit_Framework_TestCase
{
protected static $uids = array();
public static function tearDownAfterClass()
{
//cleaning DB
foreach (self::$uids as $prjUid) {
$bwap = Project\Adapter\BpmnWorkflow::load($prjUid);
$bwap->remove();
}
}
function testNew()
{
$data = array(
@@ -27,14 +38,20 @@ class BpmnWorkflowTest extends \PHPUnit_Framework_TestCase
try {
$bp = Project\Bpmn::load($bwap->getUid());
} catch (\Exception $e){}
} catch (\Exception $e){
$bp = null;
}
try {
$wp = Project\Workflow::load($bwap->getUid());
} catch (\Exception $e){}
} catch (\Exception $e){
$wp = null;
}
$this->assertNotEmpty($bp);
$this->assertNotEmpty($wp);
self::$uids[] = $bwap->getUid();
$this->assertNotNull($bp);
$this->assertNotNull($wp);
$this->assertEquals($bp->getUid(), $wp->getUid());
$project = $bp->getProject();
@@ -58,11 +75,17 @@ class BpmnWorkflowTest extends \PHPUnit_Framework_TestCase
try {
$bp = Project\Bpmn::load($bwap->getUid());
} catch (\Exception $e){}
} catch (\Exception $e){
$bp = null;
}
try {
$wp = Project\Workflow::load($bwap->getUid());
} catch (\Exception $e){}
} catch (\Exception $e){
$wp = null;
}
self::$uids[] = $bwap->getUid();
$this->assertNotEmpty($bp);
$this->assertNotEmpty($wp);

15
workflow/engine/src/Tests/ProcessMaker/Project/Adapter/WorkflowBpmnTest.php
View File

@@ -15,6 +15,17 @@ if (! class_exists("Propel")) {
*/
class WorkflowBpmnTest extends \PHPUnit_Framework_TestCase
{
protected static $uids = array();
public static function tearDownAfterClass()
{
//cleaning DB
foreach (self::$uids as $prjUid) {
$wbpa = Project\Adapter\WorkflowBpmn::load($prjUid);
$wbpa->remove();
}
}
function testNew()
{
$data = array(
@@ -33,6 +44,8 @@ class WorkflowBpmnTest extends \PHPUnit_Framework_TestCase
$wp = Project\Workflow::load($wbap->getUid());
} catch (\Exception $e){}
self::$uids[] = $wbap->getUid();
$this->assertNotNull($bp);
$this->assertNotNull($wp);
$this->assertEquals($bp->getUid(), $wp->getUid());
@@ -63,6 +76,8 @@ class WorkflowBpmnTest extends \PHPUnit_Framework_TestCase
$wp = Project\Workflow::load($wbap->getUid());
} catch (\Exception $e){}
self::$uids[] = $wbap->getUid();
$this->assertNotEmpty($bp);
$this->assertNotEmpty($wp);
$this->assertEquals($bp->getUid(), $wp->getUid());