- Revision
- 1306
- Author
- mauro
- Date
- 2009-10-10 16:29:47 -0500 (Sat, 10 Oct 2009)
Log Message
JBEHAVE-183: Added list/hide content actions to files controller.
Modified Paths
Diff
Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java (1305 => 1306)
--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java 2009-10-10 21:05:41 UTC (rev 1305) +++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java 2009-10-10 21:29:47 UTC (rev 1306) @@ -14,6 +14,7 @@ private final FileManager manager; private List<File> files = new ArrayList<File>(); private List<String> selectedPaths = new ArrayList<String>(); + private List<File> contentFiles = new ArrayList<File>(); public FilesController(Menu menu, FileManager manager) { super(menu); @@ -26,6 +27,19 @@ } @ActionMethod + public void listContent() { + contentFiles.clear(); + for (String path : selectedPaths) { + contentFiles.addAll(manager.listContent(path)); + } + } + + @ActionMethod + public void hideContent() { + contentFiles.clear(); + } + + @ActionMethod public void delete() { manager.delete(selectedPaths); list(); @@ -34,6 +48,10 @@ public List<File> getFiles() { return files; } + + public List<File> getContentFiles() { + return contentFiles; + } public List<String> getSelectedPaths() { return selectedPaths;
Modified: trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl (1305 => 1306)
--- trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl 2009-10-10 21:05:41 UTC (rev 1305) +++ trunk/web/web-runner/src/main/webapp/ftl/data/files.ftl 2009-10-10 21:29:47 UTC (rev 1306) @@ -26,11 +26,29 @@ </fieldset> </div> + <#assign contentFiles = controller.contentFiles /> + <#if (contentFiles.size() > 0) > + <div id="contentFiles"> + <fieldset> + <legend><@i.messageFor "contentFiles" "Content Files"/></legend> + <table> + <#list contentFiles as file> + <tr> + <td>${file.absolutePath}</td> + </tr> + </#list> + </table> + </fieldset> + </div> + </#if> + <div id="actions"> <fieldset> <legend><@i.messageFor "actions" "Actions"/></legend> <p> <a class="buttonDelete" "delete" "Delete"/></a> + <a class="buttonDelete" "listContent" "List Content"/></a> + <a class="buttonDelete" "hideContent" "Hide Content"/></a> </p> </fieldset> </div>
Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java (1305 => 1306)
--- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java 2009-10-10 21:05:41 UTC (rev 1305) +++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java 2009-10-10 21:29:47 UTC (rev 1306) @@ -2,6 +2,7 @@ import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.util.List; @@ -24,7 +25,7 @@ @Test public void canListFiles() { - final List<File> files = asList(new File("file1")); + final List<File> files = asList(new File("archive1")); mockery.checking(new Expectations() { { one(manager).list(); @@ -37,6 +38,31 @@ } @Test + public void canListContentFiles() { + final List<String> paths = asList("archive1"); + final List<File> files = asList(new File("file1"), new File("file2")); + mockery.checking(new Expectations() { + { + for ( String path : paths ){ + one(manager).listContent(path); + will(returnValue(files)); + } + } + }); + FilesController controller = new FilesController(MENU, manager); + controller.setSelectedPaths(paths); + controller.listContent(); + assertEquals(files, controller.getContentFiles()); + } + + @Test + public void canHideContentFiles() { + FilesController controller = new FilesController(MENU, manager); + controller.hideContent(); + assertTrue(controller.getContentFiles().isEmpty()); + } + + @Test public void canDeleteFiles() { final List<File> files = asList(); final List<String> paths = asList("file1");
To unsubscribe from this list please visit:
