From c5a84911bd035c687327e5d4a4a5f87db56c71ae Mon Sep 17 00:00:00 2001 From: Ralph Soika <ralph.soika@imixs.com> Date: Thu, 7 Jun 2018 23:00:47 +0200 Subject: [PATCH] refactoring junit tests #388 --- .../engine/plugins/SplitAndJoinPlugin.java | 2 +- .../workflow/engine/TestSimulationService.java | 12 ++++++------ .../workflow/engine/TestWorkflowService.java | 12 ++++++------ .../engine/TestWorkflowServiceGateways.java | 18 +++++++++--------- .../workflow/plugins/TestAccessPlugin.java | 9 ++++----- .../plugins/TestSplitAndJoinPlugin.java | 2 +- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java index ed70fdad6..bdbf82633 100644 --- a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java +++ b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java @@ -198,7 +198,7 @@ protected void createSubprocesses(final List<String> subProcessDefinitions, fina sModelVersion=originWorkitem.getModelVersion(); } workitemSubProcess.replaceItemValue(WorkflowKernel.MODELVERSION,sModelVersion); - workitemSubProcess.replaceItemValue(WorkflowKernel.PROCESSID, + workitemSubProcess.setTaskID( Integer.valueOf(processData.getItemValueString("processid"))); workitemSubProcess.setEventID( Integer.valueOf(processData.getItemValueString("activityid"))); diff --git a/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestSimulationService.java b/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestSimulationService.java index c901eddcd..75c546fad 100644 --- a/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestSimulationService.java +++ b/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestSimulationService.java @@ -43,25 +43,25 @@ public void testConditionalEvent1() workitem.replaceItemValue(WorkflowKernel.MODELVERSION, WorkflowSimulationEnvironment.DEFAULT_MODEL_VERSION); // test none condition ... - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.setEventID(10); workitem = wse.processWorkItem(workitem); Assert.assertEquals("1.0.0", workitem.getItemValueString("$ModelVersion")); - Assert.assertEquals(1000, workitem.getProcessID()); + Assert.assertEquals(1000, workitem.getTaskID()); // test _budget<100 - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.replaceItemValue("_budget", 99); workitem.setEventID(10); workitem = wse.simulationService.processWorkItem(workitem, null); - Assert.assertEquals(1200, workitem.getProcessID()); + Assert.assertEquals(1200, workitem.getTaskID()); // test _budget>100 - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.replaceItemValue("_budget", 9999); workitem.setEventID(10); workitem = wse.simulationService.processWorkItem(workitem, null); - Assert.assertEquals(1100, workitem.getProcessID()); + Assert.assertEquals(1100, workitem.getTaskID()); } diff --git a/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowService.java b/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowService.java index 21570c6fa..b64f7640f 100644 --- a/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowService.java +++ b/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowService.java @@ -58,7 +58,7 @@ public void testProcessSimple() // load test workitem ItemCollection workitem = workflowMockEnvironment.database.get("W0000-00001"); workitem.replaceItemValue(WorkflowKernel.MODELVERSION, WorkflowMockEnvironment.DEFAULT_MODEL_VERSION); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 100); + workitem.setTaskID(100); workitem = workflowMockEnvironment.workflowService.processWorkItem(workitem); @@ -74,7 +74,7 @@ public void testGetEventsSimple() { // get workitem ItemCollection workitem = workflowMockEnvironment.database.get("W0000-00001"); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 200); + workitem.setTaskID(200); List<ItemCollection> eventList = null; try { @@ -96,7 +96,7 @@ public void testGetEventsComplex() { // get workitem ItemCollection workitem = workflowMockEnvironment.database.get("W0000-00001"); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 100); + workitem.setTaskID(100); Vector<String> members = new Vector<String>(); members.add("jo"); @@ -126,7 +126,7 @@ public void testGetEventsComplexRestricted() { // get workitem ItemCollection workitem = workflowMockEnvironment.database.get("W0000-00001"); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 100); + workitem.setTaskID(100); Vector<String> members = new Vector<String>(); members.add("jo"); @@ -167,7 +167,7 @@ public List<String> answer(InvocationOnMock invocation) throws Throwable { // get workitem ItemCollection workitem = workflowMockEnvironment.database.get("W0000-00001"); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 300); + workitem.setTaskID(300); Vector<String> members = new Vector<String>(); members.add("jo"); @@ -208,7 +208,7 @@ public List<String> answer(InvocationOnMock invocation) throws Throwable { // get workitem ItemCollection workitem = workflowMockEnvironment.database.get("W0000-00001"); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 300); + workitem.setTaskID(300); Vector<String> members = new Vector<String>(); members.add("jo"); diff --git a/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowServiceGateways.java b/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowServiceGateways.java index a6d1656e7..3ee4df521 100644 --- a/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowServiceGateways.java +++ b/imixs-workflow-engine/src/test/java/org/imixs/workflow/engine/TestWorkflowServiceGateways.java @@ -58,25 +58,25 @@ public void testConditionalEvent1() workitem.replaceItemValue(WorkflowKernel.MODELVERSION, WorkflowMockEnvironment.DEFAULT_MODEL_VERSION); // test none condition ... - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.setEventID(10); workitem = workflowMockEnvironment.workflowService.processWorkItem(workitem); Assert.assertEquals("1.0.0", workitem.getItemValueString("$ModelVersion")); - Assert.assertEquals(1000, workitem.getProcessID()); + Assert.assertEquals(1000, workitem.getTaskID()); // test _budget<100 - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.replaceItemValue("_budget", 99); workitem.setEventID(10); workitem = workflowMockEnvironment.workflowService.processWorkItem(workitem); - Assert.assertEquals(1200, workitem.getProcessID()); + Assert.assertEquals(1200, workitem.getTaskID()); // test _budget>100 - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.replaceItemValue("_budget", 9999); workitem.setEventID(10); workitem = workflowMockEnvironment.workflowService.processWorkItem(workitem); - Assert.assertEquals(1100, workitem.getProcessID()); + Assert.assertEquals(1100, workitem.getTaskID()); } @@ -102,11 +102,11 @@ public void testSplitEvent1() // test none condition ... workitem.replaceItemValue("_subject", "Hello"); - workitem.replaceItemValue(WorkflowKernel.PROCESSID, 1000); + workitem.setTaskID(1000); workitem.setEventID(10); workitem = workflowMockEnvironment.workflowService.processWorkItem(workitem); Assert.assertEquals("1.0.0", workitem.getItemValueString("$ModelVersion")); - Assert.assertEquals(1100, workitem.getProcessID()); + Assert.assertEquals(1100, workitem.getTaskID()); // lookup the version..... List<ItemCollection> versions = new ArrayList<ItemCollection>(); @@ -122,7 +122,7 @@ public void testSplitEvent1() Assert.assertNotNull(version); Assert.assertEquals("Hello", version.getItemValueString("_subject")); - Assert.assertEquals(1200, version.getProcessID()); + Assert.assertEquals(1200, version.getTaskID()); Assert.assertEquals(20, version.getItemValueInteger("$lastevent")); } diff --git a/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestAccessPlugin.java b/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestAccessPlugin.java index ef5e6e41f..9aaa4c0dd 100644 --- a/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestAccessPlugin.java +++ b/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestAccessPlugin.java @@ -5,7 +5,6 @@ import java.util.logging.Logger; import org.imixs.workflow.ItemCollection; -import org.imixs.workflow.WorkflowKernel; import org.imixs.workflow.engine.WorkflowMockEnvironment; import org.imixs.workflow.engine.plugins.AccessPlugin; import org.imixs.workflow.exceptions.ModelException; @@ -188,7 +187,7 @@ public void testCondition() throws ModelException { // case I. - documentContext.replaceItemValue(WorkflowKernel.PROCESSID, 200); + documentContext.setTaskID(200); documentContext.setEventID(20); documentContext.replaceItemValue("_budget", 50); try { @@ -201,14 +200,14 @@ public void testCondition() throws ModelException { List writeAccess = documentContext.getItemValue("$WriteAccess"); - Assert.assertEquals(300, documentContext.getProcessID()); + Assert.assertEquals(300, documentContext.getTaskID()); Assert.assertEquals(2, writeAccess.size()); Assert.assertTrue(writeAccess.contains("joe")); Assert.assertTrue(writeAccess.contains("sam")); // case II. - documentContext.replaceItemValue(WorkflowKernel.PROCESSID, 200); + documentContext.setTaskID(200); documentContext.setEventID(20); documentContext.replaceItemValue("_budget", 570); try { @@ -221,7 +220,7 @@ public void testCondition() throws ModelException { writeAccess = documentContext.getItemValue("$WriteAccess"); - Assert.assertEquals(400, documentContext.getProcessID()); + Assert.assertEquals(400, documentContext.getTaskID()); Assert.assertEquals(1, writeAccess.size()); Assert.assertTrue(writeAccess.contains("tom")); diff --git a/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java b/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java index 8028504b7..4998f118c 100644 --- a/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java +++ b/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java @@ -67,7 +67,7 @@ public void setup() throws PluginException, ModelException { documentContext.replaceItemValue("namTeam", list); documentContext.replaceItemValue("namCreator", "ronny"); documentContext.replaceItemValue(WorkflowKernel.MODELVERSION, WorkflowMockEnvironment.DEFAULT_MODEL_VERSION); - documentContext.replaceItemValue(WorkflowKernel.PROCESSID, 100); + documentContext.setTaskID(100); documentContext.replaceItemValue(WorkflowKernel.UNIQUEID, WorkflowKernel.generateUniqueID()); workflowMockEnvironment.getDocumentService().save(documentContext);