Cleanup in editor tests

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;
   }
 }