X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=runtime%2Forg.argeo.slc.support.castor%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fcastor%2FSlcAgentDescriptorCastorTest.java;h=bfe211ce670a6f4aa084dab53475ffb061c5142d;hb=32ef657ca2c9388cd406b30159d60a3bf95c53b2;hp=2e5e3afe2f051b755334acf6e1e2a94be4b95310;hpb=ff0d1b5de57be370ba31c6b45141251272af66e6;p=gpl%2Fargeo-slc.git

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 2e5e3afe2..bfe211ce6 100644
--- 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;
 import java.util.List;
 
-import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
-import org.argeo.slc.execution.ExecutionSpec;
-import org.argeo.slc.msg.ObjectList;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
-import org.argeo.slc.unit.execution.ExecutionFlowDescriptorTestUtils;
 
 public class SlcAgentDescriptorCastorTest extends AbstractCastorTestCase {
 	public void testMarshUnmarshMini() throws Exception {
 		SlcAgentDescriptor agentDescriptor = createMiniAgentDescriptor();
-		marshUnmarsh(agentDescriptor, false);
+		SlcAgentDescriptor agentDescriptorUnm = marshUnmarsh(agentDescriptor,
+				false);
+		assertSlcAgentDescriptor(agentDescriptor, agentDescriptorUnm);
 	}
 
 	public void testMarshUnmarshWithModuleDescriptor() throws Exception {
@@ -26,13 +24,24 @@ public class SlcAgentDescriptorCastorTest extends AbstractCastorTestCase {
 		lst.add(moduleDescriptor);
 		agentDescriptor.setModuleDescriptors(lst);
 
-		marshUnmarsh(agentDescriptor, false);
+		SlcAgentDescriptor agentDescriptorUnm = marshUnmarsh(agentDescriptor,
+				false);
+		assertSlcAgentDescriptor(agentDescriptor, agentDescriptorUnm);
 	}
-	
-	protected static SlcAgentDescriptor createMiniAgentDescriptor(){
+
+	protected static SlcAgentDescriptor createMiniAgentDescriptor() {
 		SlcAgentDescriptor agentDescriptor = new SlcAgentDescriptor();
 		agentDescriptor.setHost("localhost");
 		agentDescriptor.setUuid("555");
 		return agentDescriptor;
 	}
+
+	protected static void assertSlcAgentDescriptor(SlcAgentDescriptor expected,
+			SlcAgentDescriptor reached) {
+		assertNotNull(reached);
+		assertEquals(expected.getHost(), reached.getHost());
+		assertEquals(expected.getUuid(), expected.getUuid());
+		assertEquals(expected.getModuleDescriptors().size(), reached
+				.getModuleDescriptors().size());
+	}
 }