Tamino
/
Siba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SibaManager updated path to absolutePath and test

This commit is contained in:
Didier Clermonté 2016-08-30 23:00:49 +02:00
parent ac1e2d1c48
commit 86584648cc
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/dclermonte/siba/model/SibaManager.java
View File

@ -111,8 +111,7 @@ public final class SibaManager
out = new TarArchiveOutputStream(gzipOutputStream); out = new TarArchiveOutputStream(gzipOutputStream);
SibaUtils.tarDirectoryTree(fileToSave, out); SibaUtils.tarDirectoryTree(fileToSave, out);
out.close(); out.close();
String fileSeparator = System.getProperty("file.separator"); SibaUtils.createMD5File(result, target + File.separator + outputFileNameWithoutExtension + ".tgz.md5");
SibaUtils.createMD5File(result, target + fileSeparator + outputFileNameWithoutExtension + ".tgz.md5");
} }
} }
catch (IOException exception) catch (IOException exception)

4
src/org/dclermonte/siba/model/SibaUtils.java
View File

@ -311,7 +311,7 @@ public final class SibaUtils
if (file.listFiles().length == 0) if (file.listFiles().length == 0)
{ {
TarArchiveEntry tarArchiveEntry = new TarArchiveEntry(file); TarArchiveEntry tarArchiveEntry = new TarArchiveEntry(file);
String pathPartiel = file.getPath().substring(pathLength); String pathPartiel = file.getAbsolutePath().substring(pathLength);
tarArchiveEntry.setName(pathPartiel); tarArchiveEntry.setName(pathPartiel);
outputStream.putArchiveEntry(tarArchiveEntry); outputStream.putArchiveEntry(tarArchiveEntry);
outputStream.closeArchiveEntry(); outputStream.closeArchiveEntry();
@ -324,7 +324,7 @@ public final class SibaUtils
else else
{ {
TarArchiveEntry tarArchiveEntry = new TarArchiveEntry(file); TarArchiveEntry tarArchiveEntry = new TarArchiveEntry(file);
String pathPartiel = file.getPath().substring(pathLength); String pathPartiel = file.getAbsolutePath().substring(pathLength);
tarArchiveEntry.setName(pathPartiel); tarArchiveEntry.setName(pathPartiel);
outputStream.putArchiveEntry(tarArchiveEntry); outputStream.putArchiveEntry(tarArchiveEntry);
IOUtils.copy(new FileInputStream(file), outputStream); IOUtils.copy(new FileInputStream(file), outputStream);

BIN
test/org/dclermonte/siba/data/reference/simplestuff-2016-08-26T22h17mn38s.tgz
View File

Binary file not shown.

1
test/org/dclermonte/siba/data/reference/simplestuff-2016-08-26T22h17mn38s.tgz.md5
View File

@ -1 +0,0 @@
2ca82150296f8412afd282e0d412ddea simplestuff-2016-08-26T22h17mn38s.tgz

BIN
test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz Normal file
View File

Binary file not shown.

1
test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz.md5 Normal file
View File

@ -0,0 +1 @@
0cdb449c8a62adc04d7ac0a095b2a247 simplestuff-2016-08-30T22h44mn21s.tgz

0
test/org/dclermonte/siba/data/simplestuff/DIRECTORY1/toto
View File

1
test/org/dclermonte/siba/data/simplestuff/DIRECTORY1_essai/toto Normal file
View File

@ -0,0 +1 @@
toto est là

0
test/org/dclermonte/siba/data/simplestuff/bbb-splash.jpg → test/org/dclermonte/siba/data/simplestuff/bbb-essai-splash.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

10
test/org/dclermonte/siba/model/SibaManagerTest.java
View File

@ -48,7 +48,8 @@ public class SibaManagerTest
{ {
File source = new File("test/org/dclermonte/siba/data/simplestuff"); File source = new File("test/org/dclermonte/siba/data/simplestuff");
File target = SibaManager.backup(source, new File("test/org/dclermonte/siba/data/result")); File target = SibaManager.backup(source, new File("test/org/dclermonte/siba/data/result"));
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-26T22h17mn38s.tgz");
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz");
Boolean fileEquals = FileUtils.contentEquals(reference, target); Boolean fileEquals = FileUtils.contentEquals(reference, target);
// Test. // Test.
Assert.assertTrue(fileEquals); Assert.assertTrue(fileEquals);
@ -59,10 +60,9 @@ public class SibaManagerTest
{ {
File source = new File("test/org/dclermonte/siba/data/simplestuff"); File source = new File("test/org/dclermonte/siba/data/simplestuff");
File target = SibaManager.backup(source, new File("test/org/dclermonte/siba/data/result")); File target = SibaManager.backup(source, new File("test/org/dclermonte/siba/data/result"));
String fileNameMD5 = "test/org/dclermonte/siba/data/result/fileMD5"; String md5Calculate = SibaUtils.md5(target);
File fileMD5 = SibaUtils.createMD5File(target, fileNameMD5);
String md5Calculate = SibaUtils.loadMD5Sum(fileMD5); File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz.md5");
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-26T22h17mn38s.tgz.md5");
String md5Reference = SibaUtils.loadMD5Sum(reference); String md5Reference = SibaUtils.loadMD5Sum(reference);
// Test. // Test.
Assert.assertEquals(md5Calculate, md5Reference); Assert.assertEquals(md5Calculate, md5Reference);