diff --git a/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResult.java b/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResult.java index 9ed4dc207..292205030 100644 --- a/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResult.java +++ b/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResult.java @@ -48,12 +48,13 @@ public class UnzipResult { @Override public String toString() { StringBuilder sb = new StringBuilder(); + sb.append("Project: \"").append(projectDir).append("\"\n"); sb.append("New: ").append(newFiles).append('\n'); sb.append("Overwritten: ").append(overwrittenFiles).append('\n'); sb.append("Skipped: ").append(skippedFiles).append('\n'); sb.append("Unchanged: ").append(unchangedFiles).append('\n'); sb.append("Deleted: ").append(deletedFiles).append('\n'); - sb.append("Not deleted: ").append(deletedFiles).append('\n'); + sb.append("Not deleted: ").append(skippedDeletingFiles).append('\n'); return sb.toString(); } } diff --git a/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResultTest.java b/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResultTest.java new file mode 100644 index 000000000..10881081b --- /dev/null +++ b/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/io/zip/UnzipResultTest.java @@ -0,0 +1,42 @@ +package fi.helsinki.cs.tmc.langs.io.zip; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +public class UnzipResultTest { + + @Test + public void unzipResultToStringContainsExpectedPaths() { + final List expected = new ArrayList<>(); + + Path projectPath = Paths.get("./test/"); + UnzipResult result = new UnzipResult(projectPath); + expected.add(projectPath); + addItemToBoth(Paths.get("test/Toaster.java"), expected, result.newFiles); + addItemToBoth(Paths.get("test/Overwritten.java"), expected, result.overwrittenFiles); + addItemToBoth(Paths.get("test/Test.iml"), expected, result.skippedFiles); + addItemToBoth(Paths.get("test/bar/Foo.java"), expected, result.unchangedFiles); + addItemToBoth(Paths.get("test/target/Thing.jar"), expected, result.deletedFiles); + addItemToBoth(Paths.get("test/target/Report.xml"), expected, result.skippedDeletingFiles); + + String resultString = result.toString(); + + for (Path path : expected) { + String pathString = path.toString(); + assertTrue( + "Expected UnzipResult to contain path \"" + pathString + "\"", + resultString.contains(pathString)); + } + } + + private static void addItemToBoth(T item, List first, List second) { + first.add(item); + second.add(item); + } +}