From 2cb0607fcb192ddfe46d8a5669ee9186c3f58f88 Mon Sep 17 00:00:00 2001 From: Dominik Adam Przybysz Date: Sun, 27 Jul 2014 22:47:17 +0200 Subject: [PATCH] Cleanup in editor tests --- .../editor/language/xml/AbstractConverterTest.java | 6 ++---- .../editor/language/xml/DataObjectConverterTest.java | 2 +- .../language/xml/EventBasedGatewayConverterTest.java | 2 +- .../editor/language/xml/ServiceTaskConverterTest.java | 10 +++++----- .../xml/SubProcessWithExtensionsConverterTest.java | 4 ++-- .../editor/language/xml/UserTaskConverterTest.java | 6 +++--- .../ValuedDataObjectWithExtensionsConverterTest.java | 6 +++--- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/AbstractConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/AbstractConverterTest.java index 52b5d2fc2c..a1396a99b0 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/AbstractConverterTest.java +++ b/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) { diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java index 56d727fa37..c645eda493 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java +++ b/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 http://jira.codehaus.org/browse/ACT-1847 */ public class DataObjectConverterTest extends AbstractConverterTest { diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/EventBasedGatewayConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/EventBasedGatewayConverterTest.java index 533eb7152f..954150f344 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/EventBasedGatewayConverterTest.java +++ b/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 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()); diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ServiceTaskConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ServiceTaskConverterTest.java index 8b113e0c2e..b1d87d807f 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ServiceTaskConverterTest.java +++ b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ServiceTaskConverterTest.java @@ -45,24 +45,24 @@ public class ServiceTaskConverterTest extends AbstractConverterTest { List 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 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()); diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/SubProcessWithExtensionsConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/SubProcessWithExtensionsConverterTest.java index 3bd247e697..38b98b4827 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/SubProcessWithExtensionsConverterTest.java +++ b/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 http://jira.codehaus.org/browse/ACT-2055 */ 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; } } diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/UserTaskConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/UserTaskConverterTest.java index 8f211691d8..8065bb67fb 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/UserTaskConverterTest.java +++ b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/UserTaskConverterTest.java @@ -79,15 +79,15 @@ public class UserTaskConverterTest extends AbstractConverterTest { List 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()); diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectWithExtensionsConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectWithExtensionsConverterTest.java index b78977cd19..24a6185790 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectWithExtensionsConverterTest.java +++ b/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 http://jira.codehaus.org/browse/ACT-1847 */ 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; } } -- GitLab