X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fprocess%2FSlcExecutionTestUtils.java;h=c3c880366a7d2a6d26eaa94ad973acb241e91910;hb=4226558ccaf4d40b55d5d8492d0ef3476dfdf0c9;hp=ac32189bc77ef3b770b85dafc585fc0045ac6031;hpb=e5e2d0f157bf2a61a0ac919980dd1a48a4a8c71e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
index ac32189bc..c3c880366 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
@@ -2,26 +2,38 @@ package org.argeo.slc.core.process;
 
 import java.util.UUID;
 
-import junit.framework.TestCase;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;
 
-public abstract class SlcExecutionTestUtils extends TestCase{
+public abstract class SlcExecutionTestUtils {
 
 	public static SlcExecution createSimpleSlcExecution() {
 		SlcExecution slcExec = new SlcExecution();
 		slcExec.setUuid(UUID.randomUUID().toString());
 		slcExec.setHost("localhost");
-		slcExec.setPath("/test");
+		slcExec.setUser("user");
 		slcExec.setType("slcAnt");
 		slcExec.setStatus("STARTED");
+		slcExec.getAttributes().put("ant.file", "/test");
 		return slcExec;
 	}
 
-	public static void assertSlcExecution(SlcExecution expected, SlcExecution reached) {
+	public static void assertSlcExecution(SlcExecution expected,
+			SlcExecution reached) {
 		assertNotNull(reached);
 		assertEquals(expected.getHost(), reached.getHost());
-		assertEquals(expected.getPath(), reached.getPath());
+		assertEquals(expected.getUser(), reached.getUser());
 		assertEquals(expected.getType(), reached.getType());
 		assertEquals(expected.getStatus(), reached.getStatus());
+		assertEquals(expected.getAttributes().size(), reached.getAttributes()
+				.size());
+		for (String key : expected.getAttributes().keySet()) {
+			String expectedValue = expected.getAttributes().get(key);
+			String reachedValue = reached.getAttributes().get(key);
+			assertNotNull(reachedValue);
+			assertEquals(expectedValue, reachedValue);
+		}
 	}
 
 	public static void assertSlcExecutionStep(SlcExecutionStep expected,
@@ -30,10 +42,10 @@ public abstract class SlcExecutionTestUtils extends TestCase{
 		assertEquals(expected.getUuid(), reached.getUuid());
 		assertEquals(expected.getType(), reached.getType());
 		assertEquals(expected.logAsString(), reached.logAsString());
-		//assertEquals(expected.getBegin(), reached.getBegin());
+		assertDateSec(expected.getBegin(), reached.getBegin());
 	}
 
-	private SlcExecutionTestUtils(){
-		
+	private SlcExecutionTestUtils() {
+
 	}
 }