From 62c7925f7a0eb31345fce0e8c4ba93eac7643318 Mon Sep 17 00:00:00 2001 From: discolo Date: Sun, 19 May 2013 12:04:29 +0200 Subject: [PATCH] removed unused imports, removed duplicated dependency, removed scope from parent pom, updated deprecated use of Asserts --- .../language/xml/CompleteConverterTest.java | 1 - modules/activiti-cdi/pom.xml | 2 - .../engine/test/api/mgmt/JobQueryTest.java | 4 +- .../api/repository/RepositoryServiceTest.java | 2 - .../api/runtime/ProcessInstanceQueryTest.java | 270 +++++++++--------- .../event/error/BoundaryErrorEventTest.java | 1 - .../event/timer/BoundaryTimerEventTest.java | 2 +- ...BoundaryTimerNonInterruptingEventTest.java | 2 - .../bpmn/gateway/ParallelGatewayTest.java | 2 +- .../engine/test/bpmn/java/EventJavaTest.java | 3 - .../bpmn/multiinstance/MultiInstanceTest.java | 6 - .../engine/test/bpmn/parse/BpmnParseTest.java | 2 - .../servicetask/RepeatingServiceTaskTest.java | 3 - .../bpmn/scripttask/ScriptTaskTest.java | 2 +- .../examples/bpmn/shell/ShellTaskTest.java | 1 - .../calendar/CycleBusinessCalendarTest.java | 7 +- .../calendar/DurationHelperTest.java | 11 +- .../standalone/history/FullHistoryTest.java | 4 +- .../idgenerator/UuidGeneratorTest.java | 1 - .../standalone/jpa/JPAVariableTest.java | 30 +- modules/activiti-explorer/pom.xml | 1 + .../activiti/osgi/BarDeploymentListener.java | 14 +- modules/activiti-webapp-angular/pom.xml | 2 +- pom.xml | 21 +- 24 files changed, 179 insertions(+), 215 deletions(-) diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/CompleteConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/CompleteConverterTest.java index 174df9cb4f..67e8856688 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/CompleteConverterTest.java +++ b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/CompleteConverterTest.java @@ -38,7 +38,6 @@ public class CompleteConverterTest extends AbstractConverterTest { assertNotNull(flowElement); assertTrue(flowElement instanceof UserTask); assertEquals("userTask1", flowElement.getId()); - UserTask userTask = (UserTask) flowElement; flowElement = model.getMainProcess().getFlowElement("catchsignal"); assertNotNull(flowElement); diff --git a/modules/activiti-cdi/pom.xml b/modules/activiti-cdi/pom.xml index 58c0216e9b..34baa435aa 100644 --- a/modules/activiti-cdi/pom.xml +++ b/modules/activiti-cdi/pom.xml @@ -60,7 +60,6 @@ org.jboss.arquillian.container arquillian-weld-ee-embedded-1.1 - 1.0.0.CR3 test @@ -120,7 +119,6 @@ org.jboss.arquillian.junit arquillian-junit-container - 1.0.0.CR7 test diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/JobQueryTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/JobQueryTest.java index 1c086fcf96..50853a6a23 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/JobQueryTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/mgmt/JobQueryTest.java @@ -392,9 +392,9 @@ public class JobQueryTest extends PluggableActivitiTestCase { verifyQueryResults(query, 1); Job failedJob = query.singleResult(); - Assert.assertNotNull(failedJob); + assertNotNull(failedJob); assertEquals(processInstance.getId(), failedJob.getProcessInstanceId()); - Assert.assertNotNull(failedJob.getExceptionMessage()); + assertNotNull(failedJob.getExceptionMessage()); assertTextPresent(EXCEPTION_MESSAGE, failedJob.getExceptionMessage()); } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/RepositoryServiceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/RepositoryServiceTest.java index 0199d3e80f..eb7d85e0b0 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/RepositoryServiceTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/RepositoryServiceTest.java @@ -29,8 +29,6 @@ import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.ActivitiObjectNotFoundException; import org.activiti.engine.impl.RepositoryServiceImpl; -import org.activiti.engine.impl.cmd.DeleteDeploymentCmd; -import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity; import org.activiti.engine.impl.test.PluggableActivitiTestCase; import org.activiti.engine.impl.util.ClockUtil; import org.activiti.engine.repository.Model; diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceQueryTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceQueryTest.java index b1e206ca27..cb208bb6b3 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceQueryTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceQueryTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.Assert; - import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.impl.test.PluggableActivitiTestCase; @@ -252,27 +250,27 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Test EQUAL on single string variable, should result in 2 matches ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().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 = runtimeService.createProcessInstanceQuery().variableValueEquals("stringVar", "abcdef").variableValueEquals("stringVar2", "ghijkl"); ProcessInstance 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 = runtimeService.createProcessInstanceQuery().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 = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("stringVar", "abcdef").singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("stringVar", "z").singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test GREATER_THAN_OR_EQUAL, should return 3 results assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("stringVar", "abcdef").count()); @@ -280,7 +278,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Test LESS_THAN, should return 2 results processInstances = runtimeService.createProcessInstanceQuery().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); @@ -291,7 +289,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Test LESS_THAN_OR_EQUAL processInstances = runtimeService.createProcessInstanceQuery().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); @@ -322,7 +320,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = runtimeService.createProcessInstanceQuery().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); @@ -355,60 +353,60 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Query on single long variable, should result in 2 matches ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().variableValueEquals("longVar", 12345L); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(2, processInstances.size()); + assertNotNull(processInstances); + assertEquals(2, processInstances.size()); // Query on two long variables, should result in single match query = runtimeService.createProcessInstanceQuery().variableValueEquals("longVar", 12345L).variableValueEquals("longVar2", 67890L); ProcessInstance resultInstance = query.singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance2.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance2.getId(), resultInstance.getId()); // Query with unexisting variable value resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals("longVar", 999L).singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test NOT_EQUALS resultInstance = runtimeService.createProcessInstanceQuery().variableValueNotEquals("longVar", 12345L).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("longVar", 44444L).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("longVar", 55555L).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("longVar",1L).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("longVar", 55555L).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("longVar",1L).count()); // Test GREATER_THAN_OR_EQUAL resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("longVar", 44444L).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("longVar", 55555L).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("longVar",1L).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("longVar",1L).count()); // Test LESS_THAN processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThan("longVar", 55555L).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, runtimeService.createProcessInstanceQuery().variableValueLessThan("longVar", 12345L).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("longVar",66666L).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThan("longVar", 12345L).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("longVar",66666L).count()); // Test LESS_THAN_OR_EQUAL processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("longVar", 55555L).list(); - Assert.assertEquals(3, processInstances.size()); + assertEquals(3, processInstances.size()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("longVar", 12344L).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("longVar", 12344L).count()); // Test value-only matching resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals(55555L).singleResult(); @@ -416,7 +414,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = runtimeService.createProcessInstanceQuery().variableValueEquals(12345L).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); @@ -449,60 +447,60 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Query on single double variable, should result in 2 matches ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().variableValueEquals("doubleVar", 12345.6789); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(2, processInstances.size()); + assertNotNull(processInstances); + assertEquals(2, processInstances.size()); // Query on two double variables, should result in single value query = runtimeService.createProcessInstanceQuery().variableValueEquals("doubleVar", 12345.6789).variableValueEquals("doubleVar2", 9876.54321); ProcessInstance resultInstance = query.singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance2.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance2.getId(), resultInstance.getId()); // Query with unexisting variable value resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals("doubleVar", 9999.99).singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test NOT_EQUALS resultInstance = runtimeService.createProcessInstanceQuery().variableValueNotEquals("doubleVar", 12345.6789).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("doubleVar", 44444.4444).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("doubleVar", 55555.5555).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("doubleVar",1.234).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("doubleVar", 55555.5555).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("doubleVar",1.234).count()); // Test GREATER_THAN_OR_EQUAL resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("doubleVar", 44444.4444).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("doubleVar", 55555.5555).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("doubleVar",1.234).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("doubleVar",1.234).count()); // Test LESS_THAN processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThan("doubleVar", 55555.5555).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, runtimeService.createProcessInstanceQuery().variableValueLessThan("doubleVar", 12345.6789).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("doubleVar",66666.6666).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThan("doubleVar", 12345.6789).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("doubleVar",66666.6666).count()); // Test LESS_THAN_OR_EQUAL processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("doubleVar", 55555.5555).list(); - Assert.assertEquals(3, processInstances.size()); + assertEquals(3, processInstances.size()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("doubleVar", 12344.6789).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("doubleVar", 12344.6789).count()); // Test value-only matching resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals(55555.5555).singleResult(); @@ -510,7 +508,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = runtimeService.createProcessInstanceQuery().variableValueEquals(12345.6789).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); @@ -543,60 +541,60 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Query on single integer variable, should result in 2 matches ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().variableValueEquals("integerVar", 12345); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(2, processInstances.size()); + assertNotNull(processInstances); + assertEquals(2, processInstances.size()); // Query on two integer variables, should result in single value query = runtimeService.createProcessInstanceQuery().variableValueEquals("integerVar", 12345).variableValueEquals("integerVar2", 67890); ProcessInstance resultInstance = query.singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance2.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance2.getId(), resultInstance.getId()); // Query with unexisting variable value resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals("integerVar", 9999).singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test NOT_EQUALS resultInstance = runtimeService.createProcessInstanceQuery().variableValueNotEquals("integerVar", 12345).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("integerVar", 44444).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("integerVar", 55555).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("integerVar",1).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("integerVar", 55555).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("integerVar",1).count()); // Test GREATER_THAN_OR_EQUAL resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("integerVar", 44444).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("integerVar", 55555).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("integerVar",1).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("integerVar",1).count()); // Test LESS_THAN processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThan("integerVar", 55555).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, runtimeService.createProcessInstanceQuery().variableValueLessThan("integerVar", 12345).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("integerVar",66666).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThan("integerVar", 12345).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("integerVar",66666).count()); // Test LESS_THAN_OR_EQUAL processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("integerVar", 55555).list(); - Assert.assertEquals(3, processInstances.size()); + assertEquals(3, processInstances.size()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("integerVar", 12344).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("integerVar", 12344).count()); // Test value-only matching resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals(55555).singleResult(); @@ -604,7 +602,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = runtimeService.createProcessInstanceQuery().variableValueEquals(12345).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); @@ -639,61 +637,61 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Query on single short variable, should result in 2 matches ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().variableValueEquals("shortVar", shortVar); 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 = runtimeService.createProcessInstanceQuery().variableValueEquals("shortVar", shortVar).variableValueEquals("shortVar2", shortVar2); ProcessInstance resultInstance = query.singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance2.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance2.getId(), resultInstance.getId()); // Query with unexisting variable value short unexistingValue = (short)9999; resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals("shortVar", unexistingValue).singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test NOT_EQUALS resultInstance = runtimeService.createProcessInstanceQuery().variableValueNotEquals("shortVar", (short)1234).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("shortVar", (short)4444).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("shortVar", (short)5555).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("shortVar",(short)1).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("shortVar", (short)5555).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("shortVar",(short)1).count()); // Test GREATER_THAN_OR_EQUAL resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("shortVar", (short)4444).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("shortVar", (short)5555).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("shortVar",(short)1).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("shortVar",(short)1).count()); // Test LESS_THAN processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThan("shortVar", (short)5555).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, runtimeService.createProcessInstanceQuery().variableValueLessThan("shortVar", (short)1234).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("shortVar",(short)6666).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThan("shortVar", (short)1234).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("shortVar",(short)6666).count()); // Test LESS_THAN_OR_EQUAL processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("shortVar", (short)5555).list(); - Assert.assertEquals(3, processInstances.size()); + assertEquals(3, processInstances.size()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("shortVar", (short)1233).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("shortVar", (short)1233).count()); // Test value-only matching resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals((short) 5555).singleResult(); @@ -701,7 +699,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = runtimeService.createProcessInstanceQuery().variableValueEquals((short)1234).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); @@ -751,61 +749,61 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Query on single short variable, should result in 2 matches ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().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 = runtimeService.createProcessInstanceQuery().variableValueEquals("dateVar", date1).variableValueEquals("dateVar2", date2); ProcessInstance 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 = runtimeService.createProcessInstanceQuery().variableValueEquals("dateVar", unexistingDate).singleResult(); - Assert.assertNull(resultInstance); + assertNull(resultInstance); // Test NOT_EQUALS resultInstance = runtimeService.createProcessInstanceQuery().variableValueNotEquals("dateVar", date1).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); // Test GREATER_THAN resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThan("dateVar", nextMonth.getTime()).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("dateVar", nextYear.getTime()).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("dateVar", oneYearAgo.getTime()).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("dateVar", nextYear.getTime()).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThan("dateVar", oneYearAgo.getTime()).count()); // Test GREATER_THAN_OR_EQUAL resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar", nextMonth.getTime()).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); resultInstance = runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar", nextYear.getTime()).singleResult(); - Assert.assertNotNull(resultInstance); - Assert.assertEquals(processInstance3.getId(), resultInstance.getId()); + assertNotNull(resultInstance); + assertEquals(processInstance3.getId(), resultInstance.getId()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar",oneYearAgo.getTime()).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueGreaterThanOrEqual("dateVar",oneYearAgo.getTime()).count()); // Test LESS_THAN processInstances = runtimeService.createProcessInstanceQuery().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, runtimeService.createProcessInstanceQuery().variableValueLessThan("dateVar", date1).count()); - Assert.assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("dateVar", twoYearsLater.getTime()).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThan("dateVar", date1).count()); + assertEquals(3, runtimeService.createProcessInstanceQuery().variableValueLessThan("dateVar", twoYearsLater.getTime()).count()); // Test LESS_THAN_OR_EQUAL processInstances = runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("dateVar", nextYear.getTime()).list(); - Assert.assertEquals(3, processInstances.size()); + assertEquals(3, processInstances.size()); - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("dateVar", oneYearAgo.getTime()).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueLessThanOrEqual("dateVar", oneYearAgo.getTime()).count()); // Test value-only matching resultInstance = runtimeService.createProcessInstanceQuery().variableValueEquals(nextYear.getTime()).singleResult(); @@ -813,7 +811,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { assertEquals(processInstance3.getId(), resultInstance.getId()); processInstances = runtimeService.createProcessInstanceQuery().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); @@ -985,19 +983,19 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { // Query on null value, should return one value ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().variableValueEquals("nullVar", null); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(1, processInstances.size()); - Assert.assertEquals(processInstance1.getId(), processInstances.get(0).getId()); + assertNotNull(processInstances); + assertEquals(1, processInstances.size()); + assertEquals(processInstance1.getId(), processInstances.get(0).getId()); // Test NOT_EQUALS null - Assert.assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVar", null).count()); - Assert.assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVarLong", null).count()); - Assert.assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVarDouble", null).count()); + assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVar", null).count()); + assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVarLong", null).count()); + assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVarDouble", null).count()); // When a byte-array refrence is present, the variable is not considered null - Assert.assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVarByte", null).count()); + assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueNotEquals("nullVarByte", null).count()); // Test value-only - Assert.assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueEquals(null).count()); + assertEquals(1, runtimeService.createProcessInstanceQuery().variableValueEquals(null).count()); // All other variable queries with null should throw exception @@ -1043,7 +1041,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { runtimeService.deleteProcessInstance(processInstance5.getId(), "test"); // Test value-only, no more null-variables exist - Assert.assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueEquals(null).count()); + assertEquals(0, runtimeService.createProcessInstanceQuery().variableValueEquals(null).count()); } @Deployment(resources={ @@ -1215,9 +1213,9 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase { .variableValueEquals("shortVar", (short) 123); List processInstances = query.list(); - Assert.assertNotNull(processInstances); - Assert.assertEquals(1, processInstances.size()); - Assert.assertEquals(processInstance.getId(), processInstances.get(0).getId()); + assertNotNull(processInstances); + assertEquals(1, processInstances.size()); + assertEquals(processInstance.getId(), processInstances.get(0).getId()); runtimeService.deleteProcessInstance(processInstance.getId(), "test"); } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/BoundaryErrorEventTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/BoundaryErrorEventTest.java index b3ec9175e2..c65b1c419e 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/BoundaryErrorEventTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/BoundaryErrorEventTest.java @@ -22,7 +22,6 @@ import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.impl.history.HistoryLevel; import org.activiti.engine.impl.test.PluggableActivitiTestCase; import org.activiti.engine.impl.util.CollectionUtil; -import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.activiti.engine.test.Deployment; diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerEventTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerEventTest.java index e8015394f1..d893999caa 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerEventTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerEventTest.java @@ -115,7 +115,7 @@ public class BoundaryTimerEventTest extends PluggableActivitiTestCase { @Deployment public void testRepeatingTimerWithCancelActivity() { - ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("repeatingTimerAndCallActivity"); + runtimeService.startProcessInstanceByKey("repeatingTimerAndCallActivity"); assertEquals(1, managementService.createJobQuery().count()); assertEquals(1, taskService.createTaskQuery().count()); diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerNonInterruptingEventTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerNonInterruptingEventTest.java index 05da825e8d..c3c9c2694f 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerNonInterruptingEventTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/BoundaryTimerNonInterruptingEventTest.java @@ -228,8 +228,6 @@ public class BoundaryTimerNonInterruptingEventTest extends PluggableActivitiTest */ public void testReceiveTaskWithBoundaryTimer(){ // Set the clock fixed - Date startTime = new Date(); - HashMap variables = new HashMap(); variables.put("timeCycle", "R/PT1H"); diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/ParallelGatewayTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/ParallelGatewayTest.java index 3cc81e8395..83914aec65 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/ParallelGatewayTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/ParallelGatewayTest.java @@ -110,7 +110,7 @@ public class ParallelGatewayTest extends PluggableActivitiTestCase { */ @Deployment public void testReceyclingExecutionWithCallActivity() { - String processInstanceId = runtimeService.startProcessInstanceByKey("parent-process").getId(); + runtimeService.startProcessInstanceByKey("parent-process"); // After process start we have two tasks, one from the parent and one from the sub process TaskQuery query = taskService.createTaskQuery().orderByTaskName().asc(); diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/java/EventJavaTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/java/EventJavaTest.java index 3f9afbf5d0..c63b7bcd72 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/java/EventJavaTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/java/EventJavaTest.java @@ -15,8 +15,6 @@ package org.activiti.engine.test.bpmn.java; import java.io.ByteArrayInputStream; -import javax.xml.stream.XMLInputFactory; - import org.activiti.bpmn.converter.BpmnXMLConverter; import org.activiti.bpmn.model.ActivitiListener; import org.activiti.bpmn.model.BpmnModel; @@ -69,7 +67,6 @@ public class EventJavaTest extends PluggableActivitiTestCase { byte[] xml = new BpmnXMLConverter().convertToXML(bpmnModel); - XMLInputFactory xif = XMLInputFactory.newInstance(); new BpmnXMLConverter().validateModel(new InputStreamSource(new ByteArrayInputStream(xml))); Deployment deployment = repositoryService.createDeployment().name("test").addString("test.bpmn20.xml", new String(xml)).deploy(); diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/multiinstance/MultiInstanceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/multiinstance/MultiInstanceTest.java index d17548712c..8e7786516e 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/multiinstance/MultiInstanceTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/multiinstance/MultiInstanceTest.java @@ -24,13 +24,7 @@ import java.util.Map; import org.activiti.engine.history.HistoricActivityInstance; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricTaskInstance; -import org.activiti.engine.impl.context.Context; import org.activiti.engine.impl.history.HistoryLevel; -import org.activiti.engine.impl.interceptor.Command; -import org.activiti.engine.impl.interceptor.CommandContext; -import org.activiti.engine.impl.interceptor.CommandExecutor; -import org.activiti.engine.impl.persistence.entity.IdentityLinkEntity; -import org.activiti.engine.impl.persistence.entity.IdentityLinkEntityManager; import org.activiti.engine.impl.test.PluggableActivitiTestCase; import org.activiti.engine.impl.util.ClockUtil; import org.activiti.engine.impl.util.CollectionUtil; diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/parse/BpmnParseTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/parse/BpmnParseTest.java index c8419d0f35..c58ec559f3 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/parse/BpmnParseTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/parse/BpmnParseTest.java @@ -16,7 +16,6 @@ package org.activiti.engine.test.bpmn.parse; import java.util.List; import org.activiti.engine.ActivitiException; -import org.activiti.engine.impl.RepositoryServiceImpl; import org.activiti.engine.impl.context.Context; import org.activiti.engine.impl.interceptor.Command; import org.activiti.engine.impl.interceptor.CommandContext; @@ -24,7 +23,6 @@ import org.activiti.engine.impl.interceptor.CommandExecutor; import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity; import org.activiti.engine.impl.pvm.PvmTransition; import org.activiti.engine.impl.pvm.process.ActivityImpl; -import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl; import org.activiti.engine.impl.pvm.process.TransitionImpl; import org.activiti.engine.impl.test.PluggableActivitiTestCase; import org.activiti.engine.impl.test.TestHelper; diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/servicetask/RepeatingServiceTaskTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/servicetask/RepeatingServiceTaskTest.java index 30d0cc04b9..0b2adc3ecb 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/servicetask/RepeatingServiceTaskTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/servicetask/RepeatingServiceTaskTest.java @@ -14,9 +14,6 @@ package org.activiti.engine.test.bpmn.servicetask; import org.activiti.engine.impl.test.PluggableActivitiTestCase; -import org.activiti.engine.impl.util.CollectionUtil; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.Deployment; /** diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java index af8c0340ec..195eb7a82f 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java @@ -88,7 +88,7 @@ public class ScriptTaskTest extends PluggableActivitiTestCase { } } - protected void verifyExceptionInStacktrace(Exception rootExcepton, Class expectedExceptionClass) { + protected void verifyExceptionInStacktrace(Exception rootExcepton, Class expectedExceptionClass) { Throwable expectedException = rootExcepton; boolean found = false; while (!found && expectedException != null) { diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/shell/ShellTaskTest.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/shell/ShellTaskTest.java index 258a53b58d..119726c762 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/shell/ShellTaskTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/shell/ShellTaskTest.java @@ -3,7 +3,6 @@ package org.activiti.examples.bpmn.shell; import org.activiti.engine.impl.test.PluggableActivitiTestCase; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.test.Deployment; -import org.junit.Assume; import org.junit.Test; public class ShellTaskTest extends PluggableActivitiTestCase { diff --git a/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/CycleBusinessCalendarTest.java b/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/CycleBusinessCalendarTest.java index 84ad30262f..e936a322bb 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/CycleBusinessCalendarTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/CycleBusinessCalendarTest.java @@ -13,14 +13,13 @@ package org.activiti.standalone.calendar; +import java.text.SimpleDateFormat; +import java.util.Date; + import org.activiti.engine.impl.calendar.CycleBusinessCalendar; -import org.activiti.engine.impl.calendar.DurationBusinessCalendar; import org.activiti.engine.impl.test.PvmTestCase; import org.activiti.engine.impl.util.ClockUtil; -import java.text.SimpleDateFormat; -import java.util.Date; - public class CycleBusinessCalendarTest extends PvmTestCase { public void testSimpleCron() throws Exception { diff --git a/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/DurationHelperTest.java b/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/DurationHelperTest.java index 366af7e0ae..235941dfd9 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/DurationHelperTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/DurationHelperTest.java @@ -14,15 +14,16 @@ package org.activiti.standalone.calendar; -import org.activiti.engine.impl.calendar.DurationHelper; -import org.activiti.engine.impl.util.ClockUtil; -import org.junit.Test; +import static groovy.util.GroovyTestCase.assertEquals; +import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertNull; import java.text.SimpleDateFormat; import java.util.Date; -import static groovy.util.GroovyTestCase.assertEquals; -import static junit.framework.Assert.assertNull; +import org.activiti.engine.impl.calendar.DurationHelper; +import org.activiti.engine.impl.util.ClockUtil; +import org.junit.Test; public class DurationHelperTest { diff --git a/modules/activiti-engine/src/test/java/org/activiti/standalone/history/FullHistoryTest.java b/modules/activiti-engine/src/test/java/org/activiti/standalone/history/FullHistoryTest.java index 8403252b8c..e727d6b6ea 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/standalone/history/FullHistoryTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/standalone/history/FullHistoryTest.java @@ -23,8 +23,6 @@ import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.Assert; - import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.history.HistoricActivityInstance; @@ -915,7 +913,7 @@ public class FullHistoryTest extends ResourceActivitiTestCase { assertEquals(2, details.size()); // Should have 2 different historic activity instance ID's, with the same activityId - Assert.assertNotSame(details.get(0).getActivityInstanceId(), details.get(1).getActivityInstanceId()); + assertNotSame(details.get(0).getActivityInstanceId(), details.get(1).getActivityInstanceId()); HistoricActivityInstance historicActInst1 = historyService.createHistoricActivityInstanceQuery() .activityInstanceId(details.get(0).getActivityInstanceId()) diff --git a/modules/activiti-engine/src/test/java/org/activiti/standalone/idgenerator/UuidGeneratorTest.java b/modules/activiti-engine/src/test/java/org/activiti/standalone/idgenerator/UuidGeneratorTest.java index eb197371e4..5dd94e8bab 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/standalone/idgenerator/UuidGeneratorTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/standalone/idgenerator/UuidGeneratorTest.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import org.activiti.engine.impl.test.ResourceActivitiTestCase; import org.activiti.engine.task.Task; diff --git a/modules/activiti-engine/src/test/java/org/activiti/standalone/jpa/JPAVariableTest.java b/modules/activiti-engine/src/test/java/org/activiti/standalone/jpa/JPAVariableTest.java index 53c44ff051..0a2c9b2b57 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/standalone/jpa/JPAVariableTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/standalone/jpa/JPAVariableTest.java @@ -24,8 +24,6 @@ import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.Assert; - import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiIllegalArgumentException; import org.activiti.engine.ProcessEngine; @@ -223,27 +221,27 @@ public class JPAVariableTest extends AbstractActivitiTestCase { // Read entity with @Id on field Object fieldAccessResult = runtimeService.getVariable(processInstance.getId(), "simpleEntityFieldAccess"); - Assert.assertTrue(fieldAccessResult instanceof FieldAccessJPAEntity); - Assert.assertEquals(1L, ((FieldAccessJPAEntity)fieldAccessResult).getId().longValue()); - Assert.assertEquals("value1", ((FieldAccessJPAEntity)fieldAccessResult).getValue()); + assertTrue(fieldAccessResult instanceof FieldAccessJPAEntity); + assertEquals(1L, ((FieldAccessJPAEntity)fieldAccessResult).getId().longValue()); + assertEquals("value1", ((FieldAccessJPAEntity)fieldAccessResult).getValue()); // Read entity with @Id on property Object propertyAccessResult = runtimeService.getVariable(processInstance.getId(), "simpleEntityPropertyAccess"); - Assert.assertTrue(propertyAccessResult instanceof PropertyAccessJPAEntity); - Assert.assertEquals(1L, ((PropertyAccessJPAEntity)propertyAccessResult).getId().longValue()); - Assert.assertEquals("value2", ((PropertyAccessJPAEntity)propertyAccessResult).getValue()); + assertTrue(propertyAccessResult instanceof PropertyAccessJPAEntity); + assertEquals(1L, ((PropertyAccessJPAEntity)propertyAccessResult).getId().longValue()); + assertEquals("value2", ((PropertyAccessJPAEntity)propertyAccessResult).getValue()); // Read entity with @Id on field of mapped superclass Object subclassFieldResult = runtimeService.getVariable(processInstance.getId(), "subclassFieldAccess"); - Assert.assertTrue(subclassFieldResult instanceof SubclassFieldAccessJPAEntity); - Assert.assertEquals(1L, ((SubclassFieldAccessJPAEntity)subclassFieldResult).getId().longValue()); - Assert.assertEquals("value3", ((SubclassFieldAccessJPAEntity)subclassFieldResult).getValue()); + assertTrue(subclassFieldResult instanceof SubclassFieldAccessJPAEntity); + assertEquals(1L, ((SubclassFieldAccessJPAEntity)subclassFieldResult).getId().longValue()); + assertEquals("value3", ((SubclassFieldAccessJPAEntity)subclassFieldResult).getValue()); // Read entity with @Id on property of mapped superclass Object subclassPropertyResult = runtimeService.getVariable(processInstance.getId(), "subclassPropertyAccess"); - Assert.assertTrue(subclassPropertyResult instanceof SubclassPropertyAccessJPAEntity); - Assert.assertEquals(1L, ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getId().longValue()); - Assert.assertEquals("value4", ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getValue()); + assertTrue(subclassPropertyResult instanceof SubclassPropertyAccessJPAEntity); + assertEquals(1L, ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getId().longValue()); + assertEquals("value4", ((SubclassPropertyAccessJPAEntity)subclassPropertyResult).getValue()); // ----------------------------------------------------------------------------- // Test updating JPA-entity to null-value and back again @@ -258,8 +256,8 @@ public class JPAVariableTest extends AbstractActivitiTestCase { runtimeService.setVariable(processInstance.getId(), "simpleEntityFieldAccess", simpleEntityFieldAccess); currentValue = runtimeService.getVariable(processInstance.getId(), "simpleEntityFieldAccess"); assertNotNull(currentValue); - Assert.assertTrue(currentValue instanceof FieldAccessJPAEntity); - Assert.assertEquals(1L, ((FieldAccessJPAEntity)currentValue).getId().longValue()); + assertTrue(currentValue instanceof FieldAccessJPAEntity); + assertEquals(1L, ((FieldAccessJPAEntity)currentValue).getId().longValue()); // ----------------------------------------------------------------------------- diff --git a/modules/activiti-explorer/pom.xml b/modules/activiti-explorer/pom.xml index 870422de8e..a7b4048d43 100644 --- a/modules/activiti-explorer/pom.xml +++ b/modules/activiti-explorer/pom.xml @@ -73,6 +73,7 @@ com.google.gwt gwt-user + provided diff --git a/modules/activiti-osgi/src/main/java/org/activiti/osgi/BarDeploymentListener.java b/modules/activiti-osgi/src/main/java/org/activiti/osgi/BarDeploymentListener.java index 77f0165874..76a10409d6 100644 --- a/modules/activiti-osgi/src/main/java/org/activiti/osgi/BarDeploymentListener.java +++ b/modules/activiti-osgi/src/main/java/org/activiti/osgi/BarDeploymentListener.java @@ -16,6 +16,7 @@ import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME; import static org.osgi.framework.Constants.BUNDLE_VERSION; import java.io.File; +import java.io.IOException; import java.net.URL; import java.util.jar.Attributes; import java.util.jar.JarFile; @@ -42,11 +43,12 @@ public class BarDeploymentListener implements ArtifactUrlTransformer { } public boolean canHandle(File artifact) { - try { + JarFile jar = null; + try { if (!artifact.getName().endsWith(".bar")) { return false; } - JarFile jar = new JarFile(artifact); + jar = new JarFile(artifact); // Only handle non OSGi bundles Manifest m = jar.getManifest(); if (m!= null && m.getMainAttributes().getValue( @@ -58,6 +60,14 @@ public class BarDeploymentListener implements ArtifactUrlTransformer { return true; } catch (Exception e) { return false; + } finally { + if(jar != null) { + try { + jar.close(); + } catch (IOException e) { + LOGGER.error("Unable to close jar", e); + } + } } } diff --git a/modules/activiti-webapp-angular/pom.xml b/modules/activiti-webapp-angular/pom.xml index 5c8ff4a554..ee7e9588b8 100644 --- a/modules/activiti-webapp-angular/pom.xml +++ b/modules/activiti-webapp-angular/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.12.1 + 5.13-SNAPSHOT diff --git a/pom.xml b/pom.xml index a7855534c5..3b640327d4 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,6 @@ com.oracle.jdbc ojdbc5 11.2.0.1.0 - test com.sun.xml.bind @@ -141,7 +140,6 @@ javax.persistence persistence-api 1.0 - provided javax.xml.bind @@ -157,19 +155,11 @@ mysql mysql-connector-java 5.1.21 - test - - - net.sourceforge.jtds - jtds - 1.2.4 - test com.ibm.db2.jcc db2jcc4 10.1 - test org.activiti @@ -283,7 +273,6 @@ org.apache.openjpa openjpa 1.2.2 - test commons-logging @@ -330,19 +319,16 @@ org.mockito mockito-core 1.8.2 - test org.osgi org.osgi.core 4.2.0 - provided org.osgi org.osgi.compendium 4.2.0 - provided org.apache.felix @@ -425,7 +411,6 @@ org.subethamail subethasmtp-wiser 1.2 - test commons-logging @@ -437,7 +422,6 @@ postgresql postgresql 9.0-802.jdbc4 - test wsdl4j @@ -515,7 +499,6 @@ com.google.gwt gwt-user 2.3.0 - provided com.google.gwt @@ -526,7 +509,7 @@ org.apache.camel camel-spring - 2.10.0 + 2.11.0 @@ -543,7 +526,7 @@ net.sourceforge.jtds jtds - 1.2.5 + 1.3.0 -- GitLab