Remove deprecated APIs

[gpl/argeo-slc.git] / runtime / org.argeo.slc.unit / src / main / java / org / argeo / slc / unit / process / SlcExecutionTestUtils.java

diff --git a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
index 508db662c39fdc749454619f254d35332a7243fa..ea4910b6f0a9f75a9d7dca6d34f29a87b4e22f9f 100644 (file)
--- a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
+++ b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
@@ -1,3 +1,18 @@
+/*\r
+ * Copyright (C) 2007-2012 Mathieu Baudier\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 package org.argeo.slc.unit.process;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
@@ -9,6 +24,7 @@ import java.util.List;
 import java.util.UUID;\r
 \r
 import org.argeo.slc.execution.ExecutionFlowDescriptor;\r
+import org.argeo.slc.execution.ExecutionStep;\r
 import org.argeo.slc.process.RealizedFlow;\r
 import org.argeo.slc.process.SlcExecution;\r
 import org.argeo.slc.process.SlcExecutionStep;\r
@@ -36,7 +52,7 @@ public abstract class SlcExecutionTestUtils {
                realizedFlow.setModuleName("test.module");\r
                realizedFlow.setModuleVersion("1.0.0");\r
                realizedFlow.setFlowDescriptor(flowDescriptor);\r
-               realizedFlow.setExecutionSpec(flowDescriptor.getExecutionSpec());\r
+               //realizedFlow.setExecutionSpec(flowDescriptor.getExecutionSpec());\r
                realizedFlows.add(realizedFlow);\r
                slcExec.setRealizedFlows(realizedFlows);\r
                return slcExec;\r
@@ -73,17 +89,21 @@ public abstract class SlcExecutionTestUtils {
 \r
        }\r
 \r
-       public static void assertSlcExecutionStep(SlcExecutionStep expected,\r
-                       SlcExecutionStep reached) {\r
+       public static void assertSlcExecutionStep(ExecutionStep expected,\r
+                       ExecutionStep reached) {\r
                assertNotNull(reached);\r
-               assertEquals(expected.getUuid(), reached.getUuid());\r
                assertEquals(expected.getType(), reached.getType());\r
-               assertDateSec(expected.getBegin(), reached.getBegin());\r
-               assertEquals(expected.getLogLines().size(), reached.getLogLines()\r
-                               .size());\r
-               for (int i = 0; i < expected.getLogLines().size(); i++) {\r
-                       assertEquals(expected.getLogLines().get(i), reached.getLogLines()\r
-                                       .get(i));\r
+               assertDateSec(expected.getTimestamp(), reached.getTimestamp());\r
+               if (expected instanceof SlcExecutionStep) {\r
+                       SlcExecutionStep slcExpected = (SlcExecutionStep)expected;\r
+                       SlcExecutionStep slcReached = (SlcExecutionStep)reached;\r
+                       assertEquals(slcExpected.getUuid(), slcReached.getUuid());\r
+                       assertEquals(slcExpected.getLogLines().size(), slcReached.getLogLines()\r
+                                       .size());\r
+                       for (int i = 0; i < slcExpected.getLogLines().size(); i++) {\r
+                               assertEquals(slcExpected.getLogLines().get(i), slcReached\r
+                                               .getLogLines().get(i));\r
+                       }\r
                }\r
        }\r
 \r