Test cleanup pull request + Task query test fix

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/AbstractConverterTest.java

@@ -17,8 +17,7 @@ public abstract class AbstractConverterTest {
     XMLInputFactory xif = XMLInputFactory.newInstance();
     InputStreamReader in = new InputStreamReader(xmlStream, "UTF-8");
     XMLStreamReader xtr = xif.createXMLStreamReader(in);
-    BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
-    return bpmnModel;
+    return new BpmnXMLConverter().convertToBpmnModel(xtr);
   }
   
   protected BpmnModel exportAndReadXMLFile(BpmnModel bpmnModel) throws Exception {
@@ -27,8 +26,7 @@ public abstract class AbstractConverterTest {
     XMLInputFactory xif = XMLInputFactory.newInstance();
     InputStreamReader in = new InputStreamReader(new ByteArrayInputStream(xml), "UTF-8");
     XMLStreamReader xtr = xif.createXMLStreamReader(in);
-    BpmnModel parsedModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
-    return parsedModel;
+    return new BpmnXMLConverter().convertToBpmnModel(xtr);
   }
   
   protected void deployProcess(BpmnModel bpmnModel)  {

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java

@@ -17,7 +17,7 @@ import org.activiti.bpmn.model.ValuedDataObject;
 import org.junit.Test;
 
 /**
- * @see http://jira.codehaus.org/browse/ACT-1847
+ * @see <a href="http://jira.codehaus.org/browse/ACT-1847">http://jira.codehaus.org/browse/ACT-1847</a>
  */
 public class DataObjectConverterTest extends AbstractConverterTest {
 

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/EventBasedGatewayConverterTest.java

@@ -37,7 +37,7 @@ public class EventBasedGatewayConverterTest extends AbstractConverterTest {
     EventGateway gateway = (EventGateway) flowElement;
     List<ActivitiListener> listeners = gateway.getExecutionListeners();
     assertEquals(1, listeners.size());
-    ActivitiListener listener = (ActivitiListener) listeners.get(0);
+    ActivitiListener listener = listeners.get(0);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_CLASS.equals(listener.getImplementationType()));
     assertEquals("org.test.TestClass", listener.getImplementation());
     assertEquals("start", listener.getEvent());

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ServiceTaskConverterTest.java

@@ -45,24 +45,24 @@ public class ServiceTaskConverterTest extends AbstractConverterTest {
     
     List<FieldExtension> fields = serviceTask.getFieldExtensions();
     assertEquals(2, fields.size());
-    FieldExtension field = (FieldExtension) fields.get(0);
+    FieldExtension field = fields.get(0);
     assertEquals("testField", field.getFieldName());
     assertEquals("test", field.getStringValue());
-    field = (FieldExtension) fields.get(1);
+    field = fields.get(1);
     assertEquals("testField2", field.getFieldName());
     assertEquals("${test}", field.getExpression());
     
     List<ActivitiListener> listeners = serviceTask.getExecutionListeners();
     assertEquals(3, listeners.size());
-    ActivitiListener listener = (ActivitiListener) listeners.get(0);
+    ActivitiListener listener = listeners.get(0);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_CLASS.equals(listener.getImplementationType()));
     assertEquals("org.test.TestClass", listener.getImplementation());
     assertEquals("start", listener.getEvent());
-    listener = (ActivitiListener) listeners.get(1);
+    listener = listeners.get(1);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_EXPRESSION.equals(listener.getImplementationType()));
     assertEquals("${testExpression}", listener.getImplementation());
     assertEquals("end", listener.getEvent());
-    listener = (ActivitiListener) listeners.get(2);
+    listener = listeners.get(2);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION.equals(listener.getImplementationType()));
     assertEquals("${delegateExpression}", listener.getImplementation());
     assertEquals("start", listener.getEvent());

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/SubProcessWithExtensionsConverterTest.java

@@ -20,7 +20,7 @@ import org.activiti.bpmn.model.ValuedDataObject;
 import org.junit.Test;
 
 /**
- * @see http://jira.codehaus.org/browse/ACT-2055
+ * @see <a href="http://jira.codehaus.org/browse/ACT-2055">http://jira.codehaus.org/browse/ACT-2055</a>
  */
 public class SubProcessWithExtensionsConverterTest extends AbstractConverterTest {
   
@@ -209,6 +209,6 @@ public class SubProcessWithExtensionsConverterTest extends AbstractConverterTest
       localization.setResourceBundleKeyForDescription(extensionAttributes.get(ATTRIBUTE_RESOURCE_BUNDLE_KEY_FOR_DESCRIPTION)
               .get(0).getValue());
     }
-    return (Localization) localization;
+    return localization;
   }
 }

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/UserTaskConverterTest.java

@@ -79,15 +79,15 @@ public class UserTaskConverterTest extends AbstractConverterTest {
     
     List<ActivitiListener> listeners = userTask.getTaskListeners();
     assertEquals(3, listeners.size());
-    ActivitiListener listener = (ActivitiListener) listeners.get(0);
+    ActivitiListener listener = listeners.get(0);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_CLASS.equals(listener.getImplementationType()));
     assertEquals("org.test.TestClass", listener.getImplementation());
     assertEquals("create", listener.getEvent());
-    listener = (ActivitiListener) listeners.get(1);
+    listener = listeners.get(1);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_EXPRESSION.equals(listener.getImplementationType()));
     assertEquals("${someExpression}", listener.getImplementation());
     assertEquals("assignment", listener.getEvent());
-    listener = (ActivitiListener) listeners.get(2);
+    listener = listeners.get(2);
     assertTrue(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION.equals(listener.getImplementationType()));
     assertEquals("${someDelegateExpression}", listener.getImplementation());
     assertEquals("complete", listener.getEvent());

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectWithExtensionsConverterTest.java

