Centralize primitive support

[gpl/argeo-slc.git] / runtime / org.argeo.slc.unit / src / main / java / org / argeo / slc / unit / execution / ExecutionFlowDescriptorTestUtils.java

diff --git a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
index 14a34c7fbee9dc4992c0c6aff37fdb0aa3d22879..2292f941eb8c8bfb6e09e563be1d72b187c4d091 100644 (file)
--- a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
+++ b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
@@ -1,14 +1,16 @@
 package org.argeo.slc.unit.execution;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.argeo.slc.core.deploy.SimpleExecutables;
 import org.argeo.slc.core.execution.DefaultExecutionSpec;
 import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
+import org.argeo.slc.core.execution.PrimitiveUtils;
 import org.argeo.slc.core.execution.PrimitiveValue;
 import org.argeo.slc.core.execution.RefSpecAttribute;
 import org.argeo.slc.core.execution.RefValue;
+import org.argeo.slc.core.execution.RefValueChoice;
 import org.argeo.slc.core.test.BasicTestData;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
@@ -17,10 +19,14 @@ public class ExecutionFlowDescriptorTestUtils {
        public static ExecutionFlowDescriptor createSimpleExecutionFlowDescriptor() {
                ExecutionFlowDescriptor flowDescriptor = new ExecutionFlowDescriptor();
                flowDescriptor.setName("simpleFlow");
+               flowDescriptor.setDescription("my description");
+
                Map<String, Object> values = new HashMap<String, Object>();
                values.put("primitiveInteger", new PrimitiveValue(
-                               PrimitiveSpecAttribute.TYPE_INTEGER, 100));
-               values.put("ref1", new RefValue("Just a label"));
+                               PrimitiveUtils.TYPE_INTEGER, 100));
+
+               RefValue refValue = new RefValue("002");
+               values.put("ref1", refValue);
                flowDescriptor.setValues(values);
 
                flowDescriptor.setExecutionSpec(createRelatedSimpleSpec());
@@ -33,12 +39,16 @@ public class ExecutionFlowDescriptorTestUtils {
                Map<String, ExecutionSpecAttribute> attributes = new HashMap<String, ExecutionSpecAttribute>();
 
                PrimitiveSpecAttribute primitiveInteger = new PrimitiveSpecAttribute();
-               primitiveInteger.setType(PrimitiveSpecAttribute.TYPE_INTEGER);
+               primitiveInteger.setType(PrimitiveUtils.TYPE_INTEGER);
                primitiveInteger.setValue(50);
                attributes.put("primitiveInteger", primitiveInteger);
 
                RefSpecAttribute ref1 = new RefSpecAttribute();
                ref1.setTargetClass(BasicTestData.class);
+               ref1.setChoices(new ArrayList<RefValueChoice>());
+               ref1.getChoices().add(new RefValueChoice("001", "desc"));
+               ref1.getChoices().add(new RefValueChoice("002", null));
+               ref1.getChoices().add(new RefValueChoice("003", null));
                attributes.put("ref1", ref1);
 
                spec.setAttributes(attributes);