Author: bleny Date: 2010-06-14 10:53:35 +0200 (Mon, 14 Jun 2010) New Revision: 75 Url: http://nuiton.org/repositories/revision/diswork/75 Log: mauvaise utilisation du FS dans les tests Modified: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java Modified: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java 2010-06-14 08:12:34 UTC (rev 74) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java 2010-06-14 08:53:35 UTC (rev 75) @@ -83,7 +83,7 @@ */ @Test public void testWrite() throws Exception { - fileSystem.write("/", "my_file", new FileInputStream(randomFilePath)); + fileSystem.write("/my_file", new FileInputStream(randomFilePath)); } /** @@ -92,7 +92,7 @@ */ @Test public void testExists() throws Exception { - fileSystem.write("/", "my_file", new FileInputStream(randomFilePath)); + fileSystem.write("/my_file", new FileInputStream(randomFilePath)); assertTrue(fileSystem.exists("/my_file")); assertFalse(fileSystem.exists("/my_other_file")); } @@ -119,7 +119,7 @@ InputStream source; source = new ByteArrayInputStream(bytes); - fileSystem.write("/", "my_file", source); + fileSystem.write("/my_file", source); source.close(); @@ -148,7 +148,7 @@ InputStream source = new FileInputStream(randomFilePath); - fileSystem.write("/", "my_file", source); + fileSystem.write("/my_file", source); source.close(); @@ -179,7 +179,7 @@ */ @Test(expected = IOException.class) public void testFailAtWrite() throws Exception { - fileSystem.write("/my_folder", "my_file", + fileSystem.write("/my_folder/my_file", new FileInputStream(randomFilePath)); } @@ -220,10 +220,10 @@ @Test public void testWriteInFolder() throws Exception { fileSystem.createDirectory("/my_folder"); - fileSystem.write("/my_folder", "my_file", + fileSystem.write("/my_folder/my_file", new FileInputStream(randomFilePath)); fileSystem.createDirectory("/my_folder/my_sub_folder"); - fileSystem.write("/my_folder/my_sub_folder", "my_file", + fileSystem.write("/my_folder/my_sub_folder/my_file", new FileInputStream(randomFilePath)); assertTrue(fileSystem.exists("/my_folder/my_sub_folder/my_file")); } @@ -236,7 +236,7 @@ @Test public void testLinking() throws Exception { fileSystem.createDirectory("/my_folder"); - fileSystem.write("/my_folder", "my_file", + fileSystem.write("/my_folder/my_file", new FileInputStream(randomFilePath)); fileSystem.createSymbolicLink("/my_link", "/my_folder/my_file"); @@ -267,7 +267,7 @@ @Test public void testRemove() throws Exception { fileSystem.createDirectory("/my_folder"); - fileSystem.write("/my_folder", "my_file", + fileSystem.write("/my_folder/my_file", new FileInputStream(randomFilePath)); fileSystem.delete("/my_folder/my_file"); assertTrue(fileSystem.exists("/my_folder")); @@ -284,7 +284,7 @@ @Test(expected = IOException.class) public void testFailAtRemove() throws Exception { fileSystem.createDirectory("/my_folder"); - fileSystem.write("/my_folder", "my_file", + fileSystem.write("/my_folder/my_file", new FileInputStream(randomFilePath)); // trying to remove a non-empty directory should raise an exception @@ -298,7 +298,7 @@ public void testListDirectory() throws Exception { fileSystem.createDirectory("/my_folder"); fileSystem.createDirectory("/my_folder/my_sub_dir"); - fileSystem.write("/my_folder", "my_file", + fileSystem.write("/my_folder/my_file", new FileInputStream(randomFilePath)); fileSystem.createSymbolicLink("/my_folder/my_link", "my_file"); @@ -397,7 +397,11 @@ @Test public void testCreateDirectories() throws Exception { - fileSystem.createDirectories("/dir/subdir/subsubdir"); - assertTrue(fileSystem.exists("/dir/subdir/subsubdir")); + try { + fileSystem.createDirectories("/dir/subdir/subsubdir"); + assertTrue(fileSystem.exists("/dir/subdir/subsubdir")); + } catch (IOException e) { + fail(); + } } }