SSDM-13926: Writing tests for import/export API. Created tests for ZIP import.

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/importer/ImportExecutor.java

@@ -44,14 +44,14 @@ import ch.systemsx.cisd.openbis.generic.server.CommonServiceProvider;
 public class ImportExecutor implements IImportExecutor
 {
 
-    private static final String SCRIPTS_FOLDER_NAME = "scripts";
+    private static final String ZIP_PATH_SEPARATOR = "/";
+
+    private static final String SCRIPTS_FOLDER_NAME = "scripts" + ZIP_PATH_SEPARATOR;
 
     private static final String XLS_EXTENSION = "." + "xls";
 
     private static final String XLSX_EXTENSION = "." + "xlsx";
 
-    private static final String ZIP_PATH_SEPARATOR = "/";
-
     private static final long DATA_LIMIT = 104857600L;
 
     @Override
@@ -102,9 +102,9 @@ public class ImportExecutor implements IImportExecutor
                                 {
                                     throw UserFailureException.fromTemplate("More than one XLS file found in the root of the imported ZIP file.");
                                 }
-                            } else if (entryName.startsWith(SCRIPTS_FOLDER_NAME + ZIP_PATH_SEPARATOR))
+                            } else if (entryName.startsWith(SCRIPTS_FOLDER_NAME))
                             {
-                                scripts.put(entryName.substring((SCRIPTS_FOLDER_NAME + ZIP_PATH_SEPARATOR).length()), new String(zip.readAllBytes()));
+                                scripts.put(entryName.substring(SCRIPTS_FOLDER_NAME.length()), new String(zip.readAllBytes()));
                             } else
                             {
                                 throw UserFailureException.fromTemplate(

server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java

@@ -82,40 +82,12 @@ public class ZipImportTest extends AbstractImportTest
         v3api.logout(sessionToken);
     }
 
-    @Test
-    public void testUncompressedDataImport()
-    {
-        final String sessionToken = v3api.login(TEST_USER, PASSWORD);
-
-        final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("import.xlsx"), null);
-        final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
-
-        v3api.executeImport(sessionToken, importData, importOptions);
-
-        final VocabularySearchCriteria vocabularySearchCriteria = new VocabularySearchCriteria();
-        vocabularySearchCriteria.withCode().thatEquals("DETECTION");
-
-        final VocabularyFetchOptions vocabularyFetchOptions = new VocabularyFetchOptions();
-        vocabularyFetchOptions.withTerms();
-
-        final SearchResult<Vocabulary> vocabularySearchResult =
-                v3api.searchVocabularies(sessionToken, vocabularySearchCriteria, vocabularyFetchOptions);
-
-        assertEquals(vocabularySearchResult.getTotalCount(), 1);
-
-        final List<VocabularyTerm> vocabularyTerms = vocabularySearchResult.getObjects().get(0).getTerms();
-        assertEquals(vocabularyTerms.size(), 2);
-        assertEquals(vocabularyTerms.stream().map(VocabularyTerm::getCode).collect(Collectors.toSet()), Set.of("HRP", "AAA"));
-
-        v3api.logout(sessionToken);
-    }
-
     @Test
     public void testImportOptionsUpdateIfExists()
     {
         final String sessionToken = v3api.login(TEST_USER, PASSWORD);
 
-        final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
+        final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
         final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
 
         v3api.executeImport(sessionToken, importData, importOptions);
@@ -147,7 +119,7 @@ public class ZipImportTest extends AbstractImportTest
     {
         final String sessionToken = v3api.login(TEST_USER, PASSWORD);
 
-        final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
+        final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
         final ImportOptions importOptions = new ImportOptions(ImportMode.IGNORE_EXISTING);
 
         v3api.executeImport(sessionToken, importData, importOptions);
@@ -179,7 +151,7 @@ public class ZipImportTest extends AbstractImportTest
     {
         final String sessionToken = v3api.login(TEST_USER, PASSWORD);
 
-        final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
+        final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
         final ImportOptions importOptions = new ImportOptions(ImportMode.FAIL_IF_EXISTS);
 
         try
@@ -198,8 +170,7 @@ public class ZipImportTest extends AbstractImportTest
 
         final String name = "valid.py";
         final String source = "print 'Test validation script'";
-        final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("validation_script.xls"),
-                List.of(new ImportScript(name, source)));
+        final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("validation_script.zip"));
         final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
 
         v3api.executeImport(sessionToken, importData, importOptions);
@@ -220,7 +191,7 @@ public class ZipImportTest extends AbstractImportTest
         final String validationPluginBareName = name.substring(0, name.lastIndexOf("."));
 
         assertEquals(validationPlugin.getName(), sampleType.getCode() + "." + validationPluginBareName);
-        assertEquals(validationPlugin.getScript(), source);
+        assertEquals(validationPlugin.getScript().trim(), source);
 
         v3api.logout(sessionToken);
     }
@@ -232,8 +203,7 @@ public class ZipImportTest extends AbstractImportTest
 
         final String name = "dynamic.py";
         final String source = "1+1";
-        final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("dynamic_script.xls"),
-                List.of(new ImportScript(name, source)));
+        final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("dynamic_script.zip"));
         final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
 
         v3api.executeImport(sessionToken, importData, importOptions);
@@ -259,7 +229,7 @@ public class ZipImportTest extends AbstractImportTest
         final String pluginBareName = name.substring(0, name.lastIndexOf("."));
 
         assertEquals(plugin.getName(), propertyAssignment.getPropertyType().getCode() + "." + pluginBareName);
-        assertEquals(plugin.getScript(), source);
+        assertEquals(plugin.getScript().trim(), source);
 
         v3api.logout(sessionToken);
     }