diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java index 63e3ecee7835ecaceef4461d4fe00af058ae1d01..0695faa661dfe040b280bb3a40ba677166d6c562 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java @@ -23,8 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import junit.framework.Assert; - import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricProcessInstanceQuery; @@ -238,27 +236,27 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { // Test EQUAL on single string variable, should result in 2 matches HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().variableValueEquals("stringVar", "abcdef"); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(2, processInstances.size()); + assertNotNull(processInstances); + assertEquals(2, processInstances.size()); // Test EQUAL on two string variables, should result in single match query = historyService.createHistoricProcessInstanceQuery().variableValueEquals("stringVar", "abcdef").variableValueEquals("stringVar2", "ghijkl"); HistoricProcessInstance resultInstance = query.singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance2.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance2.getId(), resultInstance.getId()); // Test NOT_EQUAL, should return only 1 resultInstance resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueNotEquals("stringVar", "abcdef").singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN, should return only matching 'azerty' resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("stringVar", "abcdef").singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("stringVar", "z").singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test GREATER_THAN_OR_EQUAL, should return 3 results assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThanOrEqual("stringVar", "abcdef").count()); @@ -266,7 +264,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { // Test LESS_THAN, should return 2 results processInstances = historyService.createHistoricProcessInstanceQuery().variableValueLessThan("stringVar", "abcdeg").list(); - Assert.assertEquals(2, processInstances.size()); + assertEquals(2, processInstances.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(processInstances.get(0).getId(), processInstances.get(1).getId())); ids.removeAll(expecedIds); @@ -277,7 +275,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { // Test LESS_THAN_OR_EQUAL processInstances = historyService.createHistoricProcessInstanceQuery().variableValueLessThanOrEqual("stringVar", "abcdef").list(); - Assert.assertEquals(2, processInstances.size()); + assertEquals(2, processInstances.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(processInstances.get(0).getId(), processInstances.get(1).getId())); ids.removeAll(expecedIds); @@ -308,7 +306,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = historyService.createHistoricProcessInstanceQuery().variableValueEquals("abcdef").list(); - Assert.assertEquals(2, processInstances.size()); + assertEquals(2, processInstances.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(processInstances.get(0).getId(), processInstances.get(1).getId())); ids.removeAll(expecedIds); @@ -405,61 +403,61 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { // Query on single short variable, should result in 2 matches HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().variableValueEquals("dateVar", date1); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(2, processInstances.size()); + assertNotNull(processInstances); + assertEquals(2, processInstances.size()); // Query on two short variables, should result in single value query = historyService.createHistoricProcessInstanceQuery().variableValueEquals("dateVar", date1).variableValueEquals("dateVar2", date2); HistoricProcessInstance resultInstance = query.singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance2.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance2.getId(), resultInstance.getId()); // Query with unexisting variable value Date unexistingDate = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss").parse("01/01/1989 12:00:00"); resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueEquals("dateVar", unexistingDate).singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test NOT_EQUALS resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueNotEquals("dateVar", date1).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("dateVar", nextMonth.getTime()).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(0, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("dateVar", nextYear.getTime()).count()); - Assert.assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("dateVar", oneYearAgo.getTime()).count()); + assertEquals(0, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("dateVar", nextYear.getTime()).count()); + assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThan("dateVar", oneYearAgo.getTime()).count()); // Test GREATER_THAN_OR_EQUAL resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar", nextMonth.getTime()).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar", nextYear.getTime()).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar", oneYearAgo.getTime()).count()); + assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar", oneYearAgo.getTime()).count()); // Test LESS_THAN processInstances = historyService.createHistoricProcessInstanceQuery().variableValueLessThan("dateVar", nextYear.getTime()).list(); - Assert.assertEquals(2, processInstances.size()); + assertEquals(2, processInstances.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(processInstances.get(0).getId(), processInstances.get(1).getId())); ids.removeAll(expecedIds); assertTrue(ids.isEmpty()); - Assert.assertEquals(0, historyService.createHistoricProcessInstanceQuery().variableValueLessThan("dateVar", date1).count()); - Assert.assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueLessThan("dateVar", twoYearsLater.getTime()).count()); + assertEquals(0, historyService.createHistoricProcessInstanceQuery().variableValueLessThan("dateVar", date1).count()); + assertEquals(3, historyService.createHistoricProcessInstanceQuery().variableValueLessThan("dateVar", twoYearsLater.getTime()).count()); // Test LESS_THAN_OR_EQUAL processInstances = historyService.createHistoricProcessInstanceQuery().variableValueLessThanOrEqual("dateVar", nextYear.getTime()).list(); - Assert.assertEquals(3, processInstances.size()); + assertEquals(3, processInstances.size()); - Assert.assertEquals(0, historyService.createHistoricProcessInstanceQuery().variableValueLessThanOrEqual("dateVar", oneYearAgo.getTime()).count()); + assertEquals(0, historyService.createHistoricProcessInstanceQuery().variableValueLessThanOrEqual("dateVar", oneYearAgo.getTime()).count()); // Test value-only matching resultInstance = historyService.createHistoricProcessInstanceQuery().variableValueEquals(nextYear.getTime()).singleResult(); @@ -467,7 +465,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = historyService.createHistoricProcessInstanceQuery().variableValueEquals(date1).list(); - Assert.assertEquals(2, processInstances.size()); + assertEquals(2, processInstances.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(processInstances.get(0).getId(), processInstances.get(1).getId())); ids.removeAll(expecedIds); @@ -487,7 +485,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase { runtimeService.startProcessInstanceByKey("oneTaskProcess"); assertEquals(1, historyService.createNativeHistoricProcessInstanceQuery().sql("SELECT count(*) FROM " + managementService.getTableName(HistoricProcessInstance.class)).count()); assertEquals(1, historyService.createNativeHistoricProcessInstanceQuery().sql("SELECT * FROM " + managementService.getTableName(HistoricProcessInstance.class)).list().size()); -// assertEquals(1, historyService.createNativeHistoricProcessInstanceQuery().sql("SELECT * FROM " + managementService.getTableName(HistoricProcessInstance.class)).listPage(0, 1).size()); + assertEquals(1, historyService.createNativeHistoricProcessInstanceQuery().sql("SELECT * FROM " + managementService.getTableName(HistoricProcessInstance.class)).listPage(0, 1).size()); } @Deployment(resources = { "org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml" }) diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/ManagementServiceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/ManagementServiceTest.java index 101596be261dd351f6543c138c540eb6736abb21..a41f63cb596b33e5633cf53ffeadcf6577d41550 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/ManagementServiceTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/ManagementServiceTest.java @@ -15,8 +15,6 @@ package org.activiti.engine.test.api.mgmt; import java.util.Date; -import junit.framework.Assert; - import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.ActivitiObjectNotFoundException; @@ -99,13 +97,13 @@ public class ManagementServiceTest extends PluggableActivitiTestCase { .processInstanceId(processInstance.getId()) .singleResult(); - Assert.assertNotNull(timerJob); - Assert.assertNotNull(timerJob.getExceptionMessage()); + assertNotNull(timerJob); + assertNotNull(timerJob.getExceptionMessage()); assertTextPresent("This is an exception thrown from scriptTask", timerJob.getExceptionMessage()); // Get the full stacktrace using the managementService String exceptionStack = managementService.getJobExceptionStacktrace(timerJob.getId()); - Assert.assertNotNull(exceptionStack); + assertNotNull(exceptionStack); assertTextPresent("This is an exception thrown from scriptTask", exceptionStack); } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ExecutionQueryTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ExecutionQueryTest.java index 3211b5062a331b7d4dd3a55c565db39bad54ba98..d23c19de474888d8468db9234a583109df9129d9 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ExecutionQueryTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ExecutionQueryTest.java @@ -35,8 +35,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; - import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; @@ -200,27 +198,27 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Test EQUAL on single string variable, should result in 2 matches ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("stringVar", "abcdef"); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(2, executions.size()); + assertNotNull(executions); + assertEquals(2, executions.size()); // Test EQUAL on two string variables, should result in single match query = runtimeService.createExecutionQuery().variableValueEquals("stringVar", "abcdef").variableValueEquals("stringVar2", "ghijkl"); Execution execution = query.singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance2.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance2.getId(), execution.getId()); // Test NOT_EQUAL, should return only 1 execution execution = runtimeService.createExecutionQuery().variableValueNotEquals("stringVar", "abcdef").singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); // Test GREATER_THAN, should return only matching 'azerty' execution = runtimeService.createExecutionQuery().variableValueGreaterThan("stringVar", "abcdef").singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); execution = runtimeService.createExecutionQuery().variableValueGreaterThan("stringVar", "z").singleResult(); - Assert.assertNull(execution); + assertNull(execution); // Test GREATER_THAN_OR_EQUAL, should return 3 results assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("stringVar", "abcdef").count()); @@ -228,7 +226,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Test LESS_THAN, should return 2 results executions = runtimeService.createExecutionQuery().variableValueLessThan("stringVar", "abcdeg").list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -239,7 +237,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Test LESS_THAN_OR_EQUAL executions = runtimeService.createExecutionQuery().variableValueLessThanOrEqual("stringVar", "abcdef").list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -270,7 +268,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), execution.getId()); executions = runtimeService.createExecutionQuery().variableValueEquals("abcdef").list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -373,60 +371,60 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Query on single long variable, should result in 2 matches ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("longVar", 12345L); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(2, executions.size()); + assertNotNull(executions); + assertEquals(2, executions.size()); // Query on two long variables, should result in single match query = runtimeService.createExecutionQuery().variableValueEquals("longVar", 12345L).variableValueEquals("longVar2", 67890L); Execution execution = query.singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance2.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance2.getId(), execution.getId()); // Query with unexisting variable value execution = runtimeService.createExecutionQuery().variableValueEquals("longVar", 999L).singleResult(); - Assert.assertNull(execution); + assertNull(execution); // Test NOT_EQUALS execution = runtimeService.createExecutionQuery().variableValueNotEquals("longVar", 12345L).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); // Test GREATER_THAN execution = runtimeService.createExecutionQuery().variableValueGreaterThan("longVar", 44444L).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("longVar", 55555L).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("longVar",1L).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("longVar", 55555L).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("longVar",1L).count()); // Test GREATER_THAN_OR_EQUAL execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("longVar", 44444L).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("longVar", 55555L).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("longVar",1L).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("longVar",1L).count()); // Test LESS_THAN executions = runtimeService.createExecutionQuery().variableValueLessThan("longVar", 55555L).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); assertTrue(ids.isEmpty()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("longVar", 12345L).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("longVar",66666L).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("longVar", 12345L).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("longVar",66666L).count()); // Test LESS_THAN_OR_EQUAL executions = runtimeService.createExecutionQuery().variableValueLessThanOrEqual("longVar", 55555L).list(); - Assert.assertEquals(3, executions.size()); + assertEquals(3, executions.size()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("longVar", 12344L).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("longVar", 12344L).count()); // Test value-only matching @@ -435,7 +433,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), execution.getId()); executions = runtimeService.createExecutionQuery().variableValueEquals(12345L).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -468,60 +466,60 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Query on single double variable, should result in 2 matches ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("doubleVar", 12345.6789); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(2, executions.size()); + assertNotNull(executions); + assertEquals(2, executions.size()); // Query on two double variables, should result in single value query = runtimeService.createExecutionQuery().variableValueEquals("doubleVar", 12345.6789).variableValueEquals("doubleVar2", 9876.54321); Execution execution = query.singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance2.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance2.getId(), execution.getId()); // Query with unexisting variable value execution = runtimeService.createExecutionQuery().variableValueEquals("doubleVar", 9999.99).singleResult(); - Assert.assertNull(execution); + assertNull(execution); // Test NOT_EQUALS execution = runtimeService.createExecutionQuery().variableValueNotEquals("doubleVar", 12345.6789).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); // Test GREATER_THAN execution = runtimeService.createExecutionQuery().variableValueGreaterThan("doubleVar", 44444.4444).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("doubleVar", 55555.5555).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("doubleVar",1.234).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("doubleVar", 55555.5555).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("doubleVar",1.234).count()); // Test GREATER_THAN_OR_EQUAL execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("doubleVar", 44444.4444).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("doubleVar", 55555.5555).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("doubleVar",1.234).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("doubleVar",1.234).count()); // Test LESS_THAN executions = runtimeService.createExecutionQuery().variableValueLessThan("doubleVar", 55555.5555).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); assertTrue(ids.isEmpty()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("doubleVar", 12345.6789).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("doubleVar",66666.6666).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("doubleVar", 12345.6789).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("doubleVar",66666.6666).count()); // Test LESS_THAN_OR_EQUAL executions = runtimeService.createExecutionQuery().variableValueLessThanOrEqual("doubleVar", 55555.5555).list(); - Assert.assertEquals(3, executions.size()); + assertEquals(3, executions.size()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("doubleVar", 12344.6789).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("doubleVar", 12344.6789).count()); // Test value-only matching execution = runtimeService.createExecutionQuery().variableValueEquals(55555.5555).singleResult(); @@ -529,7 +527,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), execution.getId()); executions = runtimeService.createExecutionQuery().variableValueEquals(12345.6789).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -562,60 +560,60 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Query on single integer variable, should result in 2 matches ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("integerVar", 12345); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(2, executions.size()); + assertNotNull(executions); + assertEquals(2, executions.size()); // Query on two integer variables, should result in single value query = runtimeService.createExecutionQuery().variableValueEquals("integerVar", 12345).variableValueEquals("integerVar2", 67890); Execution execution = query.singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance2.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance2.getId(), execution.getId()); // Query with unexisting variable value execution = runtimeService.createExecutionQuery().variableValueEquals("integerVar", 9999).singleResult(); - Assert.assertNull(execution); + assertNull(execution); // Test NOT_EQUALS execution = runtimeService.createExecutionQuery().variableValueNotEquals("integerVar", 12345).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); // Test GREATER_THAN execution = runtimeService.createExecutionQuery().variableValueGreaterThan("integerVar", 44444).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("integerVar", 55555).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("integerVar",1).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("integerVar", 55555).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("integerVar",1).count()); // Test GREATER_THAN_OR_EQUAL execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("integerVar", 44444).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("integerVar", 55555).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("integerVar",1).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("integerVar",1).count()); // Test LESS_THAN executions = runtimeService.createExecutionQuery().variableValueLessThan("integerVar", 55555).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); assertTrue(ids.isEmpty()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("integerVar", 12345).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("integerVar",66666).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("integerVar", 12345).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("integerVar",66666).count()); // Test LESS_THAN_OR_EQUAL executions = runtimeService.createExecutionQuery().variableValueLessThanOrEqual("integerVar", 55555).list(); - Assert.assertEquals(3, executions.size()); + assertEquals(3, executions.size()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("integerVar", 12344).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("integerVar", 12344).count()); // Test value-only matching execution = runtimeService.createExecutionQuery().variableValueEquals(55555).singleResult(); @@ -623,7 +621,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), execution.getId()); executions = runtimeService.createExecutionQuery().variableValueEquals(12345).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -658,61 +656,61 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Query on single short variable, should result in 2 matches ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("shortVar", shortVar); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(2, executions.size()); + assertNotNull(executions); + assertEquals(2, executions.size()); // Query on two short variables, should result in single value query = runtimeService.createExecutionQuery().variableValueEquals("shortVar", shortVar).variableValueEquals("shortVar2", shortVar2); Execution execution = query.singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance2.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance2.getId(), execution.getId()); // Query with unexisting variable value short unexistingValue = (short)9999; execution = runtimeService.createExecutionQuery().variableValueEquals("shortVar", unexistingValue).singleResult(); - Assert.assertNull(execution); + assertNull(execution); // Test NOT_EQUALS execution = runtimeService.createExecutionQuery().variableValueNotEquals("shortVar", (short)1234).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); // Test GREATER_THAN execution = runtimeService.createExecutionQuery().variableValueGreaterThan("shortVar", (short)4444).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("shortVar", (short)5555).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("shortVar",(short)1).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("shortVar", (short)5555).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("shortVar",(short)1).count()); // Test GREATER_THAN_OR_EQUAL execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("shortVar", (short)4444).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("shortVar", (short)5555).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("shortVar",(short)1).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("shortVar",(short)1).count()); // Test LESS_THAN executions = runtimeService.createExecutionQuery().variableValueLessThan("shortVar", (short)5555).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); assertTrue(ids.isEmpty()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("shortVar", (short)1234).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("shortVar",(short)6666).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("shortVar", (short)1234).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("shortVar",(short)6666).count()); // Test LESS_THAN_OR_EQUAL executions = runtimeService.createExecutionQuery().variableValueLessThanOrEqual("shortVar", (short)5555).list(); - Assert.assertEquals(3, executions.size()); + assertEquals(3, executions.size()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("shortVar", (short)1233).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("shortVar", (short)1233).count()); // Test value-only matching execution = runtimeService.createExecutionQuery().variableValueEquals((short)5555).singleResult(); @@ -720,7 +718,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), execution.getId()); executions = runtimeService.createExecutionQuery().variableValueEquals((short)1234).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -770,61 +768,61 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Query on single short variable, should result in 2 matches ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("dateVar", date1); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(2, executions.size()); + assertNotNull(executions); + assertEquals(2, executions.size()); // Query on two short variables, should result in single value query = runtimeService.createExecutionQuery().variableValueEquals("dateVar", date1).variableValueEquals("dateVar2", date2); Execution execution = query.singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance2.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance2.getId(), execution.getId()); // Query with unexisting variable value Date unexistingDate = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss").parse("01/01/1989 12:00:00"); execution = runtimeService.createExecutionQuery().variableValueEquals("dateVar", unexistingDate).singleResult(); - Assert.assertNull(execution); + assertNull(execution); // Test NOT_EQUALS execution = runtimeService.createExecutionQuery().variableValueNotEquals("dateVar", date1).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); // Test GREATER_THAN execution = runtimeService.createExecutionQuery().variableValueGreaterThan("dateVar", nextMonth.getTime()).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("dateVar", nextYear.getTime()).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("dateVar", oneYearAgo.getTime()).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueGreaterThan("dateVar", nextYear.getTime()).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThan("dateVar", oneYearAgo.getTime()).count()); // Test GREATER_THAN_OR_EQUAL execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("dateVar", nextMonth.getTime()).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); execution = runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("dateVar", nextYear.getTime()).singleResult(); - Assert.assertNotNull(execution); - Assert.assertEquals(processInstance3.getId(), execution.getId()); + assertNotNull(execution); + assertEquals(processInstance3.getId(), execution.getId()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("dateVar",oneYearAgo.getTime()).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueGreaterThanOrEqual("dateVar",oneYearAgo.getTime()).count()); // Test LESS_THAN executions = runtimeService.createExecutionQuery().variableValueLessThan("dateVar", nextYear.getTime()).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); List expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); List ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); assertTrue(ids.isEmpty()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("dateVar", date1).count()); - Assert.assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("dateVar", twoYearsLater.getTime()).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThan("dateVar", date1).count()); + assertEquals(3, runtimeService.createExecutionQuery().variableValueLessThan("dateVar", twoYearsLater.getTime()).count()); // Test LESS_THAN_OR_EQUAL executions = runtimeService.createExecutionQuery().variableValueLessThanOrEqual("dateVar", nextYear.getTime()).list(); - Assert.assertEquals(3, executions.size()); + assertEquals(3, executions.size()); - Assert.assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("dateVar", oneYearAgo.getTime()).count()); + assertEquals(0, runtimeService.createExecutionQuery().variableValueLessThanOrEqual("dateVar", oneYearAgo.getTime()).count()); // Test value-only matching execution = runtimeService.createExecutionQuery().variableValueEquals(nextYear.getTime()).singleResult(); @@ -832,7 +830,7 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), execution.getId()); executions = runtimeService.createExecutionQuery().variableValueEquals(date1).list(); - Assert.assertEquals(2, executions.size()); + assertEquals(2, executions.size()); expecedIds = Arrays.asList(processInstance1.getId(), processInstance2.getId()); ids = new ArrayList(Arrays.asList(executions.get(0).getId(), executions.get(1).getId())); ids.removeAll(expecedIds); @@ -996,16 +994,16 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { // Query on null value, should return one value ExecutionQuery query = runtimeService.createExecutionQuery().variableValueEquals("nullVar", null); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(1, executions.size()); - Assert.assertEquals(processInstance1.getId(), executions.get(0).getId()); + assertNotNull(executions); + assertEquals(1, executions.size()); + assertEquals(processInstance1.getId(), executions.get(0).getId()); // Test NOT_EQUALS null - Assert.assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVar", null).count()); - Assert.assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVarLong", null).count()); - Assert.assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVarDouble", null).count()); + assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVar", null).count()); + assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVarLong", null).count()); + assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVarDouble", null).count()); // When a byte-array refrence is present, the variable is not considered null - Assert.assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVarByte", null).count()); + assertEquals(1, runtimeService.createExecutionQuery().variableValueNotEquals("nullVarByte", null).count()); // Test value-only matching @@ -1160,9 +1158,9 @@ public class ExecutionQueryTest extends PluggableActivitiTestCase { .variableValueEquals("shortVar", (short) 123); List executions = query.list(); - Assert.assertNotNull(executions); - Assert.assertEquals(1, executions.size()); - Assert.assertEquals(processInstance.getId(), executions.get(0).getId()); + assertNotNull(executions); + assertEquals(1, executions.size()); + assertEquals(processInstance.getId(), executions.get(0).getId()); runtimeService.deleteProcessInstance(processInstance.getId(), "test"); }