Unify rescource unzipping

Author: janblom

src/test/java/org/ohdsi/usagi/indexBuilding/BerkeleyDbBuilderIT.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.ohdsi.usagi.BerkeleyDbEngine;
 import org.ohdsi.usagi.Concept;
+import org.ohdsi.usagi.TestUtils;
 import org.ohdsi.usagi.MapsToRelationship;
 import org.ohdsi.usagi.ParentChildRelationShip;
 import org.ohdsi.usagi.ui.Global;
@@ -170,15 +171,7 @@ void testBuildIndexWithZipResource() throws IOException {
         Path zipVocabFolder = tempDir.resolve("zip_vocab");
         Files.createDirectories(zipVocabFolder);
 
-        try (ZipInputStream zis = new ZipInputStream(
-                getClass().getResourceAsStream("/OMOP-vocabularies-minimal.zip"))) {
-            ZipEntry entry;
-            while ((entry = zis.getNextEntry()) != null) {
-                Path filePath = zipVocabFolder.resolve(entry.getName());
-                Files.copy(zis, filePath);
-                zis.closeEntry();
-            }
-        }
+        TestUtils.unzipResource("/OMOP-vocabularies-minimal.zip", zipVocabFolder);
 
         // Set up the Global folder for the database in a separate subfolder
         Path dbFolder = tempDir.resolve("zip_db");

src/test/java/org/ohdsi/usagi/ui/UsagiMainIT.java

@@ -12,6 +12,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import org.ohdsi.usagi.TestUtils;
+
 import javax.swing.*;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -60,7 +62,7 @@ private void setupEnvironment(boolean createAuthorFile) throws IOException {
         // Unzip OMOP vocabularies
         vocabDir = tempDir.resolve("vocab");
         Files.createDirectories(vocabDir);
-        unzipResource("/OMOP-vocabularies-minimal.zip", vocabDir);
+        TestUtils.unzipResource("/OMOP-vocabularies-minimal.zip", vocabDir);
 
         // Prepare UsagiMain
         String[] args = {tempDir.toAbsolutePath().toString()};
@@ -163,26 +165,4 @@ private void runBuildIndexTest() {
         restartPane.okButton().click();
     }
 
-    private void unzipResource(String resourceName, Path targetDir) throws IOException {
-        try (InputStream is = getClass().getResourceAsStream(resourceName);
-             ZipInputStream zis = new ZipInputStream(is)) {
-            ZipEntry entry;
-            while ((entry = zis.getNextEntry()) != null) {
-                File newFile = new File(targetDir.toFile(), entry.getName());
-                if (entry.isDirectory()) {
-                    newFile.mkdirs();
-                } else {
-                    newFile.getParentFile().mkdirs();
-                    try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                        byte[] buffer = new byte[1024];
-                        int len;
-                        while ((len = zis.read(buffer)) > 0) {
-                            fos.write(buffer, 0, len);
-                        }
-                    }
-                }
-                zis.closeEntry();
-            }
-        }
-    }
 }