Merge pull request #74 from Geode-solutions/next

Next

Author: JulienChampagnol

.gitattributes

@@ -1,12 +1,25 @@
-name: CD
+name: CICD
 
 on:
   push:
-    branches: [master, next]
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+      - name: Test
+        run: |
+          pip install -r requirements.txt
+          pip install pytest
+          pytest
   build:
     runs-on: ubuntu-latest
+    needs: test
+    if: github.ref == 'refs/heads/next' || github.ref == 'refs/heads/master'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/CD.yml renamed to .github/workflows/CICD.yml

@@ -3,6 +3,9 @@
 from src.opengeodeweb_back import geode_functions, geode_objects
 
 
+data_folder = os.path.join(os.path.dirname(__file__), "data")
+
+
 def test_geode_object_value():
     for geode_object, value in geode_objects.geode_objects_dict().items():
         geode_object_value = geode_functions.geode_object_value(geode_object)
@@ -39,7 +42,7 @@ def test_missing_files():
     for geode_object, value in geode_objects.geode_objects_dict().items():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
-            file_absolute_path = os.path.abspath(f"tests/data/test.{input_extension}")
+            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
             missing_files = geode_functions.missing_files(
                 geode_object, file_absolute_path
             )
@@ -55,7 +58,7 @@ def test_is_loadable():
     for geode_object, value in geode_objects.geode_objects_dict().items():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
-            file_absolute_path = os.path.abspath(f"tests/data/test.{input_extension}")
+            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
             is_loadable = geode_functions.is_loadable(geode_object, file_absolute_path)
             assert type(is_loadable) is bool
 
@@ -66,18 +69,18 @@ def test_load():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
             print(f"\t{input_extension=}")
+            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
             missing_files = geode_functions.missing_files(
-                geode_object, f"tests/data/test.{input_extension}"
+                geode_object, file_absolute_path
             )
             has_missing_files = missing_files.has_missing_files()
             if has_missing_files:
                 mandatory_files = missing_files.mandatory_files
                 print(f"\t\t{mandatory_files=}")
                 additional_files = missing_files.additional_files
                 print(f"\t\t{additional_files=}")
-            file_apsolute_path = os.path.abspath(f"tests/data/test.{input_extension}")
-            if geode_functions.is_loadable(geode_object, file_apsolute_path):
-                data = geode_functions.load(geode_object, file_apsolute_path)
+            if geode_functions.is_loadable(geode_object, file_absolute_path):
+                data = geode_functions.load(geode_object, file_absolute_path)
                 if "save_viewable" in value:
                     uu_id = str(uuid.uuid4()).replace("-", "")
                     viewable_file_path = geode_functions.save_viewable(
@@ -149,16 +152,17 @@ def test_geode_object_output_extensions():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
             print(f"\t{input_extension=}")
+            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
             missing_files = geode_functions.missing_files(
-                geode_object, f"tests/data/test.{input_extension}"
+                geode_object, file_absolute_path
             )
             has_missing_files = missing_files.has_missing_files()
             if has_missing_files:
                 mandatory_files = missing_files.mandatory_files
                 print(f"\t\t{mandatory_files=}")
                 additional_files = missing_files.additional_files
                 print(f"\t\t{additional_files=}")
-            file_absolute_path = os.path.abspath(f"tests/data/test.{input_extension}")
+            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
             if geode_functions.is_loadable(geode_object, file_absolute_path):
                 data = geode_functions.load(geode_object, file_absolute_path)
                 geode_objets_and_output_extensions = (
@@ -227,8 +231,8 @@ def test_list_geode_objects():
         input_extensions = geode_functions.list_input_extensions(key)
         for geode_object, value in geode_objects.geode_objects_dict().items():
             for input_extension in input_extensions:
-                file_absolute_path = os.path.abspath(
-                    f"tests/data/test.{input_extension}"
+                file_absolute_path = os.path.join(
+                    data_folder, f"test.{input_extension}"
                 )
                 return_dict = geode_functions.list_geode_objects(
                     file_absolute_path, key
@@ -254,7 +258,7 @@ def test_geode_objects_output_extensions():
     for geode_object, value in geode_objects.geode_objects_dict().items():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
-            file_absolute_path = f"tests/data/test.{input_extension}"
+            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
             if geode_functions.is_loadable(geode_object, file_absolute_path):
                 data = geode_functions.load(geode_object, file_absolute_path)
                 geode_objects_and_output_extensions = (