Fix issue with object lists in Castor

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.castor / src / test / java / org / argeo / slc / castor / SlcAgentDescriptorCastorTest.java

diff --git a/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java
index 2e5e3afe2f051b755334acf6e1e2a94be4b95310..bfe211ce670a6f4aa084dab53475ffb061c5142d 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java
+++ b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java
@@ -3,17 +3,15 @@ package org.argeo.slc.castor;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import org.argeo.slc.execution.ExecutionFlowDescriptor;\r
 import org.argeo.slc.execution.ExecutionModuleDescriptor;\r
-import org.argeo.slc.execution.ExecutionSpec;\r
-import org.argeo.slc.msg.ObjectList;\r
 import org.argeo.slc.runtime.SlcAgentDescriptor;\r
-import org.argeo.slc.unit.execution.ExecutionFlowDescriptorTestUtils;\r
 \r
 public class SlcAgentDescriptorCastorTest extends AbstractCastorTestCase {\r
        public void testMarshUnmarshMini() throws Exception {\r
                SlcAgentDescriptor agentDescriptor = createMiniAgentDescriptor();\r
-               marshUnmarsh(agentDescriptor, false);\r
+               SlcAgentDescriptor agentDescriptorUnm = marshUnmarsh(agentDescriptor,\r
+                               false);\r
+               assertSlcAgentDescriptor(agentDescriptor, agentDescriptorUnm);\r
        }\r
 \r
        public void testMarshUnmarshWithModuleDescriptor() throws Exception {\r
@@ -26,13 +24,24 @@ public class SlcAgentDescriptorCastorTest extends AbstractCastorTestCase {
                lst.add(moduleDescriptor);\r
                agentDescriptor.setModuleDescriptors(lst);\r
 \r
-               marshUnmarsh(agentDescriptor, false);\r
+               SlcAgentDescriptor agentDescriptorUnm = marshUnmarsh(agentDescriptor,\r
+                               false);\r
+               assertSlcAgentDescriptor(agentDescriptor, agentDescriptorUnm);\r
        }\r
-       \r
-       protected static SlcAgentDescriptor createMiniAgentDescriptor(){\r
+\r
+       protected static SlcAgentDescriptor createMiniAgentDescriptor() {\r
                SlcAgentDescriptor agentDescriptor = new SlcAgentDescriptor();\r
                agentDescriptor.setHost("localhost");\r
                agentDescriptor.setUuid("555");\r
                return agentDescriptor;\r
        }\r
+\r
+       protected static void assertSlcAgentDescriptor(SlcAgentDescriptor expected,\r
+                       SlcAgentDescriptor reached) {\r
+               assertNotNull(reached);\r
+               assertEquals(expected.getHost(), reached.getHost());\r
+               assertEquals(expected.getUuid(), expected.getUuid());\r
+               assertEquals(expected.getModuleDescriptors().size(), reached\r
+                               .getModuleDescriptors().size());\r
+       }\r
 }\r