@@ -20,7 +20,7 @@ import org.activiti.bpmn.model.ValuedDataObject;
 import org.junit.Test;
 
 /**
- * @see http://jira.codehaus.org/browse/ACT-1847
+ * @see <a href="http://jira.codehaus.org/browse/ACT-1847">http://jira.codehaus.org/browse/ACT-1847</a>
  */
 public class ValuedDataObjectWithExtensionsConverterTest extends AbstractConverterTest {
   
@@ -183,7 +183,7 @@ public class ValuedDataObjectWithExtensionsConverterTest extends AbstractConvert
     assertEquals("BooleanTest", dataObj.getName());
     assertEquals("xsd:boolean", dataObj.getItemSubjectRef().getStructureRef());
     assertTrue(dataObj.getValue() instanceof Boolean);
-    assertEquals(new Boolean(true), dataObj.getValue());
+    assertEquals(Boolean.TRUE, dataObj.getValue());
 
     /*
      * Verify DataObject attributes extension
@@ -262,6 +262,6 @@ public class ValuedDataObjectWithExtensionsConverterTest extends AbstractConvert
       localization.setResourceBundleKeyForDescription(extensionAttributes.get(ATTRIBUTE_DATA_RESOURCE_BUNDLE_KEY_FOR_DESCRIPTION)
               .get(0).getValue());
     }
-    return (Localization) localization;
+    return localization;
   }
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/interceptor/LogInterceptor.java

@@ -30,7 +30,7 @@ public class LogInterceptor extends AbstractCommandInterceptor {
       // do nothing here if we cannot log
       return next.execute(config, command);
     }
-    log.debug("                                                                                                    ");
+    log.debug("\n");
     log.debug("--- starting {} --------------------------------------------------------", command.getClass().getSimpleName());
     try {
 
@@ -38,7 +38,7 @@ public class LogInterceptor extends AbstractCommandInterceptor {
 
     } finally {
       log.debug("--- {} finished --------------------------------------------------------", command.getClass().getSimpleName());
-      log.debug("                                                                                                    ");
+      log.debug("\n");
     }
   }
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/test/AbstractActivitiTestCase.java

@@ -145,7 +145,7 @@ public abstract class AbstractActivitiTestCase extends PvmTestCase {
       if (!TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK.contains(tableNameWithoutPrefix)) {
         Long count = tableCounts.get(tableName);
         if (count!=0L) {
-          outputMessage.append("  "+tableName + ": " + count + " record(s) ");
+          outputMessage.append("  ").append(tableName).append(": ").append(count).append(" record(s) ");
         }
       }
     }
@@ -295,7 +295,7 @@ public abstract class AbstractActivitiTestCase extends PvmTestCase {
     
     EndEvent endEvent = new EndEvent();
     endEvent.setId("theEnd");
-    process.addFlowElement(endEvent);;
+    process.addFlowElement(endEvent);
     
     process.addFlowElement(new SequenceFlow("start", "theTask"));
     process.addFlowElement(new SequenceFlow("theTask", "theEnd"));
@@ -328,7 +328,7 @@ public abstract class AbstractActivitiTestCase extends PvmTestCase {
     
     EndEvent endEvent = new EndEvent();
     endEvent.setId("theEnd");
-    process.addFlowElement(endEvent);;
+    process.addFlowElement(endEvent);
     
     process.addFlowElement(new SequenceFlow("start", "task1"));
     process.addFlowElement(new SequenceFlow("start", "task2"));

modules/activiti-engine/src/main/java/org/activiti/engine/impl/test/PvmTestCase.java

@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class PvmTestCase extends TestCase {
 
-  protected static final String EMPTY_LINE = "                                                                                           ";
+  protected static final String EMPTY_LINE = "\n";
 
   protected static Logger log = LoggerFactory.getLogger(PvmTestCase.class);
   
@@ -38,7 +38,7 @@ public abstract class PvmTestCase extends TestCase {
    */
   public void assertTextPresent(String expected, String actual) {
     if ( (actual==null)
-         || (actual.indexOf(expected)==-1)
+         || (!actual.contains(expected))
        ) {
       throw new AssertionFailedError("expected presence of ["+expected+"], but was ["+actual+"]");
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/test/TestHelper.java

@@ -57,7 +57,7 @@ public abstract class TestHelper {
   
   private static Logger log = LoggerFactory.getLogger(TestHelper.class);
 
-  public static final String EMPTY_LINE = "                                                                                           ";
+  public static final String EMPTY_LINE = "\n";
 
   public static final List<String> TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK = Arrays.asList(
     "ACT_GE_PROPERTY"
@@ -259,7 +259,7 @@ public abstract class TestHelper {
       if (!TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK.contains(tableName)) {
         Long count = tableCounts.get(tableName);
         if (count!=0L) {
-          outputMessage.append("  "+tableName + ": " + count + " record(s) ");
+          outputMessage.append("  ").append(tableName).append(": ").append(count).append(" record(s) ");
         }
       }
     }

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/ActivitiEventDispatcherTest.java

@@ -274,7 +274,7 @@ public class ActivitiEventDispatcherTest extends PluggableActivitiTestCase {
 
 		// Invalid type name
 		try {
-			types = ActivitiEventType.getTypesFromString("WHOOPS,ENTITY_DELETED");
+			ActivitiEventType.getTypesFromString("WHOOPS,ENTITY_DELETED");
 			fail("Exception expected");
 		} catch(ActivitiIllegalArgumentException expected) {
 			// Expected exception

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/ActivityEventsTest.java

@@ -483,7 +483,7 @@ public class ActivityEventsTest extends PluggableActivitiTestCase {
 				found = true;
 			}
 		}
-		assertTrue(found);;
+		assertTrue(found);
 	}
 	
 }

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/DatabaseEventLoggerTest.java

@@ -17,9 +17,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.test.Deployment;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -49,8 +47,8 @@ public class DatabaseEventLoggerTest extends PluggableActivitiTestCase {
 	  super.tearDown();
 	}
 	
-	
-	public void testDatabaseEvents() throws JsonParseException, JsonMappingException, IOException {
+	@Deployment(resources = {"org/activiti/engine/test/api/event/DatabaseEventLoggerProcess.bpmn20.xml"})
+	public void testDatabaseEvents() throws IOException {
 		
 		String testTenant = "testTenant";
 		
@@ -413,7 +411,7 @@ public class DatabaseEventLoggerTest extends PluggableActivitiTestCase {
 		
 	}
 	
-	public void testDatabaseEventsNoTenant() throws JsonParseException, JsonMappingException, IOException {
+	public void testDatabaseEventsNoTenant() throws IOException {
 		
 		String deploymentId = repositoryService.createDeployment()
 				.addClasspathResource("org/activiti/engine/test/api/event/DatabaseEventLoggerProcess.bpmn20.xml")

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/JobEventsTest.java

@@ -151,8 +151,6 @@ public class JobEventsTest extends PluggableActivitiTestCase {
 
   @Deployment
   public void testJobCanceledEventOnBoundaryEvent() throws Exception {
-    Clock previousClock = processEngineConfiguration.getClock();
-
     Clock testClock = new DefaultClockImpl();
 
     processEngineConfiguration.setClock(testClock);
@@ -237,7 +235,7 @@ public class JobEventsTest extends PluggableActivitiTestCase {
      */
     @Deployment
     public void testTimerFiredForIntermediateTimer() throws Exception {
-        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("testTimerFiredForIntermediateTimer");
+        runtimeService.startProcessInstanceByKey("testTimerFiredForIntermediateTimer");
 
         // Force timer to start the process
         Calendar tomorrow = Calendar.getInstance();

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/UncaughtErrorEventTest.java

@@ -14,11 +14,8 @@ package org.activiti.engine.test.api.event;
 
 import org.activiti.engine.delegate.BpmnError;
 
-import org.activiti.engine.delegate.event.ActivitiErrorEvent;
 import org.activiti.engine.delegate.event.ActivitiEvent;
-import org.activiti.engine.delegate.event.ActivitiEventType;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
-import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.test.Deployment;
 
 /**

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java

@@ -176,7 +176,7 @@ public class FormServiceTest extends PluggableActivitiTestCase {
     Map<String, Object> expectedVariables = new HashMap<String, Object>();
     expectedVariables.put("room", "5b");
     expectedVariables.put("SpeakerName", "Mike");
-    expectedVariables.put("duration", new Long(45));
+    expectedVariables.put("duration", 45l);
     expectedVariables.put("free", Boolean.TRUE);
     expectedVariables.put("double", 45.5d);
 
@@ -242,7 +242,7 @@ public class FormServiceTest extends PluggableActivitiTestCase {
     expectedVariables = new HashMap<String, Object>();
     expectedVariables.put("room", "5b");
     expectedVariables.put("SpeakerName", "Mike");
-    expectedVariables.put("duration", new Long(45));
+    expectedVariables.put("duration", 45l);
     expectedVariables.put("free", Boolean.TRUE);
     expectedVariables.put("double", 45.5d);
 
@@ -432,8 +432,7 @@ public class FormServiceTest extends PluggableActivitiTestCase {
     ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processDefinition.getKey());
     assertNotNull(processInstance);
     
-    Task task = null;
-    task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+    Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
     assertNotNull(task);
     
     Map<String, String> properties = new HashMap<String, String>();

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoricTaskAndVariablesQueryTest.java

@@ -61,7 +61,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
   @Deployment
   public void testQuery() {
     if (processEngineConfiguration.getHistoryLevel().isAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricTaskInstance task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().taskAssignee("gonzo").singleResult();
+      HistoricTaskInstance task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().taskAssignee("gonzo").singleResult();
       Map<String, Object> variableMap = task.getTaskLocalVariables();
       assertEquals(2, variableMap.size());
       assertEquals(0, task.getProcessVariables().size());
@@ -73,7 +73,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery().list();
       assertEquals(3, tasks.size());
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("gonzo").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("gonzo").singleResult();
       assertEquals(0, task.getProcessVariables().size());
       assertEquals(0, task.getTaskLocalVariables().size());
       
@@ -81,7 +81,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       startMap.put("processVar", true);
       runtimeService.startProcessInstanceByKey("oneTaskProcess", startMap);
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
       assertEquals(1, task.getProcessVariables().size());
       assertEquals(0, task.getTaskLocalVariables().size());
       assertTrue((Boolean) task.getProcessVariables().get("processVar"));
@@ -89,12 +89,12 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       taskService.setVariable(task.getId(), "anotherProcessVar", 123);
       taskService.setVariableLocal(task.getId(), "localVar", "test");
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().taskAssignee("kermit").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().taskAssignee("kermit").singleResult();
       assertEquals(0, task.getProcessVariables().size());
       assertEquals(1, task.getTaskLocalVariables().size());
       assertEquals("test", task.getTaskLocalVariables().get("localVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
       assertEquals(2, task.getProcessVariables().size());
       assertEquals(0, task.getTaskLocalVariables().size());
       assertEquals(true, task.getProcessVariables().get("processVar"));
@@ -111,25 +111,25 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       assertEquals(0, tasks.get(0).getProcessVariables().size());
       assertEquals(0, tasks.get(0).getTaskLocalVariables().size());
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
       assertEquals(0, task.getProcessVariables().size());
       assertEquals(1, task.getTaskLocalVariables().size());
       assertEquals("test", task.getTaskLocalVariables().get("localVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
       assertEquals(2, task.getProcessVariables().size());
       assertEquals(0, task.getTaskLocalVariables().size());
       assertEquals(true, task.getProcessVariables().get("processVar"));
       assertEquals(123, task.getProcessVariables().get("anotherProcessVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().includeProcessVariables().taskAssignee("kermit").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().includeProcessVariables().taskAssignee("kermit").singleResult();
       assertEquals(2, task.getProcessVariables().size());
       assertEquals(1, task.getTaskLocalVariables().size());
       assertEquals("test", task.getTaskLocalVariables().get("localVar"));
       assertEquals(true, task.getProcessVariables().get("processVar"));
       assertEquals(123, task.getProcessVariables().get("anotherProcessVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().taskAssignee("gonzo").singleResult();
+      task = historyService.createHistoricTaskInstanceQuery().taskAssignee("gonzo").singleResult();
       taskService.complete(task.getId());
       task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables().finished().singleResult();
       variableMap = task.getTaskLocalVariables();
@@ -145,7 +145,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
   @Deployment
   public void testOrQuery() {
     if (processEngineConfiguration.getHistoryLevel().isAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricTaskInstance task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery()
+      HistoricTaskInstance task = historyService.createHistoricTaskInstanceQuery()
           .includeTaskLocalVariables()
           .or()
             .taskAssignee("gonzo")
@@ -162,7 +162,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery().list();
       assertEquals(3, tasks.size());
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery()
+      task = historyService.createHistoricTaskInstanceQuery()
           .includeProcessVariables()
           .or()
             .taskAssignee("gonzo")
@@ -176,7 +176,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       startMap.put("processVar", true);
       runtimeService.startProcessInstanceByKey("oneTaskProcess", startMap);
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery()
+      task = historyService.createHistoricTaskInstanceQuery()
           .includeProcessVariables()
           .or()
             .taskAssignee("kermit")
@@ -190,7 +190,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       taskService.setVariable(task.getId(), "anotherProcessVar", 123);
       taskService.setVariableLocal(task.getId(), "localVar", "test");
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery()
+      task = historyService.createHistoricTaskInstanceQuery()
           .includeTaskLocalVariables()
           .or()
             .taskAssignee("kermit")
@@ -201,7 +201,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       assertEquals(1, task.getTaskLocalVariables().size());
       assertEquals("test", task.getTaskLocalVariables().get("localVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery()
+      task = historyService.createHistoricTaskInstanceQuery()
           .includeProcessVariables()
           .or()
             .taskAssignee("kermit")
@@ -234,7 +234,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       assertEquals(0, tasks.get(0).getProcessVariables().size());
       assertEquals(0, tasks.get(0).getTaskLocalVariables().size());
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables()
+      task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables()
           .taskAssignee("kermit")
           .or()
             .taskVariableValueEquals("localVar", "test")
@@ -245,7 +245,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       assertEquals(1, task.getTaskLocalVariables().size());
       assertEquals("test", task.getTaskLocalVariables().get("localVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
+      task = historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
           .taskAssignee("kermit")
           .or()
             .taskVariableValueEquals("localVar", "test")
@@ -257,7 +257,7 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       assertEquals(true, task.getProcessVariables().get("processVar"));
       assertEquals(123, task.getProcessVariables().get("anotherProcessVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables()
+      task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables()
           .includeProcessVariables()
           .or()
             .taskAssignee("kermit")
@@ -270,11 +270,11 @@ public class HistoricTaskAndVariablesQueryTest extends PluggableActivitiTestCase
       assertEquals(true, task.getProcessVariables().get("processVar"));
       assertEquals(123, task.getProcessVariables().get("anotherProcessVar"));
       
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery()
+      task = historyService.createHistoricTaskInstanceQuery()
           .taskAssignee("gonzo")
           .singleResult();
       taskService.complete(task.getId());
-      task = (HistoricTaskInstance) historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables()
+      task = historyService.createHistoricTaskInstanceQuery().includeTaskLocalVariables()
           .or()
             .finished()
             .taskVariableValueEquals("localVar", "nonExisting")

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java

@@ -159,7 +159,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase {
             .singleResult();
     HistoricProcessInstance historicProcessInstanceSuper = historyService.createHistoricProcessInstanceQuery().processDefinitionKey("orderProcess")
             .singleResult();
-    assertEquals(historicProcessInstanceSuper.getId(), ((HistoricProcessInstanceEntity) historicProcessInstanceSub).getSuperProcessInstanceId());
+    assertEquals(historicProcessInstanceSuper.getId(), historicProcessInstanceSub.getSuperProcessInstanceId());
   }
 
   @Deployment(resources = { "org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml", "org/activiti/engine/test/api/runtime/oneTaskProcess2.bpmn20.xml" })
@@ -559,7 +559,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase {
     
     // Pass in null-value, should cause exception
     try {
-      instance = historyService.createHistoricProcessInstanceQuery().variableValueEqualsIgnoreCase("upper", null).singleResult();
+      historyService.createHistoricProcessInstanceQuery().variableValueEqualsIgnoreCase("upper", null).singleResult();
       fail("Exception expected");
     } catch(ActivitiIllegalArgumentException ae) {
       assertEquals("value is null", ae.getMessage());
@@ -567,7 +567,7 @@ public class HistoryServiceTest extends PluggableActivitiTestCase {
     
     // Pass in null name, should cause exception
     try {
-      instance = historyService.createHistoricProcessInstanceQuery().variableValueEqualsIgnoreCase(null, "abcdefg").singleResult();
+      historyService.createHistoricProcessInstanceQuery().variableValueEqualsIgnoreCase(null, "abcdefg").singleResult();
       fail("Exception expected");
     } catch(ActivitiIllegalArgumentException ae) {
       assertEquals("name is null", ae.getMessage());

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/identity/GroupQueryTest.java

@@ -251,7 +251,7 @@ public class GroupQueryTest extends PluggableActivitiTestCase {
     assertEquals(3, identityService.createNativeGroupQuery().sql("SELECT aig.* from " + tableName + " aig"
         + " inner join ACT_ID_MEMBERSHIP aim on aig.ID_ = aim.GROUP_ID_ "
         + " inner join ACT_ID_USER aiu on aiu.ID_ = aim.USER_ID_ where aiu.ID_ = #{id}")
-        .parameter("id", "kermit").list().size());;
+        .parameter("id", "kermit").list().size());
 
     // paging
     assertEquals(2, identityService.createNativeGroupQuery().sql(baseQuerySql).listPage(0, 2).size());

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/RepositoryServiceTest.java

@@ -312,7 +312,7 @@ public class RepositoryServiceTest extends PluggableActivitiTestCase {
   @Deployment(resources = { "org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml"})
   public void testProcessDefinitionEntitySerializable() {
     String procDefId = repositoryService.createProcessDefinitionQuery().singleResult().getId();
-    ProcessDefinition processDefinition = ((RepositoryServiceImpl) repositoryService).getProcessDefinition(procDefId);
+    ProcessDefinition processDefinition = repositoryService.getProcessDefinition(procDefId);
     
     try {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceQueryTest.java

@@ -389,8 +389,8 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase {
       }
     }
     assertTrue(superProcessFound);
-    assertTrue(subProcessFound == false);
-    assertTrue(nestedSubProcessFound == false);
+    assertFalse(subProcessFound);
+    assertFalse(nestedSubProcessFound);
     
     instanceList = runtimeService.createProcessInstanceQuery().excludeSubprocesses(false).list();
     assertEquals(8, instanceList.size());
@@ -1357,7 +1357,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase {
     
     // Pass in null-value, should cause exception
     try {
-      instance = runtimeService.createProcessInstanceQuery().variableValueEqualsIgnoreCase("upper", null).singleResult();
+      runtimeService.createProcessInstanceQuery().variableValueEqualsIgnoreCase("upper", null).singleResult();
       fail("Exception expected");
     } catch(ActivitiIllegalArgumentException ae) {
       assertEquals("value is null", ae.getMessage());
@@ -1365,7 +1365,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase {
     
     // Pass in null name, should cause exception
     try {
-      instance = runtimeService.createProcessInstanceQuery().variableValueEqualsIgnoreCase(null, "abcdefg").singleResult();
+      runtimeService.createProcessInstanceQuery().variableValueEqualsIgnoreCase(null, "abcdefg").singleResult();
       fail("Exception expected");
     } catch(ActivitiIllegalArgumentException ae) {
       assertEquals("name is null", ae.getMessage());
@@ -1383,7 +1383,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase {
     
     // Pass in null-value, should cause exception
     try {
-      instance = runtimeService.createProcessInstanceQuery().variableValueNotEqualsIgnoreCase("upper", null).singleResult();
+      runtimeService.createProcessInstanceQuery().variableValueNotEqualsIgnoreCase("upper", null).singleResult();
       fail("Exception expected");
     } catch(ActivitiIllegalArgumentException ae) {
       assertEquals("value is null", ae.getMessage());
@@ -1391,7 +1391,7 @@ public class ProcessInstanceQueryTest extends PluggableActivitiTestCase {
     
     // Pass in null name, should cause exception
     try {
-      instance = runtimeService.createProcessInstanceQuery().variableValueNotEqualsIgnoreCase(null, "abcdefg").singleResult();
+      runtimeService.createProcessInstanceQuery().variableValueNotEqualsIgnoreCase(null, "abcdefg").singleResult();
       fail("Exception expected");
     } catch(ActivitiIllegalArgumentException ae) {
       assertEquals("name is null", ae.getMessage());

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/RuntimeServiceTest.java

@@ -113,7 +113,7 @@ public class RuntimeServiceTest extends PluggableActivitiTestCase {
   
   @Deployment(resources={
     "org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml"})
-  public void startProcessInstanceWithBusinessKey() {
+  public void testStartProcessInstanceWithBusinessKey() {
     ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().singleResult();
     
     // by key
@@ -126,7 +126,7 @@ public class RuntimeServiceTest extends PluggableActivitiTestCase {
     processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess", "456", CollectionUtil.singletonMap("var", "value"));
     assertNotNull(processInstance);
     assertEquals(2, runtimeService.createProcessInstanceQuery().processDefinitionKey("oneTaskProcess").count());
-    assertEquals("var", runtimeService.getVariable(processInstance.getId(), "var"));
+    assertEquals("value", runtimeService.getVariable(processInstance.getId(), "var"));
     
     // by id
     processInstance = runtimeService.startProcessInstanceById(processDefinition.getId(), "789");
@@ -137,7 +137,7 @@ public class RuntimeServiceTest extends PluggableActivitiTestCase {
     processInstance = runtimeService.startProcessInstanceById(processDefinition.getId(), "101123", CollectionUtil.singletonMap("var", "value2"));
     assertNotNull(processInstance);
     assertEquals(4, runtimeService.createProcessInstanceQuery().processDefinitionKey("oneTaskProcess").count());
-    assertEquals("var", runtimeService.getVariable(processInstance.getId(), "var"));
+    assertEquals("value2", runtimeService.getVariable(processInstance.getId(), "var"));
   }
   
   @Deployment(resources={

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/DelegateTaskTest.java

@@ -13,7 +13,6 @@
 package org.activiti.engine.test.api.task;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +30,7 @@ import org.activiti.engine.test.Deployment;
 public class DelegateTaskTest extends PluggableActivitiTestCase {
 
 	/**
-	 * @see http://jira.codehaus.org/browse/ACT-380
+	 * @see <a href="http://jira.codehaus.org/browse/ACT-380">http://jira.codehaus.org/browse/ACT-380</a>
 	 */
 	@Deployment
 	public void testGetCandidates() {

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskAndVariablesQueryTest.java

@@ -56,7 +56,7 @@ public class TaskAndVariablesQueryTest extends PluggableActivitiTestCase {
   
   @Deployment
   public void testQuery() {
-    Task task = (Task) taskService.createTaskQuery().includeTaskLocalVariables().taskAssignee("gonzo").singleResult();
+    Task task = taskService.createTaskQuery().includeTaskLocalVariables().taskAssignee("gonzo").singleResult();
     Map<String, Object> variableMap = task.getTaskLocalVariables();
     assertEquals(3, variableMap.size());
     assertEquals(0, task.getProcessVariables().size());
@@ -70,7 +70,7 @@ public class TaskAndVariablesQueryTest extends PluggableActivitiTestCase {
     List<Task> tasks = taskService.createTaskQuery().list();
     assertEquals(3, tasks.size());
     
-    task = (Task) taskService.createTaskQuery().includeProcessVariables().taskAssignee("gonzo").singleResult();
+    task = taskService.createTaskQuery().includeProcessVariables().taskAssignee("gonzo").singleResult();
     assertEquals(0, task.getProcessVariables().size());
     assertEquals(0, task.getTaskLocalVariables().size());
     
@@ -79,7 +79,7 @@ public class TaskAndVariablesQueryTest extends PluggableActivitiTestCase {
     startMap.put("binaryVariable", "This is a binary process variable".getBytes());
     runtimeService.startProcessInstanceByKey("oneTaskProcess", startMap);
     
-    task = (Task) taskService.createTaskQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
+    task = taskService.createTaskQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
     assertEquals(2, task.getProcessVariables().size());
     assertEquals(0, task.getTaskLocalVariables().size());
     assertTrue((Boolean) task.getProcessVariables().get("processVar"));
@@ -88,12 +88,12 @@ public class TaskAndVariablesQueryTest extends PluggableActivitiTestCase {
     taskService.setVariable(task.getId(), "anotherProcessVar", 123);
     taskService.setVariableLocal(task.getId(), "localVar", "test");
     
-    task = (Task) taskService.createTaskQuery().includeTaskLocalVariables().taskAssignee("kermit").singleResult();
+    task = taskService.createTaskQuery().includeTaskLocalVariables().taskAssignee("kermit").singleResult();
     assertEquals(0, task.getProcessVariables().size());
     assertEquals(1, task.getTaskLocalVariables().size());
     assertEquals("test", task.getTaskLocalVariables().get("localVar"));
     
-    task = (Task) taskService.createTaskQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
+    task =  taskService.createTaskQuery().includeProcessVariables().taskAssignee("kermit").singleResult();
     assertEquals(3, task.getProcessVariables().size());
     assertEquals(0, task.getTaskLocalVariables().size());
     assertEquals(true, task.getProcessVariables().get("processVar"));
@@ -111,18 +111,18 @@ public class TaskAndVariablesQueryTest extends PluggableActivitiTestCase {
     assertEquals(0, tasks.get(0).getProcessVariables().size());
     assertEquals(0, tasks.get(0).getTaskLocalVariables().size());
     
-    task = (Task) taskService.createTaskQuery().includeTaskLocalVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
+    task = taskService.createTaskQuery().includeTaskLocalVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
     assertEquals(0, task.getProcessVariables().size());
     assertEquals(1, task.getTaskLocalVariables().size());
     assertEquals("test", task.getTaskLocalVariables().get("localVar"));
     
-    task = (Task) taskService.createTaskQuery().includeProcessVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
+    task = taskService.createTaskQuery().includeProcessVariables().taskAssignee("kermit").taskVariableValueEquals("localVar", "test").singleResult();
     assertEquals(3, task.getProcessVariables().size());
     assertEquals(0, task.getTaskLocalVariables().size());
     assertEquals(true, task.getProcessVariables().get("processVar"));
     assertEquals(123, task.getProcessVariables().get("anotherProcessVar"));
     
-    task = (Task) taskService.createTaskQuery().includeTaskLocalVariables().includeProcessVariables().taskAssignee("kermit").singleResult();
+    task = taskService.createTaskQuery().includeTaskLocalVariables().includeProcessVariables().taskAssignee("kermit").singleResult();
     assertEquals(3, task.getProcessVariables().size());
     assertEquals(1, task.getTaskLocalVariables().size());
     assertEquals("test", task.getTaskLocalVariables().get("localVar"));

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskInfoQueryTest.java

@@ -25,14 +25,10 @@ import org.activiti.engine.task.TaskInfoQueryWrapper;
  */
 public class TaskInfoQueryTest extends PluggableActivitiTestCase {
 	
-	@Override
 	protected void tearDown() throws Exception {
-		
 		for (Task task : taskService.createTaskQuery().list()) {
 			taskService.deleteTask(task.getId(), true);
 		}
-		
-	  super.tearDown();
 	}
 
   public void testTaskInfoQuery() {

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskQueryTest.java

@@ -68,7 +68,7 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     taskService.deleteTasks(taskIds, true);
   }
   
-  public void tesBasicTaskPropertiesNotNull() {
+  public void testBasicTaskPropertiesNotNull() {
     Task task = taskService.createTaskQuery().taskId(taskIds.get(0)).singleResult();
     assertNotNull(task.getDescription());
     assertNotNull(task.getId());
@@ -698,7 +698,7 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     assertEquals(0, query.list().size());
   }
 
-  public void testQueryByCandidateOrAssigneed() {
+  public void testQueryByCandidateOrAssigned() {
     TaskQuery query = taskService.createTaskQuery().taskCandidateOrAssigned("kermit");
     assertEquals(11, query.count());
     List<Task> tasks = query.list();
@@ -714,18 +714,9 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     tasks = query.list();
     assertEquals(11, tasks.size());
 
-    // claim a task
-    taskService.claim(tasks.get(0).getId(), "kermit");
-    query = taskService.createTaskQuery().taskCandidateOrAssigned("kermit");
-    assertEquals(11, query.count());
-
-    taskService.claim(tasks.get(1).getId(), "fozzie");
-    query = taskService.createTaskQuery().taskCandidateOrAssigned("kermit");
-    assertEquals(10, query.count());
-
     query = taskService.createTaskQuery().taskCandidateOrAssigned("fozzie");
-    assertEquals(4, query.count());
-    assertEquals(4, query.list().size());
+    assertEquals(3, query.count());
+    assertEquals(3, query.list().size());
 
     // create a new task that no identity link and assignee to kermit
     Task task = taskService.newTask();
@@ -736,9 +727,9 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     taskService.saveTask(task);
 
     query = taskService.createTaskQuery().taskCandidateOrAssigned("kermit");
-    assertEquals(11, query.count());
+    assertEquals(12, query.count());
     tasks = query.list();
-    assertEquals(11, tasks.size());
+    assertEquals(12, tasks.size());
 
     Task assigneeToKermit = taskService.createTaskQuery().taskName("assigneeToKermit").singleResult();
     taskService.deleteTask(assigneeToKermit.getId());
@@ -747,7 +738,7 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     }
   }
   
-  public void testQueryByCandidateOrAssigneedOr() {
+  public void testQueryByCandidateOrAssignedOr() {
     TaskQuery query = taskService.createTaskQuery()
         .or()
         .taskId("invalid")
@@ -770,27 +761,12 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     tasks = query.list();
     assertEquals(11, tasks.size());
     
-    // claim a task
-    taskService.claim(tasks.get(0).getId(), "kermit");
-    query = taskService.createTaskQuery()
-        .or()
-        .taskId("invalid")
-        .taskCandidateOrAssigned("kermit");
-    assertEquals(11, query.count());
-    
-    taskService.claim(tasks.get(1).getId(), "fozzie");
-    query = taskService.createTaskQuery()
-        .or()
-        .taskId("invalid")
-        .taskCandidateOrAssigned("kermit");
-    assertEquals(10, query.count());
-    
     query = taskService.createTaskQuery()
         .or()
         .taskId("invalid")
         .taskCandidateOrAssigned("fozzie");
-    assertEquals(4, query.count());
-    assertEquals(4, query.list().size());
+    assertEquals(3, query.count());
+    assertEquals(3, query.list().size());
     
     // create a new task that no identity link and assignee to kermit
     Task task = taskService.newTask();
@@ -804,9 +780,9 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
         .or()
         .taskId("invalid")
         .taskCandidateOrAssigned("kermit");
-    assertEquals(11, query.count());
+    assertEquals(12, query.count());
     tasks = query.list();
-    assertEquals(11, tasks.size());
+    assertEquals(12, tasks.size());
     
     Task assigneeToKermit = taskService.createTaskQuery()
         .or()

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskServiceTest.java

@@ -340,7 +340,7 @@ public class TaskServiceTest extends PluggableActivitiTestCase {
     // Fetch the task again and update
     task = taskService.createTaskQuery().taskId(taskId).singleResult();
 
-    taskService.delegateTask(taskId, "joesmoe");
+    taskService.delegateTask(task.getId(), "joesmoe");
     
     task = taskService.createTaskQuery().taskId(taskId).singleResult();
     assertEquals("johndoe", task.getOwner());
@@ -682,7 +682,7 @@ public void testCompleteWithParametersTask2() {
     assertEquals(new Integer(2), runtimeService.getVariable(processInstance.getId(), "sum"));
 
     // Fetch second task
-    task = taskService.createTaskQuery().singleResult();
+    taskService.createTaskQuery().singleResult();
 
   }
   
@@ -1079,7 +1079,7 @@ public void testCompleteWithParametersTask2() {
   }
 
   /**
-   * @see http://jira.codehaus.org/browse/ACT-1059
+   * @see <a href="http://jira.codehaus.org/browse/ACT-1059">http://jira.codehaus.org/browse/ACT-1059</a>
    */
   public void testSetDelegationState() {
     Task task = taskService.newTask();

modules/activiti-engine/src/test/java/org/activiti/engine/test/api/tenant/TenancyTest.java

@@ -29,7 +29,7 @@ public class TenancyTest extends PluggableActivitiTestCase {
 	@Override
 	protected void setUp() throws Exception {
 	  super.setUp();
-	  this.autoCleanedUpDeploymentIds.clear();;
+	  this.autoCleanedUpDeploymentIds.clear();
 	}
 	
 	@Override

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java

@@ -287,7 +287,7 @@ public class CallActivityAdvancedTest extends PluggableActivitiTestCase {
     assertEquals("Hello from sub process.", taskService.getVariable(taskAfterSubProcess.getId(), "superVariable"));
 
     vars.clear();
-    vars.put("x", new Long(5));
+    vars.put("x", 5l);
 
     // Completing this task ends the super process which leads to a task in the super process
     taskService.complete(taskAfterSubProcess.getId(), vars);

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/compensate/helper/UndoService.java

@@ -24,12 +24,12 @@ import org.activiti.engine.delegate.JavaDelegate;
 public class UndoService implements JavaDelegate {
   
   private Expression counterName;
-  
+
   public void execute(DelegateExecution execution) throws Exception {
     String variableName = (String) counterName.getValue(execution);
     Object variable = execution.getVariable(variableName);
     if(variable == null) {
-      execution.setVariable(variableName, (Integer) 1);
+      execution.setVariable(variableName, 1);
     }
     else  {
       execution.setVariable(variableName, ((Integer)variable)+1);

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/BoundaryErrorEventTest.java

@@ -77,7 +77,7 @@ public class BoundaryErrorEventTest extends PluggableActivitiTestCase {
     
     // Completing task 2, will cause the end error event to throw error with code 123
     taskService.complete(tasks.get(1).getId());
-    tasks = taskService.createTaskQuery().list();
+    taskService.createTaskQuery().list();
     Task taskAfterError = taskService.createTaskQuery().singleResult();
     assertEquals("task outside subprocess", taskAfterError.getName());
   }
@@ -106,7 +106,7 @@ public class BoundaryErrorEventTest extends PluggableActivitiTestCase {
     assertProcessEnded(procId);
     
     // Completing task B will lead to task C
-    procId = runtimeService.startProcessInstanceByKey(processDefinitionKey).getId();
+    runtimeService.startProcessInstanceByKey(processDefinitionKey).getId();
     tasks = taskService.createTaskQuery().orderByTaskName().asc().list();
     assertEquals(2, tasks.size());
     assertEquals("task A", tasks.get(0).getName());

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/message/MessageIntermediateEventTest.java

@@ -18,7 +18,6 @@ import java.util.List;
 import org.activiti.engine.impl.EventSubscriptionQueryImpl;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.runtime.Execution;
-import org.activiti.engine.runtime.Job;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.test.Deployment;

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/signal/SignalEventTest.java

@@ -13,9 +13,6 @@
 
 package org.activiti.engine.test.bpmn.event.signal;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -31,7 +28,6 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.test.Deployment;
 import org.activiti.validation.validator.Problems;
-import org.junit.Test;
 
 
 /**

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/timer/StartTimerEventTest.java

@@ -192,7 +192,7 @@ public class StartTimerEventTest extends PluggableActivitiTestCase {
     assertEquals(1, jobQuery.count());
     
     // Reset deployment cache
-    ((ProcessEngineConfigurationImpl) processEngineConfiguration).getProcessDefinitionCache().clear();
+    processEngineConfiguration.getProcessDefinitionCache().clear();
     
     // Start one instance of the process definition, this will trigger a cache reload
     runtimeService.startProcessInstanceByKey("startTimer");

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/ExclusiveGatewayTest.java

@@ -149,7 +149,7 @@ public class ExclusiveGatewayTest extends PluggableActivitiTestCase {
     assertEquals("Input is one", task.getName());
     runtimeService.deleteProcessInstance(procId, null);
     
-    procId = runtimeService.startProcessInstanceByKey("exclusiveGwDefaultSequenceFlow", 
+    runtimeService.startProcessInstanceByKey("exclusiveGwDefaultSequenceFlow",
             CollectionUtil.singletonMap("input", 5)).getId();
     task = taskService.createTaskQuery().singleResult();
     assertEquals("Default input", task.getName());

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/InclusiveGatewayTest.java

@@ -185,16 +185,15 @@ public class InclusiveGatewayTest extends PluggableActivitiTestCase {
     orders.add(new InclusiveGatewayTestOrder(300));
     orders.add(new InclusiveGatewayTestOrder(175));
 
-    ProcessInstance pi = null;
     try {
-      pi = runtimeService.startProcessInstanceByKey("inclusiveDecisionBasedOnListOrArrayOfBeans", CollectionUtil.singletonMap("orders", orders));
+      runtimeService.startProcessInstanceByKey("inclusiveDecisionBasedOnListOrArrayOfBeans", CollectionUtil.singletonMap("orders", orders));
       fail();
     } catch (ActivitiException e) {
       // expect an exception to be thrown here
     }
 
     orders.set(1, new InclusiveGatewayTestOrder(175));
-    pi = runtimeService.startProcessInstanceByKey("inclusiveDecisionBasedOnListOrArrayOfBeans", CollectionUtil.singletonMap("orders", orders));
+    ProcessInstance pi = runtimeService.startProcessInstanceByKey("inclusiveDecisionBasedOnListOrArrayOfBeans", CollectionUtil.singletonMap("orders", orders));
     Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult();
     assertNotNull(task);
     assertEquals(BEAN_TASK3_NAME, task.getName());
@@ -332,7 +331,7 @@ public class InclusiveGatewayTest extends PluggableActivitiTestCase {
     
 
     for (Execution execution : runtimeService.createExecutionQuery().list()) {
-      System.out.println(((ExecutionEntity) execution).getActivityId());
+      System.out.println(execution.getActivityId());
     }
     
     assertEquals("Found executions: " + runtimeService.createExecutionQuery().list(), 0, runtimeService.createExecutionQuery().count());
@@ -387,7 +386,7 @@ public class InclusiveGatewayTest extends PluggableActivitiTestCase {
     variableMap.put("a", 2);
     variableMap.put("b", 2);
     try {
-      processInstance = runtimeService.startProcessInstanceByKey("InclusiveGateway", variableMap);
+      runtimeService.startProcessInstanceByKey("InclusiveGateway", variableMap);
       fail();
     } catch(ActivitiException e) {
       assertTrue(e.getMessage().contains("No outgoing sequence flow"));

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailSendTaskTest.java

@@ -159,7 +159,7 @@ public class EmailSendTaskTest extends EmailTestCase {
       }
       
       assertEquals(subject, mimeMessage.getHeader("Subject", null));
-      assertEquals("\"" + from + "\" <" +from.toString() + ">" , mimeMessage.getHeader("From", null));
+      assertEquals("\"" + from + "\" <" +from + ">" , mimeMessage.getHeader("From", null));
       assertTrue(getMessage(mimeMessage).contains(message));
       
       for (String t : to) {

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java

@@ -172,7 +172,7 @@ public class EmailServiceTaskTest extends EmailTestCase {
       }
       
       assertEquals(subject, mimeMessage.getHeader("Subject", null));
-      assertEquals("\"" + from + "\" <" +from.toString() + ">" , mimeMessage.getHeader("From", null));
+      assertEquals("\"" + from + "\" <" +from + ">" , mimeMessage.getHeader("From", null));
       assertTrue(getMessage(mimeMessage).contains(message));
       
       for (String t : to) {

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/subprocess/SubProcessTest.java

@@ -330,7 +330,7 @@ public class SubProcessTest extends PluggableActivitiTestCase {
   }
 
   /**
-   * @see http://jira.codehaus.org/browse/ACT-1072
+   * @see <a href="http://jira.codehaus.org/browse/ACT-1072">http://jira.codehaus.org/browse/ACT-1072</a>
    */
   @Deployment
   public void testNestedSimpleSubProcessWithoutEndEvent() {
@@ -338,7 +338,7 @@ public class SubProcessTest extends PluggableActivitiTestCase {
   }
 
   /**
-   * @see http://jira.codehaus.org/browse/ACT-1072
+   * @see <a href="http://jira.codehaus.org/browse/ACT-1072">http://jira.codehaus.org/browse/ACT-1072</a>
    */
   @Deployment
   public void testSimpleSubProcessWithoutEndEvent() {
@@ -347,7 +347,7 @@ public class SubProcessTest extends PluggableActivitiTestCase {
   }
 
   /**
-   * @see http://jira.codehaus.org/browse/ACT-1072
+   * @see <a href="http://jira.codehaus.org/browse/ACT-1072">http://jira.codehaus.org/browse/ACT-1072</a>
    */
   @Deployment
   public void testNestedSubProcessesWithoutEndEvents() {
@@ -356,7 +356,7 @@ public class SubProcessTest extends PluggableActivitiTestCase {
   }
 
   /**
-   * @see http://jira.codehaus.org/browse/ACT-1847
+   * @see <a href="http://jira.codehaus.org/browse/ACT-1847">http://jira.codehaus.org/browse/ACT-1847</a>
    */
   @Deployment
   public void testDataObjectScope() {

modules/activiti-engine/src/test/java/org/activiti/engine/test/cache/ProcessDefinitionCacheTest.java

@@ -182,7 +182,7 @@ public class ProcessDefinitionCacheTest extends PvmTestCase {
       .getId();
     
     // Start process instance on second process engine -> must use revised process definition
-    processDefinitionId = repositoryService2.createProcessDefinitionQuery().singleResult().getId();
+    repositoryService2.createProcessDefinitionQuery().singleResult().getId();
     runtimeService2.startProcessInstanceByKey("oneTaskProcess");
     task = taskService2.createTaskQuery().singleResult();
     assertEquals("revised task", task.getName());

modules/activiti-engine/src/test/java/org/activiti/engine/test/cmd/FailingDelegate.java

@@ -25,7 +25,7 @@ public class FailingDelegate implements JavaDelegate {
 	public void execute(DelegateExecution execution) throws Exception {
 	  Boolean fail = (Boolean) execution.getVariable("fail");
 
-	  if (fail == null || fail == true) {
+	  if (fail == null || fail) {
 	      throw new ActivitiException(EXCEPTION_MESSAGE);
 	  }
 

modules/activiti-engine/src/test/java/org/activiti/engine/test/concurrency/ConcurrentEngineUsageTest.java

@@ -94,7 +94,7 @@ public class ConcurrentEngineUsageTest extends PluggableActivitiTestCase {
         timeout = timeout + 200;
       }
     }
-    if(success == false) {
+    if(!success) {
       log.debug("Retrying process start FAILED " + MAX_RETRIES + " times");
     }
   }
@@ -118,7 +118,7 @@ public class ConcurrentEngineUsageTest extends PluggableActivitiTestCase {
       }
     }
     
-    if(success == false) {
+    if(!success) {
       log.debug("Retrying task completion FAILED " + MAX_RETRIES + " times");
     }
   }

modules/activiti-engine/src/test/java/org/activiti/engine/test/concurrency/SetRandomVariablesTaskListener.java

@@ -30,7 +30,7 @@ public class SetRandomVariablesTaskListener implements TaskListener {
 
   @Override
   public void notify(DelegateTask delegateTask) {
-    String varName = null;
+    String varName;
     for(int i=0; i<5; i++) {
       varName = "variable-" + new Random().nextInt(10);
       delegateTask.getExecution().setVariable(varName, getRandomValue());

modules/activiti-engine/src/test/java/org/activiti/engine/test/db/VariableScopeTest.java

@@ -18,7 +18,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.impl.interceptor.Command;

modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricActivityInstanceTest.java

@@ -205,7 +205,7 @@ public class HistoricActivityInstanceTest extends PluggableActivitiTestCase {
   public void testSorting() {
     runtimeService.startProcessInstanceByKey("process");
 
-    int expectedActivityInstances = -1;
+    int expectedActivityInstances;
     if (processEngineConfiguration.getHistoryLevel().isAtLeast(HistoryLevel.ACTIVITY)) {
       expectedActivityInstances = 2;
     } else {

modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/JobExecutorCmdExceptionTest.java

@@ -3,7 +3,6 @@
  */
 package org.activiti.engine.test.jobexecutor;
 
-import org.activiti.engine.impl.cmd.CancelJobsCmd;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
 import org.activiti.engine.impl.interceptor.CommandExecutor;
@@ -68,7 +67,7 @@ public class JobExecutorCmdExceptionTest extends PluggableActivitiTestCase {
   public void testJobCommandsWith3Exceptions() {
     tweetExceptionHandler.setExceptionsRemaining(3);
 
-    String jobId = commandExecutor.execute(new Command<String>() {
+    commandExecutor.execute(new Command<String>() {
 
       public String execute(CommandContext commandContext) {
         MessageEntity message = createTweetExceptionMessage();

modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/TestService.java

@@ -17,8 +17,7 @@ public class TestService implements JavaDelegate{
 		TestService.executionId = execution.getId();
 		TestService.businessKey = execution.getBusinessKey();
 		
-		Exception a = new Exception("test");
-		throw a;
+		throw new Exception("test");
 		
 	}
 	

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/PvmEventTest.java

@@ -16,7 +16,6 @@ package org.activiti.engine.test.pvm;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.impl.pvm.ProcessDefinitionBuilder;
 import org.activiti.engine.impl.pvm.PvmExecution;
 import org.activiti.engine.impl.pvm.PvmProcessDefinition;

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/PvmProcessInstanceEndTest.java

@@ -13,7 +13,6 @@
 
 package org.activiti.engine.test.pvm;
 
-import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.impl.pvm.ProcessDefinitionBuilder;
 import org.activiti.engine.impl.pvm.PvmProcessDefinition;
 import org.activiti.engine.impl.pvm.PvmProcessInstance;

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/PvmScopeAndEventsTest.java

@@ -16,9 +16,7 @@ package org.activiti.engine.test.pvm;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.impl.pvm.ProcessDefinitionBuilder;
-import org.activiti.engine.impl.pvm.PvmActivity;
 import org.activiti.engine.impl.pvm.PvmExecution;
 import org.activiti.engine.impl.pvm.PvmProcessDefinition;
 import org.activiti.engine.impl.pvm.PvmProcessInstance;

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/PvmScopesAndConcurrencyTest.java

@@ -16,9 +16,7 @@ package org.activiti.engine.test.pvm;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.impl.pvm.ProcessDefinitionBuilder;
-import org.activiti.engine.impl.pvm.PvmException;
 import org.activiti.engine.impl.pvm.PvmExecution;
 import org.activiti.engine.impl.pvm.PvmProcessDefinition;
 import org.activiti.engine.impl.pvm.PvmProcessInstance;

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/PvmVariablesTest.java

@@ -29,7 +29,7 @@ import org.junit.Test;
  */
 public class PvmVariablesTest extends PvmTestCase {
 
-  @Test
+  @Test //TODO JUnit 3 or 4???
   public void testVariables() {
     PvmProcessDefinition processDefinition = new ProcessDefinitionBuilder()
       .createActivity("a")

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/activities/EmbeddedSubProcess.java

@@ -57,7 +57,7 @@ public class EmbeddedSubProcess implements CompositeActivityBehavior {
   public void timerFires(ActivityExecution execution, String signalName, Object signalData) throws Exception {
     PvmActivity timerActivity = execution.getActivity();
     boolean isInterrupting = (Boolean) timerActivity.getProperty("isInterrupting");
-    List<ActivityExecution> recyclableExecutions = null;
+    List<ActivityExecution> recyclableExecutions;
     if (isInterrupting) {
       recyclableExecutions = removeAllExecutions(execution);
     } else {

modules/activiti-engine/src/test/java/org/activiti/engine/test/pvm/activities/EventScopeCreatingSubprocess.java

@@ -73,7 +73,7 @@ public class EventScopeCreatingSubprocess implements CompositeActivityBehavior {
   public void timerFires(ActivityExecution execution, String signalName, Object signalData) throws Exception {
     PvmActivity timerActivity = execution.getActivity();
     boolean isInterrupting = (Boolean) timerActivity.getProperty("isInterrupting");
-    List<ActivityExecution> recyclableExecutions = null;
+    List<ActivityExecution> recyclableExecutions;
     if (isInterrupting) {
       recyclableExecutions = removeAllExecutions(execution);
     } else {

modules/activiti-engine/src/test/java/org/activiti/engine/test/regression/ActivitiTestCaseProcessValidator.java

@@ -24,9 +24,8 @@ public class ActivitiTestCaseProcessValidator implements ProcessValidator {
       customParseValidator.executeParse(bpmnModel, process);
     }
  
-    ValidationError error = null;
     for (String errorRef : bpmnModel.getErrors().keySet()) {
-      error = new ValidationError();
+      ValidationError error = new ValidationError();
       error.setValidatorSetName("Manual BPMN parse validator");
       error.setProblem(errorRef);
       error.setActivityId(bpmnModel.getErrors().get(errorRef));

modules/activiti-engine/src/test/java/org/activiti/engine/test/regression/ProcessValidationExecutedAfterDeployTest.java

@@ -2,7 +2,6 @@ package org.activiti.engine.test.regression;
 import java.util.List;
 
 import org.activiti.engine.ActivitiException;
-import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.validation.ProcessValidator;
@@ -20,16 +19,16 @@ public class ProcessValidationExecutedAfterDeployTest extends PluggableActivitiT
 	protected ProcessValidator processValidator;
 	
 	private void disableValidation() {
-	  processValidator = ((ProcessEngineConfigurationImpl) processEngineConfiguration).getProcessValidator();
-	  ((ProcessEngineConfigurationImpl) processEngineConfiguration).setProcessValidator(null);
+	  processValidator = processEngineConfiguration.getProcessValidator();
+	  processEngineConfiguration.setProcessValidator(null);
   }
 	
 	private void enableValidation() {
-	  ((ProcessEngineConfigurationImpl) processEngineConfiguration).setProcessValidator(processValidator);
+	  processEngineConfiguration.setProcessValidator(processValidator);
   }
 	
 	private void clearDeploymentCache() {
-		((ProcessEngineConfigurationImpl) processEngineConfiguration).getProcessDefinitionCache().clear();
+		processEngineConfiguration.getProcessDefinitionCache().clear();
 	}
 	
 	protected void tearDown() throws Exception {

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/executionlistener/CustomFlowBean.java

@@ -10,10 +10,6 @@ public class CustomFlowBean implements Serializable {
 
   public boolean executeLogic(String flowId, DelegateExecution execution) {
     Object conditionsObject = execution.getVariable(flowId + "_activiti_conditions");
-    if (conditionsObject != null) {
-      return true;
-    } else {
-      return false;
-    }
+    return conditionsObject != null;
   }
 }

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/mail/EmailSendTaskTest.java

@@ -88,7 +88,7 @@ public class EmailSendTaskTest extends PluggableActivitiTestCase {
     MimeMessage mimeMessage = message.getMimeMessage();
     
     assertEquals("Your order " + orderId + " has been shipped", mimeMessage.getHeader("Subject", null));
-    assertEquals("\"" + from + "\" <" +from.toString() + ">" , mimeMessage.getHeader("From", null));
+    assertEquals("\"" + from + "\" <" +from + ">" , mimeMessage.getHeader("From", null));
     assertTrue(mimeMessage.getHeader("To", null).contains(recipient));
   }
 

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/mail/EmailServiceTaskTest.java

@@ -75,7 +75,7 @@ public class EmailServiceTaskTest extends PluggableActivitiTestCase {
     MimeMessage mimeMessage = message.getMimeMessage();
     
     assertEquals("Your order " + orderId + " has been shipped", mimeMessage.getHeader("Subject", null));
-    assertEquals("\"" + from + "\" <" +from.toString() + ">" , mimeMessage.getHeader("From", null));
+    assertEquals("\"" + from + "\" <" +from + ">" , mimeMessage.getHeader("From", null));
     assertTrue(mimeMessage.getHeader("To", null).contains(recipient));
   }
 

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/servicetask/ThrowsExceptionBehavior.java

@@ -26,7 +26,7 @@ public class ThrowsExceptionBehavior implements ActivityBehavior {
   public void execute(ActivityExecution execution) throws Exception {
     String var = (String) execution.getVariable("var");
 
-    PvmTransition transition = null;
+    PvmTransition transition;
     try {
       executeLogic(var);
       transition = execution.getActivity().findOutgoingTransition("no-exception");

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/shell/ShellTaskTest.java

@@ -15,13 +15,13 @@ public class ShellTaskTest extends PluggableActivitiTestCase {
 
   OsType getSystemOsType() {
     String osName = System.getProperty("os.name").toLowerCase();
-    if (osName.indexOf("win") >= 0)
+    if (osName.contains("win"))
       return OsType.WINDOWS;
-    else if (osName.indexOf("mac") >= 0)
+    else if (osName.contains("mac"))
       return OsType.MAC;
-    else if ((osName.indexOf("nix") >= 0) || (osName.indexOf("nux") >= 0))
+    else if ((osName.contains("nix")) || (osName.contains("nux")))
       return OsType.LINUX;
-    else if (osName.indexOf("sunos") >= 0)
+    else if (osName.contains("sunos"))
       return OsType.SOLARIS;
     else
       return OsType.UNKOWN;
@@ -31,7 +31,7 @@ public class ShellTaskTest extends PluggableActivitiTestCase {
     osType = getSystemOsType();
   }
 
-  @Test
+  @Test //TODO JUnit 3 or 4???
   public void testOsDetection() throws Exception {
     assertTrue(osType != OsType.UNKOWN);
   }

modules/activiti-engine/src/test/java/org/activiti/examples/identity/IdentityTest.java

@@ -12,6 +12,7 @@
  */
 package org.activiti.examples.identity;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -168,9 +169,7 @@ public class IdentityTest extends PluggableActivitiTestCase {
 
   private Object createStringSet(String... strings) {
     Set<String> stringSet = new HashSet<String>();
-    for (String string : strings) {
-      stringSet.add(string);
-    }
+    Collections.addAll(stringSet, strings);
     return stringSet;
   }
 

modules/activiti-engine/src/test/java/org/activiti/examples/pvm/Decision.java

@@ -23,7 +23,7 @@ import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
 public class Decision implements ActivityBehavior {
 
   public void execute(ActivityExecution execution) throws Exception {
-    PvmTransition transition = null; 
+    PvmTransition transition;
     String creditRating = (String) execution.getVariable("creditRating");
     if (creditRating.equals("AAA+")) {
       transition = execution.getActivity().findOutgoingTransition("wow");

modules/activiti-engine/src/test/java/org/activiti/examples/variables/VariablesTest.java

@@ -28,11 +28,9 @@ import org.activiti.engine.impl.variable.ValueFields;
 import org.activiti.engine.impl.variable.VariableType;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.activiti.engine.test.ActivitiRule;
 import org.activiti.engine.test.Deployment;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
-import org.junit.Rule;
 import org.junit.Test;
 
 /**
@@ -155,7 +153,7 @@ public class VariablesTest extends PluggableActivitiTestCase {
  
   
   // Test case for ACT-1839
-  @Test
+  @Test //TODO JUnit 3 or 4???
   @Deployment(resources = {"org/activiti/examples/variables/VariablesTest.testChangeTypeSerializable.bpmn20.xml"})
   public void testChangeTypeSerializable() {
 	  ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("variable-type-change-test");

modules/activiti-engine/src/test/java/org/activiti/standalone/calendar/DurationHelperTest.java

@@ -15,7 +15,6 @@
 package org.activiti.standalone.calendar;
 
 import static groovy.util.GroovyTestCase.assertEquals;
-import static junit.framework.TestCase.assertEquals;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -109,7 +108,7 @@ public class DurationHelperTest {
     assertEquals(parseCalendar("20131103-07:45:00", TimeZone.getTimeZone("UTC")), dh.getCalendarAfter(easternTime));
   }
 
-  
+
   @Test
   public void daylightSavingFallObservedFirstHour() throws Exception {
     Clock testingClock = new DefaultClockImpl();
@@ -120,7 +119,7 @@ public class DurationHelperTest {
 
     assertEquals(expected, dh.getCalendarAfter());
   }
-  
+
   @Test
   public void daylightSavingFallObservedSecondHour() throws Exception {
     Clock testingClock = new DefaultClockImpl();
@@ -172,7 +171,7 @@ public class DurationHelperTest {
 
     assertEquals(parseCalendar("20140310-00:00:00", TimeZone.getTimeZone("US/Eastern")), dh.getCalendarAfter(testingClock.getCurrentCalendar()));
   }
-  
+
   @Test
   public void daylightSaving25HourDayEurope() throws Exception {
     Clock testingClock = new DefaultClockImpl();
@@ -192,19 +191,19 @@ public class DurationHelperTest {
 
     assertEquals(parseCalendar("20140331-00:00:00", TimeZone.getTimeZone("Europe/Amsterdam")), dh.getCalendarAfter(testingClock.getCurrentCalendar()));
   }
-  
+
   private Date parse(String str) throws Exception {
     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd-HH:mm:ss");
     return simpleDateFormat.parse(str);
   }
 
   private Calendar parseCalendarWithOffset(String str, TimeZone timeZone) throws Exception {
-  	
+
     Calendar cal = Calendar.getInstance();
-    cal.setTime(DateUtils.parseDate(str, new String[]{ "yyyyMMdd-HH:mm:ssZZ" }));
+      cal.setTime(DateUtils.parseDate(str, "yyyyMMdd-HH:mm:ssZZ" ));
     return cal;
   }
-  
+
   private Calendar parseCalendar(String str, TimeZone timeZone) throws Exception {
     return parseCalendar(str, timeZone, "yyyyMMdd-HH:mm:ss");
   }

modules/activiti-engine/src/test/java/org/activiti/standalone/cfg/CustomMybatisMapperTest.java

@@ -3,8 +3,6 @@ package org.activiti.standalone.cfg;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.HostnameVerifier;
-
 import org.activiti.engine.impl.cmd.AbstractCustomSqlExecution;
 import org.activiti.engine.impl.cmd.CustomSqlExecution;
 import org.activiti.engine.impl.test.ResourceActivitiTestCase;

modules/activiti-engine/src/test/java/org/activiti/standalone/deploy/CustomDeploymentCacheTest.java

@@ -14,7 +14,6 @@ package org.activiti.standalone.deploy;
 
 import java.text.MessageFormat;
 
-import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.engine.impl.test.ResourceActivitiTestCase;
 import org.activiti.engine.repository.Deployment;
@@ -29,11 +28,10 @@ public class CustomDeploymentCacheTest extends ResourceActivitiTestCase {
   }
   
   public void testCustomDeploymentCacheUsed() {
-    CustomDeploymentCache customCache = (CustomDeploymentCache) 
-             ((ProcessEngineConfigurationImpl) processEngineConfiguration).getProcessDefinitionCache();
+    CustomDeploymentCache customCache = (CustomDeploymentCache)
+              processEngineConfiguration.getProcessDefinitionCache();
     assertNull(customCache.getCachedProcessDefinition());
 
-    ProcessDefinitionEntity previousProcessDefinition = null;
     String processDefinitionTemplate = DeploymentCacheTestUtil.readTemplateFile(
             "/org/activiti/standalone/deploy/deploymentCacheTest.bpmn20.xml");
     for (int i = 1; i <= 5; i++) {
@@ -41,7 +39,6 @@ public class CustomDeploymentCacheTest extends ResourceActivitiTestCase {
               .addString("Process " + i + ".bpmn20.xml", MessageFormat.format(processDefinitionTemplate, i))
               .deploy();
       assertNotNull(customCache.getCachedProcessDefinition());
-      assertNotSame(previousProcessDefinition, customCache.getCachedProcessDefinition());
     }
     
     // Cleanup

modules/activiti-engine/src/test/java/org/activiti/standalone/deploy/DeploymentCacheLimitTest.java

@@ -14,7 +14,6 @@ package org.activiti.standalone.deploy;
 
 import java.text.MessageFormat;
 
-import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.activiti.engine.impl.persistence.deploy.DefaultDeploymentCache;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.engine.impl.test.ResourceActivitiTestCase;
@@ -33,7 +32,7 @@ public class DeploymentCacheLimitTest extends ResourceActivitiTestCase {
     int processDefinitionCacheLimit = 3; // This is set in the configuration above
     
     DefaultDeploymentCache<ProcessDefinitionEntity> processDefinitionCache = (DefaultDeploymentCache<ProcessDefinitionEntity>) 
-             ((ProcessEngineConfigurationImpl) processEngineConfiguration).getProcessDefinitionCache();
+              processEngineConfiguration.getProcessDefinitionCache();
     assertEquals(0, processDefinitionCache.size());
     
     

modules/activiti-engine/src/test/java/org/activiti/standalone/event/ProcessDefinitionScopedEventListenerDefinitionTest.java

@@ -77,8 +77,8 @@ public class ProcessDefinitionScopedEventListenerDefinitionTest extends Resource
 		List<ActivitiEvent> events = StaticTestActivitiEventListener.getEventsReceived();
 		assertFalse(events.isEmpty());
 		
-		boolean insertFound = true;
-		boolean deleteFound = true;
+		boolean insertFound = false;
+		boolean deleteFound = false;
 		
 		for(ActivitiEvent e : events) {
 			if(ActivitiEventType.ENTITY_CREATED == e.getType() ) {

modules/activiti-engine/src/test/java/org/activiti/standalone/history/VariableUpdateExecutionListener.java

@@ -17,7 +17,6 @@ package org.activiti.standalone.history;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
-import org.activiti.engine.impl.pvm.delegate.ExecutionListenerExecution;
 
 
 /**
@@ -29,7 +28,7 @@ public class VariableUpdateExecutionListener implements ExecutionListener {
   
   public void notify(DelegateExecution execution) throws Exception {
     String variableName = (String) varName.getValue(execution);
-    execution.setVariable(variableName, "Event: " + ((ExecutionListenerExecution)execution).getEventName());
+    execution.setVariable(variableName, "Event: " + execution.getEventName());
   }
  
 }

modules/activiti-engine/src/test/java/org/activiti/standalone/initialization/ProcessEngineInitializationTest.java

@@ -60,8 +60,8 @@ public class ProcessEngineInitializationTest extends PvmTestCase {
       Map<String, Object> parameters = new HashMap<String, Object>();
       parameters.put("name", "schema.version");
       parameters.put("value", "25.7");
-      parameters.put("revision", new Integer(1));
-      parameters.put("newRevision", new Integer(2));
+      parameters.put("revision", 1);
+      parameters.put("newRevision", 2);
       sqlSession.update("updateProperty", parameters);
       success = true;
     } catch (Exception e) {

modules/activiti-engine/src/test/java/org/activiti/standalone/testing/ActivitiRuleJunit4Test.java

@@ -20,7 +20,6 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.test.ActivitiRule;
 import org.activiti.engine.test.Deployment;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 

modules/activiti-engine/src/test/java/org/activiti/standalone/testing/MockSupportWithActivitiRuleTest.java

@@ -37,7 +37,7 @@ public class MockSupportWithActivitiRuleTest {
 			activitiRule.mockSupport().mockServiceTaskWithClassDelegate("com.yourcompany.delegate", ServiceTaskTestMock.class);
 			activitiRule.mockSupport().mockServiceTaskWithClassDelegate("com.yourcompany.anotherDelegate",
 			    "org.activiti.standalone.testing.helpers.ServiceTaskTestMock");
-		};
+		}
 		
 	};