Improve unit tests

[gpl/argeo-slc.git] / org.argeo.slc.core / src / test / java / org / argeo / slc / core / process / SlcExecutionCastorTest.java

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
index 6405ca7bba7daf25c792567a2e40437b40d0fdf1..a9bc47e2c4a012f78dc8f7f73efc956ebdb22520 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
@@ -25,7 +25,7 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
                Marshaller marshaller = getBean("marshaller");\r
                Unmarshaller unmarshaller = getBean("marshaller");\r
 \r
-               SlcExecution slcExec = createSimpleSlcExecution();\r
+               SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();\r
 \r
                SlcExecutionRequest msgSave = new SlcExecutionRequest();\r
                msgSave.setSlcExecution(slcExec);\r
@@ -34,11 +34,13 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
 \r
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");\r
                SlcExecutionStep step0 = new SlcExecutionStep();\r
+               step0.setUuid(UUID.randomUUID().toString());\r
                step0.setBegin(sdf.parse("2008-04-17 18:21"));\r
                step0.setType("LOG");\r
                step0.addLog("A log message\nand another line");\r
 \r
                SlcExecutionStep step1 = new SlcExecutionStep();\r
+               step1.setUuid(UUID.randomUUID().toString());\r
                step1.setBegin(sdf.parse("2008-04-17 18:25"));\r
                step1.setType("LOG");\r
                step1.addLog("A nother log message");\r
@@ -52,15 +54,15 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
 \r
                SlcExecutionRequest msgSaveUnm = unmarshall(unmarshaller, msgSaveXml);\r
                assertNotNull(msgSaveUnm);\r
-               assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution());\r
+               SlcExecutionTestUtils.assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution());\r
 \r
                SlcExecutionStepsRequest msgNotifUnm = unmarshall(unmarshaller,\r
                                msgNotifXml);\r
                assertNotNull(msgNotifUnm);\r
                assertEquals(slcExec.getUuid(), msgNotifUnm.getSlcExecutionUuid());\r
                assertEquals(2, msgNotifUnm.getSteps().size());\r
-               assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0));\r
-               assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1));\r
+               SlcExecutionTestUtils.assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0));\r
+               SlcExecutionTestUtils.assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1));\r
 \r
                SlcExecution slcExecUnm = msgSaveUnm.getSlcExecution();\r
                slcExecUnm.getSteps().addAll(msgNotifUnm.getSteps());\r
@@ -87,30 +89,4 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
                IOUtils.closeQuietly(reader);\r
                return (T) obj;\r
        }\r
-\r
-       private void assertSlcExecution(SlcExecution expected, SlcExecution reached) {\r
-               assertNotNull(reached);\r
-               assertEquals(expected.getHost(), reached.getHost());\r
-               assertEquals(expected.getPath(), reached.getPath());\r
-               assertEquals(expected.getType(), reached.getType());\r
-               assertEquals(expected.getStatus(), reached.getStatus());\r
-       }\r
-\r
-       private void assertSlcExecutionStep(SlcExecutionStep expected,\r
-                       SlcExecutionStep reached) {\r
-               assertNotNull(reached);\r
-               assertEquals(expected.getType(), reached.getType());\r
-               assertEquals(expected.logAsString(), reached.logAsString());\r
-               assertEquals(expected.getBegin(), reached.getBegin());\r
-       }\r
-\r
-       public static SlcExecution createSimpleSlcExecution() {\r
-               SlcExecution slcExec = new SlcExecution();\r
-               slcExec.setUuid(UUID.randomUUID().toString());\r
-               slcExec.setHost("localhost");\r
-               slcExec.setPath("/test");\r
-               slcExec.setType("slcAnt");\r
-               slcExec.setStatus("STARTED");\r
-               return slcExec;\r
-       }\r
 }\r