Skip to content

Commit cbf405b

Browse files
committed
ScriptInfoTest: also test that choices match
Of course, all the parameters currently being tested have no choices. But that will change in the next commit.
1 parent ddd4e90 commit cbf405b

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/test/java/org/scijava/script/ScriptInfoTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.io.Reader;
4343
import java.io.StringReader;
4444
import java.util.Arrays;
45+
import java.util.Collections;
4546
import java.util.HashMap;
4647
import java.util.List;
4748

@@ -146,21 +147,23 @@ public void testParameters() {
146147
final ScriptInfo info =
147148
new ScriptInfo(context, "params.bsizes", new StringReader(script));
148149

150+
final List<?> noChoices = Collections.emptyList();
151+
149152
final ModuleItem<?> log = info.getInput("log");
150153
assertItem("log", LogService.class, null, ItemIO.INPUT, false, true, null,
151-
null, null, null, null, null, null, null, log);
154+
null, null, null, null, null, null, null, noChoices, log);
152155

153156
final ModuleItem<?> sliderValue = info.getInput("sliderValue");
154157
assertItem("sliderValue", int.class, "Slider Value", ItemIO.INPUT, true,
155-
true, null, "slider", 11, null, null, 5, 15, 3.0, sliderValue);
158+
true, null, "slider", 11, null, null, 5, 15, 3.0, noChoices, sliderValue);
156159

157160
final ModuleItem<?> buffer = info.getOutput("buffer");
158161
assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
159-
null, null, null, null, null, null, null, null, buffer);
162+
null, null, null, null, null, null, null, null, noChoices, buffer);
160163

161164
final ModuleItem<?> result = info.getOutput("result");
162165
assertItem("result", Object.class, null, ItemIO.OUTPUT, true, true, null,
163-
null, null, null, null, null, null, null, result);
166+
null, null, null, null, null, null, null, noChoices, result);
164167

165168
int inputCount = 0;
166169
final ModuleItem<?>[] inputs = { log, sliderValue, buffer };
@@ -180,7 +183,7 @@ private void assertItem(final String name, final Class<?> type,
180183
final boolean persist, final String persistKey, final String style,
181184
final Object value, final Object min, final Object max,
182185
final Object softMin, final Object softMax, final Number stepSize,
183-
final ModuleItem<?> item)
186+
final List<?> choices, final ModuleItem<?> item)
184187
{
185188
assertEquals(name, item.getName());
186189
assertSame(type, item.getType());
@@ -196,6 +199,7 @@ private void assertItem(final String name, final Class<?> type,
196199
assertEquals(softMin, item.getSoftMinimum());
197200
assertEquals(softMax, item.getSoftMaximum());
198201
assertEquals(stepSize, item.getStepSize());
202+
assertEquals(choices, item.getChoices());
199203
}
200204

201205
/**

0 commit comments

Comments
 (0)