- Revision
- 1307
- Author
- mauro
- Date
- 2009-10-10 17:01:19 -0500 (Sat, 10 Oct 2009)
Log Message
JBEHAVE-182: Added cause to file failures.
Modified Paths
Diff
Modified: trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java (1306 => 1307)
--- trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java 2009-10-10 21:29:47 UTC (rev 1306) +++ trunk/web/web-io/src/main/java/org/jbehave/web/io/ArchivingFileManager.java 2009-10-10 22:01:19 UTC (rev 1307) @@ -70,12 +70,18 @@ archiver.unarchive(file, directory); } catch (FileUnarchiveFailedException e) { errors.add(e.getMessage()); + if ( e.getCause() != null ){ + errors.add(e.getCause().getMessage()); + } } } } catch (FileItemNameMissingException e) { // ignore and carry on } catch (FileWriteFailedException e) { errors.add(e.getMessage()); + if ( e.getCause() != null ){ + errors.add(e.getCause().getMessage()); + } } } return files;
Modified: trunk/web/web-io/src/main/java/org/jbehave/web/io/ZipFileArchiver.java (1306 => 1307)
--- trunk/web/web-io/src/main/java/org/jbehave/web/io/ZipFileArchiver.java 2009-10-10 21:29:47 UTC (rev 1306) +++ trunk/web/web-io/src/main/java/org/jbehave/web/io/ZipFileArchiver.java 2009-10-10 22:01:19 UTC (rev 1307) @@ -52,9 +52,9 @@ List<File> content = new ArrayList<File>(); try { content.add(directory); - if ( directory.isDirectory() ){ - for (File file : directory.listFiles() ) { - content.addAll(listContent(file)); + if (directory.isDirectory()) { + for (File file : directory.listFiles()) { + content.addAll(listContent(file)); } } } catch (Exception e) { @@ -62,7 +62,6 @@ return content; } - private void unzipEntry(ZipArchiveEntry entry, InputStream in, File outputDir) throws IOException { @@ -75,13 +74,13 @@ if (!outputFile.getParentFile().exists()) { createDir(outputFile.getParentFile()); } - + copy(entry, in, outputDir); } private void createDir(File dir) throws IOException { - if (dir.exists()){ + if (dir.exists()) { return; } if (!dir.mkdirs()) { @@ -103,8 +102,7 @@ public FileUnarchiveFailedException(File archive, File outputDir, Exception cause) { - super(archive.toString() + File.pathSeparator - + outputDir.toString(), cause); + super("Failed to unarchive " + archive + " to output dir " + outputDir, cause); } }
Modified: trunk/web/web-io/src/test/java/org/jbehave/web/io/ArchivingFileManagerTest.java (1306 => 1307)
--- trunk/web/web-io/src/test/java/org/jbehave/web/io/ArchivingFileManagerTest.java 2009-10-10 21:29:47 UTC (rev 1306) +++ trunk/web/web-io/src/test/java/org/jbehave/web/io/ArchivingFileManagerTest.java 2009-10-10 22:01:19 UTC (rev 1307) @@ -27,7 +27,6 @@ public class ArchivingFileManagerTest { private Mockery mockery = new Mockery(); - private static final String TMP = System.getProperty("java.io.tmpdir"); private FileManager manager; private File upload; private File dir1; @@ -37,8 +36,7 @@ @Before public void setup() throws IOException { - upload = new File(TMP, "upload"); - upload.mkdirs(); + upload = createUploadDir(); dir1 = createDir("dir1"); file1 = create("file1"); file2 = create("file2"); @@ -112,7 +110,7 @@ // remove zip zip.delete(); manager.write(asList(file2FileItem, zipFileItem), errors); - assertEquals(1, errors.size()); + assertEquals(2, errors.size()); } @Test @@ -153,7 +151,7 @@ file2.delete(); zip.delete(); manager.write(asList(file2FileItem, zipFileItem), errors); - assertEquals(2, errors.size()); + assertEquals(4, errors.size()); } private File create(String path) throws IOException { @@ -170,6 +168,13 @@ return dir; } + private File createUploadDir() throws IOException { + File dir = new File(System.getProperty("java.io.tmpdir"), "upload"); + dir.mkdirs(); + return dir; + } + + private void archiveFiles(File archive, List<File> files) throws IOException { FileOutputStream fileStream = new FileOutputStream(archive); ZipOutputStream zipStream = new ZipOutputStream(fileStream);
To unsubscribe from this list please visit:
