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

Revert changes from r8901 since caused unit test failure.

Browse source
This commit is contained in:
ryounes 2011-08-05 15:21:25 +00:00
parent 092f6ed4d8
commit 5fd6020035
4 changed files with 47 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1119,10 +1119,6 @@ public class DumpDirectiveTest {
return supervisor;
}
public Employee boss() {
return supervisor;
}
public List<String> getFavoriteColors() {
return favoriteColors;
}
@ -1155,10 +1151,6 @@ public class DumpDirectiveTest {
private Map<String, Object> getJohnDoeExpectedDump(int exposureLevel) {
Map<String, Object> expectedDump = new HashMap<String, Object>();
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
supervisorExpectedDump.put(Key.VALUE.toString(), getJaneSmithExpectedDump(exposureLevel));
// Properties
SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
@ -1198,7 +1190,10 @@ public class DumpDirectiveTest {
marriedExpectedDump.put(Key.VALUE.toString(), true);
propertiesExpectedDump.put("married", marriedExpectedDump);
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
supervisorExpectedDump.put(Key.VALUE.toString(), getJaneSmithExpectedDump(exposureLevel));
propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
@ -1218,10 +1213,8 @@ public class DumpDirectiveTest {
expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);
// Methods
SortedMap<String, Object> methodDump = getEmployeeMethodsExpectedDump(exposureLevel, "Doe");
methodDump.put("boss()", supervisorExpectedDump);
expectedDump.put(Key.METHODS.toString(), methodDump);
// Methods
expectedDump.put(Key.METHODS.toString(), getEmployeeMethodsExpectedDump(exposureLevel, "Doe"));
return expectedDump;
}
@ -1257,9 +1250,6 @@ public class DumpDirectiveTest {
private Map<String, Object> getJaneSmithExpectedDump(int exposureLevel) {
Map<String, Object> expectedDump = new HashMap<String, Object>();
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL);
SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
@ -1299,6 +1289,8 @@ public class DumpDirectiveTest {
marriedExpectedDump.put(Key.VALUE.toString(), true);
propertiesExpectedDump.put("married", marriedExpectedDump);
Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL);
propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
@ -1318,9 +1310,7 @@ public class DumpDirectiveTest {
expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);
// Methods
SortedMap<String, Object> methodDump = getEmployeeMethodsExpectedDump(exposureLevel, "Smith");
methodDump.put("boss()", supervisorExpectedDump);
expectedDump.put(Key.METHODS.toString(), methodDump);
expectedDump.put(Key.METHODS.toString(), getEmployeeMethodsExpectedDump(exposureLevel, "Smith"));
return expectedDump;
}