test launch test with bdd

Author: juggler31

.gitignore

@@ -42,6 +42,7 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
+cache
 nosetests.xml
 coverage.xml
 *.cover
@@ -106,6 +107,7 @@ venv.bak/
 
 # vscode
 .vscode/
+.idea
 # config module
 frontend/app/module.config.ts
 

Makefile

@@ -28,7 +28,7 @@ create_venv:
 install_geonature: create_venv
 	$(call display_cmd, Install Geonature)
 ifeq "$(wildcard .venv/lib/python3.12/site-packages/geonature)" ""
-	. .venv/bin/activate && pip install "geonature[tests] @ git+https://github.com/PnX-SI/GeoNature.git@develop"
+	.venv/bin/pip install "geonature[tests] @ git+https://github.com/PnX-SI/GeoNature.git@develop"
 endif
 
 ###########################
@@ -38,7 +38,10 @@ endif
 .PHONY: tests
 tests: install_geonature
 	$(call display_cmd, Launch tests)
-	. .venv/bin/activate && GEONATURE_CONFIG_FILE="config/test_config.toml" pytest -v --cov --cov-report xml
+	.venv/bin/pip install -e .
+	GEONATURE_CONFIG_FILE="config/test_config.toml" ./install_db_test/03b_populate_db.sh
+	GEONATURE_CONFIG_FILE="config/test_config.toml" geonature upgrade-modules-db
+	GEONATURE_CONFIG_FILE="config/test_config.toml" .venv/bin/pytest -vs --cov --cov-report xml
 
 ###########################
 #        Run project      #

backend/gn_module_zh/tests/conf_test.py backend/gn_module_zh/tests/conftest.pybackend/gn_module_zh/tests/conf_test.py renamed to backend/gn_module_zh/tests/conftest.py

@@ -1,4 +1,3 @@
 from geonature.tests.fixtures import *
-from geonature.tests.fixtures import _session, app, users
+from geonature.tests.fixtures import _session, app, users, _app
 from geonature.tests.test_permissions import g_permissions
-

backend/gn_module_zh/tests/fixtures.py

@@ -1,38 +1,11 @@
 import datetime
 import pytest
-from geonature.tests.fixtures import users
 from geonature.utils.env import db
-from geonature import create_app
 
-from gn_module_zh.model.zh_schema import TZH
-from shapely.geometry import Polygon
+from shapely import Polygon
+import geoalchemy2
 
