Add more tests for trailing spaces in directorynames

Author: nihas101

src/main/kotlin/de/nihas101/imageToPdfConverter/directoryIterators/zipIterators/ZipFileIterator.kt

@@ -43,7 +43,7 @@ class ZipFileIterator private constructor(private val deleteOnExit: Boolean) : D
     }
 
     private fun makeUnzipDirectory(deleteOnExit: Boolean): File {
-        val unzipDirectory = File("${directory!!.parent}/${directory!!.nameWithoutExtension}")
+        val unzipDirectory = File("${directory!!.parent.trim()}/${directory!!.nameWithoutExtension.trim()}")
 
         if (deleteOnExit) unzipDirectory.deleteOnExit()
         unzipDirectory.mkdir()

src/test/kotlin/de/nihas101/imageToPdfConverter/directoryIterators/zipIterators/ImageUnZipperTest.kt

@@ -21,11 +21,11 @@ class ImageUnZipperTest {
 
     @Test
     fun unzipWithTrailingSpace() {
-        val unzipInto = File("src/test/resources/zip/images ")
+        val unzipInto = File("src/test/resources/zip/imagesTrailing")
         unzipInto.mkdir()
         unzipInto.deleteOnExit()
 
-        createImageUnZipper(File("src/test/resources/zip/images .zip")).unzip(unzipInto, true)
+        createImageUnZipper(File("src/test/resources/zip/imagesTrailing .zip")).unzip(unzipInto, true)
 
         assertEquals(4, unzipInto.listFiles().size)
     }

src/test/kotlin/de/nihas101/imageToPdfConverter/directoryIterators/zipIterators/ZipFilesIteratorTest.kt

@@ -14,6 +14,7 @@ class ZipFilesIteratorTest {
     fun nextFile() {
         val zipFilesIterator = createTestIterator()
 
+        zipFilesIterator.nextFile()
         zipFilesIterator.nextFile()
 
         try {
@@ -49,7 +50,7 @@ class ZipFilesIteratorTest {
 
         zipFilesIterator.remove(File("src/test/resources/zip/images"))
 
-        assertEquals(0, zipFilesIterator.numberOfFiles())
+        assertEquals(1, zipFilesIterator.numberOfFiles())
     }
 
     @Test
@@ -58,7 +59,7 @@ class ZipFilesIteratorTest {
 
         zipFilesIterator.add(File("src/test/resources/images"))
 
-        assertEquals(2, zipFilesIterator.numberOfFiles())
+        assertEquals(3, zipFilesIterator.numberOfFiles())
     }
 
     @Test
@@ -76,7 +77,7 @@ class ZipFilesIteratorTest {
 
         zipFilesIterator.addAll(mutableListOf(File("src/test/resources/images")))
 
-        assertEquals(2, zipFilesIterator.numberOfFiles())
+        assertEquals(3, zipFilesIterator.numberOfFiles())
     }
 
     @Test

src/test/kotlin/de/nihas101/imageToPdfConverter/pdf/builders/ImageDirectoriesPdfBuilderTest.kt

@@ -16,8 +16,7 @@ class ImageDirectoriesPdfBuilderTest {
         val imageToOptions = createOptions()
         imageToOptions.setMultipleDirectories(true)
         val saveLocation = File("src/test/resources/")
-        saveLocation.createNewFile()
-        saveLocation.deleteOnExit()
+
         imageToOptions.setSaveLocation(saveLocation)
         val directoryIterator = createDirectoryIterator(saveLocation, imageToOptions.getIteratorOptions())
         val pdfBuilder = createPdfBBuilder(imageToOptions.getIteratorOptions())
@@ -31,6 +30,31 @@ class ImageDirectoriesPdfBuilderTest {
         assertEquals(true, atomicBoolean.get())
         assertEquals(true, saveLocation.exists())
     }
+
+    @Test
+    fun buildTrailingSpace() {
+        val atomicBoolean = AtomicBoolean(false)
+        val imageToOptions = createOptions()
+        imageToOptions.setZipFiles(true)
+
+        val zipFile = File("src/test/resources/zip/imagesTrailing .zip")
+        val saveFile = File("src/test/resources/zip/imagesTrailing.pdf")
+
+        imageToOptions.setSaveLocation(saveFile)
+        val directoryIterator = createDirectoryIterator(zipFile, imageToOptions.getIteratorOptions())
+        val pdfBuilder = createPdfBBuilder(imageToOptions.getIteratorOptions())
+
+        assertEquals(4, directoryIterator.numberOfFiles())
+
+        pdfBuilder.build(directoryIterator, imageToOptions, TestProgressUpdater(atomicBoolean))
+
+
+        saveFile.deleteOnExit()
+
+        assertEquals(true, saveFile.exists())
+        assertEquals(true, atomicBoolean.get())
+        assertEquals(true, zipFile.exists())
+    }
 }
 
 class TestProgressUpdater(private val buildSuccess: AtomicBoolean) : ProgressUpdater {