From 17629d1e3dcd547d18c080852e4e53759fe89e5d Mon Sep 17 00:00:00 2001 From: Sara <sarasdj@stud.ntnu.no> Date: Mon, 13 May 2024 13:31:45 +0200 Subject: [PATCH] add: one more unit test --- .coverage | Bin 0 -> 53248 bytes .../lake_relations/all_lake_names.json | 3 +- .../lake_relations/test_lake_div.json | 1 + ..._add_new_lake.cpython-311-pytest-8.2.0.pyc | Bin 2168 -> 3749 bytes .../unit_tests/test_add_new_lake.py | 34 ++++++++++++++++-- 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 .coverage create mode 100644 server/map_handler/lake_relations/test_lake_div.json diff --git a/.coverage b/.coverage new file mode 100644 index 0000000000000000000000000000000000000000..947808bfdf95dfe02c7c8f3a2eb95b8642601207 GIT binary patch literal 53248 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 VSah3zBhNFFX9mx5JmdTS{{t*pbG!fm literal 0 HcmV?d00001 diff --git a/server/map_handler/lake_relations/all_lake_names.json b/server/map_handler/lake_relations/all_lake_names.json index d1d3eb65..2cf061bd 100644 --- a/server/map_handler/lake_relations/all_lake_names.json +++ b/server/map_handler/lake_relations/all_lake_names.json @@ -1,4 +1,5 @@ [ "Mjøsa", - "Skumsjøen" + "Skumsjøen", + "test_lake" ] \ No newline at end of file diff --git a/server/map_handler/lake_relations/test_lake_div.json b/server/map_handler/lake_relations/test_lake_div.json new file mode 100644 index 00000000..65344015 --- /dev/null +++ b/server/map_handler/lake_relations/test_lake_div.json @@ -0,0 +1 @@ +{"test-field1": "test-value1", "test-field2": ["test-value2", "testvalue3"]} \ No newline at end of file diff --git a/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-311-pytest-8.2.0.pyc b/server/map_handler/unit_tests/__pycache__/test_add_new_lake.cpython-311-pytest-8.2.0.pyc index 1f1035be606616e46806e57a11add5fc28a65bbd..c6733b1f387025c9507e38386f998e47bcb8bab2 100644 GIT binary patch literal 3749 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 delta 472 zcmZ1~`$K?lIWI340}x33a7=Syn#d=?=rmDXNtG#wEtfrtJ(nYjgOMSHA%!`IGnXrh z3&>_^VTj^RVGL%_WSuxcfrmS}C^fMpH9oy4GiBrZ7^ZqopkYNIVkJ`%6O3KN4q|Zw z2~DQwKoSTZ*n_1tnTmLTJg|-;4iF3E9H1yj@AFwRLExr6kPkMO7enqPT#gSYm&`c% z6!UvV-pRXI^aQ}>f^{(dVzRZ>ocx1Dl~<GL7IQ(R0f;cFnyket!^k?>opmmo1W<R8 z_~cit=4`@1<}HcIy(|)JMVdf1+hkWZb16ab8DbX%6c$*lh`69+wnO58#RUtW56q0h zew(MUNiYhD0#$1A+~P<o&CDsu%quREn{2~t%qTOtlviQ$N?t`>R*(%K^NIvO1W0`m z$f{o)Ho5sJr8%i~MFv1FBM=uSPiEv(o~+L&YJ7pg-~ogA1yuBbjf+v{0|O=jHWdH{ CQfz1d diff --git a/server/map_handler/unit_tests/test_add_new_lake.py b/server/map_handler/unit_tests/test_add_new_lake.py index 8bde7248..2f7d4c6f 100644 --- a/server/map_handler/unit_tests/test_add_new_lake.py +++ b/server/map_handler/unit_tests/test_add_new_lake.py @@ -1,16 +1,44 @@ +import json from shapely.geometry import Polygon, LineString -from server.map_handler.add_new_lake import create_grid +from server.consts import LAKE_RELATIONS_PATH +from server.map_handler.add_new_lake import create_grid, write_json_to_file -def test_create_grid_default(): +def test_create_grid_default() -> None: # Create a simple square polygon test_poly = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)]) # Define the expected grid output coordinates = [[(0, 0), (0, 1)], [(0.5, 0), (0.5, 1)], [(1, 0), (1, 1)], - [(0, 0), (1, 0)], [(0, 0.4), (1, 0.4)], [(0, 0.8), (1, 0.8)]] + [(0, 0), (1, 0)], [(0, 0.4), (1, 0.4)], [(0, 0.8), (1, 0.8)]] expected = [LineString(coords) for coords in coordinates] grid = create_grid(test_poly, 0.5, 0.4) assert grid == expected + + +def test_write_json_to_file() -> None: + # Define some test data + test_lake_name = "test_lake" + test_data = { + 'test-field1': 'test-value1', + 'test-field2': [ + "test-value2", + "testvalue3" + ], + } + + # Call the function that is being tested + write_json_to_file(test_lake_name, test_data) + + # Try to read the data from the newly created file + with open(LAKE_RELATIONS_PATH + '/' + test_lake_name + '_div.json', 'r') as f: + result = json.load(f) + + assert result == test_data + + + + + -- GitLab