Merge pull request #20 from branislavjenco/IS-10248

[IS-10248] Fixed tests and added encoding

install-latest.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -x
-TAG=${SESAM_TAG:-1.18.2}
+TAG=${SESAM_TAG:-1.18.3}
 
 wget -O sesam.tar.gz https://github.com/sesam-community/sesam-py/releases/download/$TAG/sesam-linux-$TAG.tar.gz
 tar -xf sesam.tar.gz

sesam.py

@@ -25,7 +25,7 @@
 import pprint
 from jsonformat import format_object
 
-sesam_version = "1.18.2"
+sesam_version = "1.18.3"
 
 logger = logging.getLogger('sesam')
 LOGLEVEL_TRACE = 2
@@ -730,7 +730,7 @@ def upload(self):
                 for filename in files:
                     pipe_id = filename.replace(".json", "")
                     try:
-                        with open(os.path.join(root, filename), "r") as f:
+                        with open(os.path.join(root, filename), "r", encoding="utf-8") as f:
                             entities_json = json.load(f)
 
                         if entities_json is not None:
@@ -1625,11 +1625,11 @@ def convert_pipe_config(pipe_config):
 
         def save_testdata_file(pipe_id, entities):
             os.makedirs("testdata", exist_ok=True)
-            with open(f"testdata{os.sep}{pipe_id}.json", "w") as testdata_file:
+            with open(f"testdata{os.sep}{pipe_id}.json", "w", encoding="utf-8") as testdata_file:
                 testdata_file.write(format_object(entities))
 
         def save_modified_pipe(pipe_json, path):
-            with open(path, 'w') as pipe_file:
+            with open(path, 'w', encoding="utf-8") as pipe_file:
                 pipe_file.write(format_object(pipe_json))
 
 

tests/embedded_conversion_test/before/node-metadata.conf.json

@@ -11,4 +11,4 @@
       "sesam-io": "http://data.sesam.io/schema/"
     }
   }
-}
+}

tests/embedded_conversion_test/before/pipes/input-pipe-to-be-also-left-alone.conf.json

@@ -14,4 +14,4 @@
     },
     "condition": "test"
   }
-}
+}

tests/embedded_conversion_test/before/pipes/input-pipe-to-be-left-alone.conf.json

@@ -4,4 +4,4 @@
   "source": {
     "type": "http_endpoint"
   }
-}
+}

tests/embedded_conversion_test/before/pipes/input-pipe-with-norwegian-characters.conf.json

@@ -0,0 +1,25 @@
+{
+  "_id": "input-pipe-norwegian",
+  "type": "pipe",
+  "description": "øæå",
+  "source": {
+    "type": "conditional",
+    "alternatives": {
+      "prod": {
+        "type": "dataset",
+        "dataset": "non_exists"
+      },
+      "test": {
+        "type": "embedded",
+        "entities": [{
+          "_id": "A",
+          "name": "øæå"
+        }, {
+          "_id": "B",
+          "name": "øæå"
+        }]
+      }
+    },
+    "condition": "test"
+  }
+}

tests/embedded_conversion_test/expected_after/node-metadata.conf.json

@@ -4,7 +4,11 @@
   "namespaced_identifiers": true,
   "namespaces": {
     "default": {
+      "_": "http://data.sesam.io/sesam",
+      "ad-department": "http://data.sesam.io/sesam/ad/department/",
+      "ad-user": "http://data.sesam.io/sesam/ad/user/",
+      "bouvet": "http://data.sesam.io/sesam/bouvet/",
       "sesam-io": "http://data.sesam.io/schema/"
     }
   }
-}
+}

tests/embedded_conversion_test/expected_after/pipes/input-pipe-to-be-left-alone.conf.json

@@ -4,4 +4,4 @@
   "source": {
     "type": "http_endpoint"
   }
-}
+}

tests/embedded_conversion_test/expected_after/pipes/input-pipe-with-norwegian-characters.conf.json

@@ -0,0 +1,18 @@
+{
+  "_id": "input-pipe-norwegian",
+  "type": "pipe",
+  "source": {
+    "type": "conditional",
+    "alternatives": {
+      "prod": {
+        "type": "dataset",
+        "dataset": "non_exists"
+      },
+      "test": {
+        "type": "http_endpoint"
+      }
+    },
+    "condition": "test"
+  },
+  "description": "øæå"
+}