-
-from geonature.tests.fixtures import GeoNatureClient
-@pytest.fixture(scope="session", autouse=True)
-def app():
-    # config["CELERY"]["task_always_eager"] = True
-    app = create_app()
-    app.testing = True
-    app.test_client_class = GeoNatureClient
-    app.config["SERVER_NAME"] = "test.geonature.fr"  # required by url_for
-
-    # @app.before_request
-    # def get_endpoint():
-    #     pytest.endpoint = request.endpoint
-
-    with app.app_context():
-        """
-        Note: This may seem redundant with 'temporary_transaction' fixture.
-        It is not as 'temporary_transaction' has a function scope.
-        This nested transaction is useful to rollback class-scoped fixtures.
-        Note: As we does not have a complex savepoint restart mechanism here,
-        fixtures must commit their database changes in a nested transaction
-        (i.e. in a with db.session.begin_nested() block).
-        """
-        transaction = db.session.begin_nested()  # execute tests in a savepoint
-        yield app
-        transaction.rollback()  # rollback all database changes
+import uuid
 
 def create_zh(
     main_name,
@@ -41,13 +14,14 @@ def create_zh(
     id_role,
     zh_date,
     uuid_id_lim_list,
-    sdage,
+    id_sdage,
     polygon,
     zh_area,
-    main_id_rb,
     **kwargs,
 ):
-    return TZH(
+    # Import here because TZH class need to be imported after "app instanced"
+    from gn_module_zh.model.zh_schema import TZH
+    zh = TZH(
         main_name=main_name,
         code=code,
         id_org=id_org,
@@ -56,101 +30,55 @@ def create_zh(
         create_date=zh_date,
         update_date=zh_date,
         id_lim_list=uuid_id_lim_list,
-        id_sdage=sdage,
+        id_sdage=id_sdage,
         geom=polygon,
         area=zh_area,
-        main_id_rb=main_id_rb,
     )
+    return zh
 
-@pytest.fixture()
-def zh_data(app, users, datasets, source, sources_modules):
-    polygon1 = Polygon([[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]])
-    polygon2 = Polygon([[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]])
-    polygon3 = Polygon([[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]])
-    date_1 = datetime.datetime(2024, 10, 2, 11, 22, 33)
-    date_2 = datetime.datetime(2024, 10, 3, 8, 9, 10)
-    date_3 = datetime.datetime(2024, 10, 4, 17, 4, 9)
-    date_4 = datetime.datetime(2024, 10, 5, 22, 22, 22)
-    altitude_1 = 800
-    altitude_2 = 900
-    altitude_3 = 1000
-    altitude_4 = 1100
-
+@pytest.fixture(scope="function")
+def zh_data(users):
+    coords = ((0., 0.), (0., 1.), (1., 1.), (1., 0.), (0., 0.))
+    polygon = Polygon(coords)
+    date = datetime.datetime(2024, 10, 2, 11, 22, 33)
+    id_sdage = 967
+    user = users["self_user"]
     data = {}
     with db.session.begin_nested():
         for (
             main_name,
             code,
             id_org,
-            # id_role,
+            id_role,
             zh_date,
             uuid_id_lim_list,
-            # sdage,
+            id_sdage,
             geom,
             zh_area,
-            main_id_rb,
         ) in [
             (
                 "zh1",
                 "05CEN0189",
-                polygon1,
-                # datasets["own_dataset"],
-                "zh1",
-                # sources_modules[0],
-                date_1,
-                date_1,
-                altitude_1,
-                altitude_1,
-            ),
-            (
-                "zh2",
-                "05CEEP0163",
-                polygon2,
-#                 datasets["own_dataset"],
-                "zh2",
-#                 sources_modules[0],
-                date_1,
-                date_4,
-                altitude_1,
-                altitude_4,
-            ),
-            (
-                "zh3",
-                "83CEEV0001",
-                polygon3,
-#                 datasets["own_dataset"],
-                "zh3",
-                # sources_modules[1],
-                date_2,
-                date_3,
-                altitude_2,
-                altitude_3,
-            ),
-            (
-                "zh4",
-                "84PNRL0296",
-                polygon3,
-#                 datasets["own_dataset"],
-                "zh3",
-                sources_modules[1],
-                date_2,
-                date_3,
-                altitude_2,
-                altitude_3,
+                2, # id_org = 2 (not dynamic) because not same table bib_organismes used with the users
+                user.id_role,
+                date,
+                uuid.uuid4(),
+                id_sdage,
+                geoalchemy2.shape.from_shape(polygon),
+                polygon.area,
             ),
         ]:
             kwargs = {}
             s = create_zh(
                 main_name,
                 code,
                 id_org,
-                # id_role,
+                id_role,
                 zh_date,
                 uuid_id_lim_list,
-                # sdage,
+                id_sdage,
                 geom,
                 zh_area,
-                main_id_rb,
                 **kwargs,
             )
             db.session.add(s)

backend/gn_module_zh/tests/test_bdd.py

@@ -3,24 +3,21 @@
 from flask import url_for
 
 from geonature.tests.fixtures import *
-
 from .fixtures import *
 
-@pytest.mark.usefixtures("client_class", "temporary_transaction")
+@pytest.mark.usefixtures("client_class")
 class TestBdd:
-    def test_no_zh(self, app, users):
-        print("user => ", users)
+    def test_no_zh(self, users):
         set_logged_user(self.client, users["self_user"])
         response = self.client.get(url_for("pr_zh.get_zh"))
         assert response.status_code == 200
         data = response.get_json()
         assert len(data["items"]["features"]) == 0
 
 
-    def test_add_zh(self, app, users, synthese_data):
+    def test_add_zh(self, users, zh_data):
         set_logged_user(self.client, users["self_user"])
-
         response = self.client.get(url_for("pr_zh.get_zh"))
         assert response.status_code == 200
         data = response.get_json()
-        assert len(data["items"]["features"]) == 0
+        assert len(data["items"]["features"]) > 0

config/settings.ini

@@ -0,0 +1,94 @@
+## Fichier de configuration utilisé lors de l'installation de GeoNature
+
+# Set mode to 'dev' to install GeoNature in dev mode
+MODE=dev
+
+# Langue du serveur
+# valeur possible : fr_FR.UTF-8, en_US.utf8
+# locale -a pour voir la liste des locales disponible
+my_local=en_US.utf8
+
+# URL Configuration
+###################
+
+# My host URL or IP, starting with http and with / at the end
+my_url=http://127.0.0.1:4200/
+
+
+# PostgreSQL Configuration
+##########################
+
+# Drop eventual existing database during installation
+drop_apps_db=true
+
+# DB host
+# Attention les scripts d'installation automatique (install_db.sh et install_all.sh) ne fonctionneront
+# que si votre BDD est installée en local (localhost). Si vous souhaitez installer votre BDD sur un autre serveur,
+# les scripts n'auront pas les droits suffisants pour créer la BDD sur un autre serveur et cela devra être fait manuellement.
+db_host=127.0.0.1
+
+# PostgreSQL port
+db_port=5432
+
+# GeoNature database name
+db_name=geonature2db
+#geonatureTestInstall
+
+# GeoNature database owner username
+user_pg=geonatadmin
+
+# GeoNature database owner password
+user_pg_pass=geonatpasswd
+
+# Local projection SRID
+srid_local=2154
+
+# Default language (locale)
+# Availaible language value : fr
+default_language=fr
+
+# Permet l'installation des couches SIG des communes et départements
+# Seules les couches de métropole en 2154 sont fournies (false conseillé hors métropole)
+install_sig_layers=false
+
+# Installe les grilles INPN (1, 5 et 10km)
+install_grid_layer=false
+
+# Install default French DEM (Mainland France only - BD alti 250m))
+install_default_dem=false
+
+# Vectorise dem raster for more performance. This will increse installation duration and take more disk space
+vectorise_dem=false
+
+# Insert sample data (available only in Mainland France with srid_local=2154
+add_sample_data=true
+
+# Insert INPN sensitivity referential (will force installation of departments and regions)
+install_ref_sensitivity=false
+
+#### Modules GeoNature ####
+
+# Installer le module validation
+install_module_validation=true
+# Installer le module Occurrence d'habitat
+install_module_occhab=true
+
+
+# Taxonomy, Users and Nomenclatures configuration
+#################################################
+
+# Les scripts SQL de création des schémas 'utilisateurs', 'taxonomie' et 'nomenclature' de GeoNature sont téléchargés depuis le dépôt github des projets UsersHub et TaxHub
+# Les trois paramètres ci-dessous visent à indiquer dans quelle version (release, branche ou tag) les scripts doivent être récupérés
+
+# Est ce que le schéma utilisateurs doit être installé ? (mettre à 'non' que si vos avez un schéma utilisateur dans une autre BDD  et que vous avez déjàmis en place un mecanisme de foreign data wrapper)
+install_usershub_schema=true
+# Définir dans quelle version de UsersHub (release, branche ou tag) prendre le code SQL permettant la création du schéma utilisateurs de la base de données de GeoNature
+usershub_release=2.2.2
+
+;# Définir dans quelle version de TaxHub (release, branche ou tag) prendre le code SQL permettant la création du schéma taxonomie de la base de données de GeoNature
+;taxhub_release=1.9.4
+
+# Proxy - si le serveur sur lequel se trouve GeoNature se trouve derrière un proxy
+# laisser vide si vous n'avez pas de proxy
+proxy_http=
+proxy_https=

docker-compose.yml

@@ -0,0 +1,23 @@
+services:
+  postgres:
+    image: postgis/postgis:13-3.2
+#    env_file:
+#      - .env
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
+      - POSTGRES_DB=geonature2db
+      - POSTGRES_PASSWORD=geonatpasswd
+      - POSTGRES_USER=geonatadmin
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "geonatadmin", "-d", "geonature2db"]
+      interval: 10s
+      retries: 5
+      start_period: 30s
+      timeout: 5s
+
+volumes:
+  postgres: