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

NIHVIVO-3113 fix values for null objects in dump

Browse source
This commit is contained in:
ryounes 2011-08-09 23:20:42 +00:00
parent da8c374676
commit 8e53069ec5
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/freemarker/ext/dump/BaseDumpDirective.java
View file

@ -82,8 +82,8 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
} }
enum Value { enum Value {
NULL("<null>"), NULL("[null]"),
UNDEFINED("<undefined>"); UNDEFINED("[undefined]");
private final String value; private final String value;
@ -156,7 +156,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
Map<String, Object> value = new HashMap<String, Object>(); Map<String, Object> value = new HashMap<String, Object>();
if (model == null) { if (model == null) {
value.put(Key.VALUE.toString(), Value.UNDEFINED); value.put(Key.VALUE.toString(), Value.UNDEFINED.toString());
// TemplateMethodModel and TemplateDirectiveModel objects can only be // TemplateMethodModel and TemplateDirectiveModel objects can only be
// included in the data model at the top level. // included in the data model at the top level.
@ -228,7 +228,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
map.putAll( getTemplateModelDump( (TemplateModel)model ) ); map.putAll( getTemplateModelDump( (TemplateModel)model ) );
} }
} else { } else {
map.put(Key.VALUE.toString(), Value.NULL); map.put(Key.VALUE.toString(), Value.NULL.toString());
} }
return map; return map;

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

@ -81,7 +81,7 @@ public class DumpDirectiveTest {
Map<String, Object> dataModel = new HashMap<String, Object>(); Map<String, Object> dataModel = new HashMap<String, Object>();
Map<String, Object> expectedDumpValue = new HashMap<String, Object>(); Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
expectedDumpValue.put(Key.VALUE.toString(), Value.UNDEFINED); expectedDumpValue.put(Key.VALUE.toString(), Value.UNDEFINED.toString());
Map<String, Object> expectedDump = new HashMap<String, Object>(); Map<String, Object> expectedDump = new HashMap<String, Object>();
expectedDump.put(varName, expectedDumpValue); expectedDump.put(varName, expectedDumpValue);
@ -1199,7 +1199,7 @@ public class DumpDirectiveTest {
propertiesExpectedDump.put("nickname", nicknameExpectedDump); propertiesExpectedDump.put("nickname", nicknameExpectedDump);
Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>(); Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL); middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
propertiesExpectedDump.put("middleName", middleNameExpectedDump); propertiesExpectedDump.put("middleName", middleNameExpectedDump);
Map<String, Object> marriedExpectedDump = new HashMap<String, Object>(); Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
@ -1286,7 +1286,7 @@ public class DumpDirectiveTest {
Map<String, Object> expectedDump = new HashMap<String, Object>(); Map<String, Object> expectedDump = new HashMap<String, Object>();
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>(); Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL); supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>(); SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
@ -1318,7 +1318,7 @@ public class DumpDirectiveTest {
propertiesExpectedDump.put("nickname", nicknameExpectedDump); propertiesExpectedDump.put("nickname", nicknameExpectedDump);
Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>(); Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL); middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
propertiesExpectedDump.put("middleName", middleNameExpectedDump); propertiesExpectedDump.put("middleName", middleNameExpectedDump);
Map<String, Object> marriedExpectedDump = new HashMap<String, Object>(); Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
@ -1343,7 +1343,7 @@ public class DumpDirectiveTest {
propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump); propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
// Map<String, Object> degreesExpectedDump = new HashMap<String, Object>(); // Map<String, Object> degreesExpectedDump = new HashMap<String, Object>();
// degreesExpectedDump.put(Key.VALUE.toString(), Value.NULL); // degreesExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
// propertiesExpectedDump.put("degrees", degreesExpectedDump); // propertiesExpectedDump.put("degrees", degreesExpectedDump);
} }
expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump); expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);