litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1562 More work on dump and dump tests

Browse source
This commit is contained in:
ryounes 2011-04-08 20:15:13 +00:00
parent 607ffcdd89
commit fae81e2d5f
1 changed files with 81 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

74
webapp/test/freemarker/ext/dump/DumpDirectiveTest.java
View file

@ -93,6 +93,7 @@ public class DumpDirectiveTest {
test(varName, dataModel, expected);
}
// RY Test different datetime types
@Test
public void dumpDate() {
@ -206,7 +207,7 @@ public class DumpDirectiveTest {
test(varName, dataModel, expected);
}
// RY Do these with different BeansWrappers
@Test
public void dumpScalarList() {
@ -231,15 +232,81 @@ public class DumpDirectiveTest {
expected.put("value", listDump);
test(varName, dataModel, expected);
}
// RY Do these with different BeansWrappers
@Test
public void dumpScalarArray() {
String varName = "fruit";
Map<String, Object> dataModel = new HashMap<String, Object>();
String[] list = { "apples", "bananas", "oranges" };
dataModel.put(varName, list);
Map<String, Object> expected = new HashMap<String, Object>();
expected.put("name", varName);
expected.put("type", "Sequence");
List<Map<String, Object>> listDump = new ArrayList<Map<String, Object>>();
for ( String str : list) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("type", "String");
map.put("value", str);
listDump.add(map);
}
expected.put("value", listDump);
test(varName, dataModel, expected);
}
@Test
public void dumpMixedList() {
// String varName = "stuff";
// Map<String, Object> dataModel = new HashMap<String, Object>();
// List<Object> list = new ArrayList<Object>();
// list.add("apples");
// list.add(4);
// list.add(false);
// List<String> animals = new ArrayList<String>();
// animals.add("dog");
// animals.add("cat");
// animals.add("elephant");
// Collections.sort(animals);
// list.add(animals);
// dataModel.put(varName, list);
//
// Map<String, Object> expected = new HashMap<String, Object>();
// expected.put("name", varName);
// expected.put("type", "Sequence");
//
// List<Map<String, Object>> listDump = new ArrayList<Map<String, Object>>();
//
// Map<String, Object> stringMap = new HashMap<String, Object>();
// stringMap.put("type", "String");
// stringMap.put("value", "apples");
// listDump.add(stringMap);
//
// Map<String, Object> numberMap = new HashMap<String, Object>();
// numberMap.put("type", "Number");
// numberMap.put("value", 4);
// listDump.add(numberMap);
//
// Map<String, Object> booleanMap = new HashMap<String, Object>();
// booleanMap.put("type", "Boolean");
// booleanMap.put("value", false);
// listDump.add(booleanMap);
//
// Map<String, Object> sequenceMap = new HashMap<String, Object>();
// sequenceMap.put("type", "Sequence");
// for ( String animal : animals ) {
// Map<String, Object> animalMap = new HashMap<String, Object>();
// animalMap.put("type", "String");
// animalMap.put("value", animal);
// sequenceMap.put("value", animalMap);
// }
// listDump.add(sequenceMap);
//
// expected.put("value", listDump);
//
// test(varName, dataModel, expected);
}
@Test
@ -247,6 +314,7 @@ public class DumpDirectiveTest {
}
// RY Do these with different BeansWrappers
@Test
public void dumpHashEx() {