diff --git a/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java b/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java index 215fb06bb..08189c540 100644 --- a/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java +++ b/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java @@ -11,6 +11,7 @@ import java.io.StringWriter; import java.sql.Time; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -313,54 +314,56 @@ public class DumpDirectiveTest { @Test public void dumpMixedList() { -// String varName = "stuff"; -// Map dataModel = new HashMap(); -// List list = new ArrayList(); -// list.add("apples"); -// list.add(4); -// list.add(false); -// List animals = new ArrayList(); -// animals.add("dog"); -// animals.add("cat"); -// animals.add("elephant"); -// Collections.sort(animals); -// list.add(animals); -// dataModel.put(varName, list); -// -// Map expected = new HashMap(); -// expected.put("name", varName); -// expected.put("type", "Sequence"); -// -// List> listDump = new ArrayList>(); -// -// Map stringMap = new HashMap(); -// stringMap.put("type", "String"); -// stringMap.put("value", "apples"); -// listDump.add(stringMap); -// -// Map numberMap = new HashMap(); -// numberMap.put("type", "Number"); -// numberMap.put("value", 4); -// listDump.add(numberMap); -// -// Map booleanMap = new HashMap(); -// booleanMap.put("type", "Boolean"); -// booleanMap.put("value", false); -// listDump.add(booleanMap); -// -// Map sequenceMap = new HashMap(); -// sequenceMap.put("type", "Sequence"); -// for ( String animal : animals ) { -// Map animalMap = new HashMap(); -// animalMap.put("type", "String"); -// animalMap.put("value", animal); -// sequenceMap.put("value", animalMap); -// } -// listDump.add(sequenceMap); -// -// expected.put("value", listDump); -// -// test(varName, dataModel, expected); + String varName = "stuff"; + Map dataModel = new HashMap(); + List list = new ArrayList(); + list.add("apples"); + list.add(4); + list.add(false); + List animals = new ArrayList(); + animals.add("dog"); + animals.add("cat"); + animals.add("elephant"); + Collections.sort(animals); + list.add(animals); + dataModel.put(varName, list); + + Map expected = new HashMap(); + expected.put("name", varName); + expected.put("type", "Sequence"); + + List> listValue = new ArrayList>(); + + Map stringMap = new HashMap(); + stringMap.put("type", "String"); + stringMap.put("value", "apples"); + listValue.add(stringMap); + + Map numberMap = new HashMap(); + numberMap.put("type", "Number"); + numberMap.put("value", 4); + listValue.add(numberMap); + + Map booleanMap = new HashMap(); + booleanMap.put("type", "Boolean"); + booleanMap.put("value", false); + listValue.add(booleanMap); + + Map sequenceMap = new HashMap(); + sequenceMap.put("type", "Sequence"); + List> animalList = new ArrayList>(); + for ( String animal : animals ) { + Map animalMap = new HashMap(); + animalMap.put("type", "String"); + animalMap.put("value", animal); + animalList.add(animalMap); + } + sequenceMap.put("value", animalList); + listValue.add(sequenceMap); + + expected.put("value", listValue); + + test(varName, dataModel, expected); } @Test