#929: fix .NET tests, fix Bingo tests that require importing targets …

…data
epam · Jan 17, 2023 · 65d7654 · 65d7654
1 parent 3a39fe8
commit 65d7654
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/api/tests/integration/common/thread_pool.py b/api/tests/integration/common/thread_pool.py
@@ -177,7 +177,10 @@ def cpu_count():
         import java
 
         return java.lang.Runtime.getRuntime().availableProcessors()
-    elif sys.platform == "cli":
+    elif sys.platform == "cli" or (
+        "implementation" in dir(sys)
+        and sys.implementation.name == "ironpython"
+    ):
         import System.Environment
 
         return System.Environment.ProcessorCount

diff --git a/api/tests/integration/common/util.py b/api/tests/integration/common/util.py
@@ -17,7 +17,10 @@ def overridePlatform(platform):
 
 
 def isIronPython():
-    return sys.platform == "cli" or ('implementation' in dir(sys) and sys.implementation.name == "ironpython")
+    return sys.platform == "cli" or (
+        "implementation" in dir(sys)
+        and sys.implementation.name == "ironpython"
+    )
 
 
 def isJython():

diff --git a/bingo/tests/constants.py b/bingo/tests/constants.py
@@ -1,6 +1,8 @@
 from enum import Enum
 from os.path import abspath
 
+from indigo import Indigo
+
 TEST_CASES_DATA = {
     "mass": "data/molecules/mass/std.json",
     "gross": "data/molecules/gross/std.json",
@@ -118,12 +120,14 @@
 
 MOL_FILES_EXTENSIONS = ["sdf", "smi", ".sma", "smiles", "rdf"]
 
+
+indigo = Indigo()
 IMPORT_FUNCTION_MAP = {
-    ".sdf": "importSDF",
-    ".smi": "importSMILES",
-    ".smiles": "importSMILES",
-    ".sma": "importSMILES",
-    ".rdf": "importRDF",
+    ".sdf": indigo.iterateSDFile,
+    ".smi": indigo.iterateSmilesFile,
+    ".smiles": indigo.iterateSmilesFile,
+    ".sma": indigo.iterateSmilesFile,
+    ".rdf": indigo.iterateRDFile,
 }
 
 DB_POSTGRES = "postgres"

diff --git a/bingo/tests/dbc/base.py b/bingo/tests/dbc/base.py
@@ -285,20 +285,19 @@ def import_data(self, import_meta: Dict[str, str], other_columns=""):
             logger.debug(
                 f"Importing data to table {table} from src: {import_path}"
             )
-            import_path = import_path.replace("\\", "/")
-            dml_query = (
-                "SELECT {bingo}.{function}('{test_schema}.{table}', "
-                "'data', '{other_columns}', '{file}')"
-            )
-            dml_query = dml_query.format(
-                bingo=self.bingo_schema,
-                function=function,
+            # We have to avoid using bingo.import functions because we might
+            # work with remote server and cannot use local files
+            query = "INSERT INTO {test_schema}.{table}(data) VALUES {items}"
+            items_str = ",".join((
+                "('{}')".format(item.rawData())
+                for item in function(import_path)
+            ))
+            query = query.format(
                 test_schema=self.test_schema,
                 table=table,
-                other_columns=other_columns,
-                file=import_path,
+                items=items_str
             )
-            self._execute_dml_query(dml_query)
+            self._execute_dml_query(query)
 
     def create_indices(self, tables: List[str]):
         """