- Revision
- 735
- Author
- mauro
- Date
- 2008-06-18 14:55:37 -0500 (Wed, 18 Jun 2008)
Log Message
Added test for selection of enums.
Modified Paths
- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormController.java
- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormMacroTest.java
- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl
- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.txt
Diff
Modified: trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormController.java (734 => 735)
--- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormController.java 2008-06-18 18:28:14 UTC (rev 734) +++ trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormController.java 2008-06-18 19:55:37 UTC (rev 735) @@ -9,11 +9,32 @@ */ public class FormController { + public enum Type { + ONE, TWO; + + public String toString(){ + return name().toUpperCase(); + } + } + private List<String> values = asList("one", "two"); private List<Nameable> nameables = asList(new Nameable("one", "One"), new Nameable("two", "Two")); private List<Displayable> displayables = asList(new Displayable("one", "One"), new Displayable("two", "Two")); private List<String> selectedValues; + private Type selectedType; + public List<Type> getTypes() { + return asList(Type.values()); + } + + public Type getSelectedType() { + return selectedType; + } + + public void setSelectedType(Type selectedType) { + this.selectedType = selectedType; + } + public List<String> getValues() { return values; }
Modified: trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormMacroTest.java (734 => 735)
--- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormMacroTest.java 2008-06-18 18:28:14 UTC (rev 734) +++ trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/FormMacroTest.java 2008-06-18 19:55:37 UTC (rev 735) @@ -29,6 +29,7 @@ public void canProcessSelectMacros() throws IOException{ FormController controller = new FormController(); controller.setSelectedValues(asList("one")); + controller.setSelectedType(FormController.Type.ONE); String expected = readResource("org/codehaus/waffle/resources/ftl/select.txt"); assertEquals(expected, processTemplateView(controller, "org/codehaus/waffle/resources/ftl/select.ftl")); }
Modified: trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl (734 => 735)
--- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl 2008-06-18 18:28:14 UTC (rev 734) +++ trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl 2008-06-18 19:55:37 UTC (rev 735) @@ -1,6 +1,7 @@ <#import "/ftl/waffle/form.ftl" as w> <@w.selectSingle "values" controller.getValues() "one"/> <@w.selectSingle "nameables" controller.getNameables() "two"/> +<@w.selectSingle "types" w.asNameables(controller.getTypes(), "name()", "name()") controller.getSelectedType() /> <@w.selectMultiple "values" controller.getValues() controller.getSelectedValues() /> <@w.selectMultiple "nameables" controller.getNameables() controller.getSelectedValues() /> <@w.selectMultiple "displayables" w.asNameables(controller.getDisplayables(),"id","display") controller.getSelectedValues() /> \ No newline at end of file
Modified: trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.txt (734 => 735)
--- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.txt 2008-06-18 18:28:14 UTC (rev 734) +++ trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.txt 2008-06-18 19:55:37 UTC (rev 735) @@ -6,6 +6,10 @@ <option value="one" >One</option> <option value="two" selected="true">Two</option> </select> + <select id="types" name="types" > + <option value="ONE" selected="true">ONE</option> + <option value="TWO" >TWO</option> + </select> <select multiple="multiple" id="values" name="values" > <option value="one" selected="true">one</option> <option value="two" >two</option>
To unsubscribe from this list please visit:
