Skip to content

Commit 786c0ed

Browse files
MaxNumeriquegithub-actions[bot]
authored andcommitted
Apply prepare changes
1 parent 2883758 commit 786c0ed

3 files changed

Lines changed: 16 additions & 24 deletions

File tree

tests/conftest.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,24 @@
99
def app():
1010
app = Flask(__name__)
1111
app.config["TESTING"] = True
12-
12+
1313
BASE_DIR = os.path.abspath(os.path.dirname(__file__))
1414
db_path = os.path.join(BASE_DIR, "test_project.db")
1515
app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
16-
16+
1717
with app.app_context():
1818
db = init_database(app, "test_project.db")
1919
yield app
2020
try:
2121
session = get_session()
2222
if session:
2323
session.session.close()
24-
if hasattr(session, 'engine'):
24+
if hasattr(session, "engine"):
2525
session.engine.dispose()
2626
except Exception:
2727
pass
2828
import time
29+
2930
time.sleep(0.1)
3031
if os.path.exists(db_path):
3132
try:

tests/test_connection.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from src.opengeodeweb_microservice.database.session import (
3-
get_session,
4-
get_database_connection
3+
get_session,
4+
get_database_connection,
55
)
66
from src.opengeodeweb_microservice.database.connection import DatabaseConnection
77
from src.opengeodeweb_microservice.microservice.data import Data
@@ -16,10 +16,7 @@ def test_database_connection_basic(app_context):
1616

1717

1818
def test_data_crud_operations(app_context, clean_database):
19-
data = Data.create(
20-
geode_object="test_object",
21-
input_file="test.txt"
22-
)
19+
data = Data.create(geode_object="test_object", input_file="test.txt")
2320
assert data.id is not None
2421
session = get_session()
2522
session.session.commit()
@@ -32,11 +29,8 @@ def test_data_crud_operations(app_context, clean_database):
3229

3330
def test_data_with_additional_files(app_context, clean_database):
3431
files = ["file1.txt", "file2.txt"]
35-
data = Data.create(
36-
geode_object="test_files",
37-
additional_files=files
38-
)
32+
data = Data.create(geode_object="test_files", additional_files=files)
3933
session = get_session()
4034
session.session.commit()
4135
retrieved = Data.get(data.id)
42-
assert retrieved.additional_files == files
36+
assert retrieved.additional_files == files

tests/test_database.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import pytest
2-
from src.opengeodeweb_microservice.database.session import get_session, get_database_connection
2+
from src.opengeodeweb_microservice.database.session import (
3+
get_session,
4+
get_database_connection,
5+
)
36
from src.opengeodeweb_microservice.microservice.data import Data
47

58

@@ -12,10 +15,7 @@ def test_database_connection(app_context):
1215

1316

1417
def test_data_creation_and_retrieval(app_context, clean_database):
15-
data = Data.create(
16-
geode_object="test_object",
17-
input_file="test.txt"
18-
)
18+
data = Data.create(geode_object="test_object", input_file="test.txt")
1919
assert data.id is not None
2020
assert data.geode_object == "test_object"
2121
session = get_session()
@@ -27,10 +27,7 @@ def test_data_creation_and_retrieval(app_context, clean_database):
2727

2828
def test_data_with_additional_files(app_context, clean_database):
2929
files = ["file1.txt", "file2.txt"]
30-
data = Data.create(
31-
geode_object="test_with_files",
32-
additional_files=files
33-
)
30+
data = Data.create(geode_object="test_with_files", additional_files=files)
3431
session = get_session()
3532
session.session.commit()
3633
retrieved = Data.get(data.id)
@@ -39,4 +36,4 @@ def test_data_with_additional_files(app_context, clean_database):
3936

4037
def test_data_get_nonexistent(app_context):
4138
result = Data.get("nonexistent_id")
42-
assert result is None
39+
assert result is None

0 commit comments

Comments
 (0)