Fix bugs with slc execution notifications

[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 a9bc47e2c4a012f78dc8f7f73efc956ebdb22520..105ef79836df187a426d28cbbb1ef518d01c5bad 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
@@ -1,6 +1,7 @@
 package org.argeo.slc.core.process;\r
 \r
 import java.io.IOException;\r
+import java.io.InputStream;\r
 import java.io.StringReader;\r
 import java.io.StringWriter;\r
 import java.text.SimpleDateFormat;\r
@@ -21,10 +22,15 @@ import org.springframework.oxm.Unmarshaller;
 public class SlcExecutionCastorTest extends AbstractSpringTestCase {\r
        private Log log = LogFactory.getLog(getClass());\r
 \r
-       public void testMarshalling() throws Exception {\r
-               Marshaller marshaller = getBean("marshaller");\r
-               Unmarshaller unmarshaller = getBean("marshaller");\r
+       private Marshaller marshaller;\r
+       private Unmarshaller unmarshaller;\r
+\r
+       public void setUp() {\r
+               marshaller = getBean("marshaller");\r
+               unmarshaller = getBean("marshaller");\r
+       }\r
 \r
+       public void testMarshalling() throws Exception {\r
                SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();\r
 \r
                SlcExecutionRequest msgSave = new SlcExecutionRequest();\r
@@ -54,15 +60,18 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
 \r
                SlcExecutionRequest msgSaveUnm = unmarshall(unmarshaller, msgSaveXml);\r
                assertNotNull(msgSaveUnm);\r
-               SlcExecutionTestUtils.assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution());\r
+               SlcExecutionTestUtils.assertSlcExecution(slcExec, msgSaveUnm\r
+                               .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
-               SlcExecutionTestUtils.assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0));\r
-               SlcExecutionTestUtils.assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1));\r
+               SlcExecutionTestUtils.assertSlcExecutionStep(step0, msgNotifUnm\r
+                               .getSteps().get(0));\r
+               SlcExecutionTestUtils.assertSlcExecutionStep(step1, msgNotifUnm\r
+                               .getSteps().get(1));\r
 \r
                SlcExecution slcExecUnm = msgSaveUnm.getSlcExecution();\r
                slcExecUnm.getSteps().addAll(msgNotifUnm.getSteps());\r
@@ -70,6 +79,10 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
                SlcExecutionRequest msgUpdate = new SlcExecutionRequest();\r
                msgUpdate.setSlcExecution(slcExecUnm);\r
                String msgUpdateXml = marshallAndLog(marshaller, msgUpdate);\r
+               \r
+               SlcExecutionRequest msgUpdateUnm = unmarshall(unmarshaller,\r
+                               msgUpdateXml);\r
+               assertNotNull(msgUpdateUnm);\r
        }\r
 \r
        private String marshallAndLog(Marshaller marshaller, Object obj)\r