SSDM-13926: Fixing the failing JS test.

api-openbis-javascript/src/v3/as/dto/importer/ImportOperation.js

@@ -17,7 +17,9 @@
 
 define(["stjs", "as/dto/common/operation/IOperation"],
   function (stjs, IOperation) {
-    var ImportOperation = function() {
+    var ImportOperation = function(importData, importOptions) {
+      this.importData = importData;
+      this.importOptions = importOptions;
     }
 
     stjs.extend(
@@ -39,17 +41,9 @@ define(["stjs", "as/dto/common/operation/IOperation"],
           return this.importData;
         };
 
-        prototype.setImportData = function(importData) {
-          this.importData = importData;
-        };
-
         prototype.getImportOptions = function() {
           return this.importOptions;
         };
-
-        prototype.setImportOptions = function(importOptions) {
-          this.importOptions = importOptions;
-        };
       },
       {
         importData: "IImportData",

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

@@ -124,7 +124,8 @@ public class ImportExecutor implements IImportExecutor
                 }
             } else
             {
-                throw UserFailureException.fromTemplate("Unknown instance of import data '%s'.", importData.getClass().getName());
+                throw UserFailureException.fromTemplate("Unknown instance of import data '%s'.",
+                        importData != null ? importData.getClass().getName() : null);
             }
         } catch (final IOException e)
         {

test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-import-export.js

@@ -102,8 +102,13 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
         var c = new common(assert, openbis);
 
         var fAction = function(facade) {
-          var importData = new c.UncompressedImportData("XLS", fileContent, null);
-          var importOptions = new c.ImportOptions("UPDATE_IF_EXISTS");
+          var importData = new c.UncompressedImportData();
+          importData.setFormat("XLS");
+          importData.setFile(fileContent);
+
+          var importOptions = new c.ImportOptions();
+          importOptions.setMode("UPDATE_IF_EXISTS");
+
           return facade.executeImport(importData, importOptions);
         }