X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.unit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Funit%2Fexecution%2FExecutionFlowDescriptorTestUtils.java;h=2292f941eb8c8bfb6e09e563be1d72b187c4d091;hb=c55ac3fd75abf0913dc1203426f107c64a776732;hp=14a34c7fbee9dc4992c0c6aff37fdb0aa3d22879;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git 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 14a34c7fb..2292f941e 100644 --- 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 values = new HashMap(); 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 attributes = new HashMap(); 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()); + 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);