Fix a test

Author: HydrolienF

src/main/java/fr/formiko/utils/FLUFiles.java

@@ -23,7 +23,6 @@
  * When a function name does not contains file or directory, it can be used with both.
  * All functions return true if it work and false if it doesn't.
  * Long opperation that are multithreaded:
- * - zip
  * - unzip
  * - copy
  * 
@@ -73,6 +72,9 @@ private static void setDownloadingMessage(String message) {
     public static List<String> listFilesRecursively(String path) { return internal.listFilesRecursively(path); }
 
     public static boolean zip(String source, String destination) { return internal.zip(source, destination); }
+    /**
+     * @param directoryInsideZipToGet If it's a/b/ then b/ will be created. To have only b content, use a/b/*
+     */
     public static boolean unzip(String source, String destination, String directoryInsideZipToGet) {
         return internal.unzip(source, destination, directoryInsideZipToGet);
     }
@@ -313,7 +315,7 @@ private void zipFile(File fileToZip, String fileName, String destination, ZipOut
                 zos.putNextEntry(new ZipEntry(finalfileName));
                 zos.closeEntry();
                 List<Boolean> allOk = Arrays.asList(true);
-                Arrays.stream(fileToZip.listFiles()).parallel().forEach(file -> {
+                Arrays.stream(fileToZip.listFiles()).forEach(file -> {
                     try {
                         zipFile(file, finalfileName + file.getName(), destination, zos);
                     } catch (IOException e) {
@@ -384,14 +386,18 @@ private boolean unzipAllEntries(String source, String destination, String direct
 
         private boolean createZipEntry(String destination, String directoryInsideZipToGet, InputStream zis, ZipEntry entry)
                 throws IOException {
+            boolean noDirectory = directoryInsideZipToGet.endsWith("*");
+            if (noDirectory) {
+                directoryInsideZipToGet = directoryInsideZipToGet.substring(0, directoryInsideZipToGet.length() - 1);
+            }
             directoryInsideZipToGet = FLUStrings.removeAtTheEndIfNeeded(directoryInsideZipToGet.replace('\\', '/'), FILE_SEPARATOR);
             File destinationFile = new File(destination);
             String absoluteDestinationPath = FLUStrings.addAtTheEndIfNeeded(destinationFile.getAbsolutePath().replace('\\', '/'),
                     FILE_SEPARATOR);
             String entryName = entry.getName().replace('\\', '/');
             if (directoryInsideZipToGet.isEmpty() || directoryInsideZipToGet.equals(".") || entryName.startsWith(directoryInsideZipToGet)) {
                 // Remove part of the path that we don't want
-                int charToCut = directoryInsideZipToGet.lastIndexOf('/');
+                int charToCut = noDirectory ? directoryInsideZipToGet.length() : directoryInsideZipToGet.lastIndexOf('/');
                 entryName = FLUStrings.removeAtTheBeginningIfNeeded(entryName.substring(Math.max(0, charToCut)), FILE_SEPARATOR);
 
                 if (entryName.isEmpty()) {

src/test/java/fr/formiko/utils/FLUFilesTest.java

@@ -305,13 +305,18 @@ void testUnzip(String pathToBeZip, boolean shouldWork, String zipedFile, String
             // assertEquals(true, FLUFiles.delete(zipedFile));
             // assertEquals(true, FLUFiles.delete(pathToDownloadIntoZip));
         }
+        clean();
     }
 
     private static Stream<Arguments> testUnzipSource() {
         return Stream.of(
                 Arguments.of(TEST_PATH + "existingDir/", true, TEST_PATH_TEMPORARY + "createdZip", "",
                         TEST_PATH_TEMPORARY + "existingDir/"),
                 Arguments.of(TEST_PATH + "existingDir/", true, TEST_PATH_TEMPORARY + "createdZip", "existingDir/subDir/",
+                        TEST_PATH_TEMPORARY + "subDir/existingFile.txt"),
+                Arguments.of(TEST_PATH + "existingDir/", true, TEST_PATH_TEMPORARY + "createdZip", "existingDir/subDir/existingFile.txt",
+                        TEST_PATH_TEMPORARY + "existingFile.txt"),
+                Arguments.of(TEST_PATH + "existingDir/", true, TEST_PATH_TEMPORARY + "createdZip", "existingDir/subDir/*",
                         TEST_PATH_TEMPORARY + "existingFile.txt"));
     }
 
@@ -377,9 +382,13 @@ public static void main(String[] args) {
         // FLUFiles.createFile(TEST_PATH_TEMPORARY + "/testCreateFiles1.txt");
         // Arguments.of("https://github.com/HydrolienF/Kokcinelo/releases/download/3.0.20/KokcineloLauncher.zip", true,
         // TEST_PATH_TEMPORARY + "kl1/", TEST_PATH_TEMPORARY + "kl1/" + "KokcineloLauncher/", "")
+        // clean();
+        // System.out
+        // .println(FLUFiles.downloadAndUnzip("https://github.com/HydrolienF/Kokcinelo/releases/download/3.0.20/KokcineloLauncher.zip",
+        // TEST_PATH_TEMPORARY, "Kokcinelo3.0.20/icon.png"));
+
         clean();
-        System.out
-                .println(FLUFiles.downloadAndUnzip("https://github.com/HydrolienF/Kokcinelo/releases/download/3.0.20/KokcineloLauncher.zip",
-                        TEST_PATH_TEMPORARY, "Kokcinelo3.0.20/icon.png"));
+        // FLUFiles.zip("../teavm/", "teavm.zip");
+        FLUFiles.unzip("teavm.zip", TEST_PATH_TEMPORARY, "teavm/jso/*");
     }
 }