tests added

gitignore updated

Author: MaxNumerique

.gitignore

@@ -1,6 +1,7 @@
 .pytest_cache
+*.egg-info
 venv
 __pycache__
 node_modules
 .mypy_cache
-*.egg-info
+*.db

src/opengeodeweb_microservice/database/session.py

@@ -4,7 +4,6 @@
 
 from src.opengeodeweb_microservice.database.connection import DatabaseConnection
 
-# Global database instance
 _database_connection = DatabaseConnection()
 
 

tests/conftest.py

@@ -1,35 +1,49 @@
-# # Standard library imports
-# import time
-# import shutil
-
-# # Third party imports
-# import os
-# import pytest
-
-# # Local application imports
-# from app import app
-# from src.opengeodeweb_microservice.database import initialize_database
-
-
-# @pytest.fixture(scope="session", autouse=True)
-# def copy_data():
-#     app.config["DATA_FOLDER_PATH"] = "./data/"
-#     BASE_DIR = os.path.abspath(os.path.dirname(__file__))
-#     db_path = os.path.join(BASE_DIR, "data", "project.db")
-#     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
-#     initialize_database(app)
-
-
-# @pytest.fixture
-# def client():
-#     app.config["REQUEST_COUNTER"] = 0
-#     app.config["LAST_REQUEST_TIME"] = time.time()
-#     client = app.test_client()
-#     client.headers = {"Content-type": "application/json", "Accept": "application/json"}
-#     yield client
-
-
-# @pytest.fixture
-# def app_context():
-#     with app.app_context():
-#         yield
+import os
+import pytest
+from flask import Flask
+from src.opengeodeweb_microservice.database.session import init_database, get_session
+from src.opengeodeweb_microservice.microservice.data import Data
+
+
+@pytest.fixture(scope="session")
+def app():
+    app = Flask(__name__)
+    app.config["TESTING"] = True
+    
+    BASE_DIR = os.path.abspath(os.path.dirname(__file__))
+    db_path = os.path.join(BASE_DIR, "test_project.db")
+    app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
+    
+    with app.app_context():
+        db = init_database(app, "test_project.db")
+        yield app
+        try:
+            session = get_session()
+            if session:
+                session.session.close()
+                if hasattr(session, 'engine'):
+                    session.engine.dispose()
+        except Exception:
+            pass
+    import time
+    time.sleep(0.1)
+    if os.path.exists(db_path):
+        try:
+            os.remove(db_path)
+        except PermissionError:
+            pass
+
+
+@pytest.fixture
+def app_context(app):
+    with app.app_context():
+        yield
+
+
+@pytest.fixture
+def clean_database(app_context):
+    session = get_session()
+    if session:
+        session.session.query(Data).delete()
+        session.session.commit()
+    yield

tests/test_connection.py

@@ -0,0 +1,42 @@
+import pytest
+from src.opengeodeweb_microservice.database.session import (
+    get_session, 
+    get_database_connection
+)
+from src.opengeodeweb_microservice.database.connection import DatabaseConnection
+from src.opengeodeweb_microservice.microservice.data import Data
+
+
+def test_database_connection_basic(app_context):
+    session = get_session()
+    assert session is not None
+    assert session.session is not None
+    connection = get_database_connection()
+    assert connection is not None
+
+
+def test_data_crud_operations(app_context, clean_database):
+    data = Data.create(
+        geode_object="test_object",
+        input_file="test.txt"
+    )
+    assert data.id is not None
+    session = get_session()
+    session.session.commit()
+    retrieved = Data.get(data.id)
+    assert retrieved is not None
+    assert retrieved.geode_object == "test_object"
+    non_existent = Data.get("fake_id")
+    assert non_existent is None
+
+
+def test_data_with_additional_files(app_context, clean_database):
+    files = ["file1.txt", "file2.txt"]
+    data = Data.create(
+        geode_object="test_files",
+        additional_files=files
+    )
+    session = get_session()
+    session.session.commit()
+    retrieved = Data.get(data.id)
+    assert retrieved.additional_files == files

tests/test_database.py

@@ -1,13 +1,42 @@
-# import os
+import pytest
+from src.opengeodeweb_microservice.database.session import get_session, get_database_connection
+from src.opengeodeweb_microservice.microservice.data import Data
 
 
-# def test_database_uri_path(client):
-#     app = client.application
-#     with app.app_context():
-#         base_dir = os.path.abspath(os.path.dirname(__file__))
-#         expected_db_path = os.path.join(base_dir, "data", "project.db")
-#         expected_uri = f"sqlite:///{expected_db_path}"
+def test_database_connection(app_context):
+    session = get_session()
+    assert session is not None
+    assert session.session is not None
+    connection = get_database_connection()
+    assert connection is not None
 
-#         assert app.config["SQLALCHEMY_DATABASE_URI"] == expected_uri
 
-#         assert os.path.exists(expected_db_path)
+def test_data_creation_and_retrieval(app_context, clean_database):
+    data = Data.create(
+        geode_object="test_object",
+        input_file="test.txt"
+    )
+    assert data.id is not None
+    assert data.geode_object == "test_object"
+    session = get_session()
+    session.session.commit()
+    retrieved = Data.get(data.id)
+    assert retrieved is not None
+    assert retrieved.geode_object == "test_object"
+
+
+def test_data_with_additional_files(app_context, clean_database):
+    files = ["file1.txt", "file2.txt"]
+    data = Data.create(
+        geode_object="test_with_files",
+        additional_files=files
+    )
+    session = get_session()
+    session.session.commit()
+    retrieved = Data.get(data.id)
+    assert retrieved.additional_files == files
+
+
+def test_data_get_nonexistent(app_context):
+    result = Data.get("nonexistent_id")
+    assert result is None