- Revision
- 1341
- Author
- mauro
- Date
- 2009-10-15 15:00:09 -0500 (Thu, 15 Oct 2009)
Log Message
Minor changes to some tests to overcome Windows' idiosyncrantic idiotic behaviour
Modified Paths
Diff
Modified: trunk/web/web-io/src/test/java/org/jbehave/web/io/ArchivingFileManagerTest.java (1340 => 1341)
--- trunk/web/web-io/src/test/java/org/jbehave/web/io/ArchivingFileManagerTest.java 2009-10-14 22:17:20 UTC (rev 1340) +++ trunk/web/web-io/src/test/java/org/jbehave/web/io/ArchivingFileManagerTest.java 2009-10-15 20:00:09 UTC (rev 1341) @@ -9,6 +9,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -55,16 +57,25 @@ @Test public void canListFilesThatAreNotDirectories() throws IOException { - assertEquals(asList(zip, file1, file2), manager.list()); + assertEquals(asList(zip, file1, file2), listFiles()); } + private List<File> listFiles() { + List<File> list = manager.list(); + Collections.sort(list, new Comparator<File>(){ + public int compare(File arg0, File arg1) { + return arg0.getName().compareTo(arg1.getName()); + }}); + return list; + } + @Test public void canDeleteFilesAndDirectories() throws IOException { - assertEquals(asList(zip, file1, file2), manager.list()); + assertEquals(asList(zip, file1, file2), listFiles()); manager.delete(asList(file1.getAbsolutePath())); - assertEquals(asList(zip, file2), manager.list()); + assertEquals(asList(zip, file2), listFiles()); manager.delete(asList(zip.getAbsolutePath())); - assertEquals(asList(file2), manager.list()); + assertEquals(asList(file2), listFiles()); } @Test @@ -169,7 +180,7 @@ } private File createUploadDir() throws IOException { - File dir = new File("target", "upload"); + File dir = new File("target/upload"); dir.mkdirs(); return dir; }
Modified: trunk/web/web-io/src/test/java/org/jbehave/web/io/ZipFileArchiverTest.java (1340 => 1341)
--- trunk/web/web-io/src/test/java/org/jbehave/web/io/ZipFileArchiverTest.java 2009-10-14 22:17:20 UTC (rev 1340) +++ trunk/web/web-io/src/test/java/org/jbehave/web/io/ZipFileArchiverTest.java 2009-10-15 20:00:09 UTC (rev 1341) @@ -18,8 +18,8 @@ @Before public void setup() throws IOException { - dir = new File("target", "dir"); - dir.createNewFile(); + dir = new File("target/dir"); + dir.mkdirs(); } @Test
Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java (1340 => 1341)
--- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java 2009-10-14 22:17:20 UTC (rev 1340) +++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java 2009-10-15 20:00:09 UTC (rev 1341) @@ -38,7 +38,7 @@ String scenarioOutput = scenarioInput; // if successfully, input=output controller.getScenarioContext().setInput(scenarioInput); controller.run(); - assertEquals(scenarioOutput, controller.getScenarioContext().getOutput().trim()); + assertLinesMatch(scenarioOutput, controller.getScenarioContext().getOutput().trim()); assertEquals(0, controller.getScenarioContext().getFailureMessages().size()); assertEquals("", controller.getScenarioContext().getFailureStackTrace()); } @@ -58,11 +58,21 @@ + "Then a tester is a happy hopper (NOT PERFORMED)"; controller.getScenarioContext().setInput(scenarioInput); controller.run(); - assertEquals(scenarioOutput, controller.getScenarioContext().getOutput().trim()); + assertLinesMatch(scenarioOutput, controller.getScenarioContext().getOutput().trim()); assertEquals(asList("Test failed"), controller.getScenarioContext().getFailureMessages()); assertTrue(controller.getScenarioContext().getFailureStackTrace().startsWith("java.lang.RuntimeException: Test failed")); } + private void assertLinesMatch(String expected, String actual) { + String[] expectedLines = expected.split(NL); + String[] actualLines = actual.split(NL); + assertEquals(expectedLines.length, actualLines.length); + for (int i = 0; i < expectedLines.length; i++ ){ + assertEquals(expectedLines[i].trim(), actualLines[i].trim()); + } + + } + public static class MySteps extends Steps { @Given("a test") public void aTest(){
To unsubscribe from this list please visit:
