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

NIHVIVO-1562 Add unit tests for TemplateDirectiveModel and TemplateMethodModel help() methods that return something other than the expected type. Delete HelpDirectiveTest since it just replicated method and help directive tests in DumpDirectiveTest, and was a nuisance to maintain.

Browse source
This commit is contained in:
ryounes 2011-04-25 14:13:33 +00:00
parent 1b9f4bbdce
commit 1ef114ff45
3 changed files with 78 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -453,7 +453,11 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
Method help = cls.getMethod("help", String.class);
try {
return (Map<String, Object>) help.invoke(model, varName);
} catch (Exception e) {
} catch (ClassCastException e) {
log.error("Method help() of " + modelClass + " of class " + cls.getName() + " has incorrect return type.");
return null;
} catch (Exception e) {
//
log.error("Error invoking method help() on " + modelClass + " of class " + cls.getName());
return null;
}