From d739736870427564d7a3437fb4925bdd07723208 Mon Sep 17 00:00:00 2001 From: Paula Date: Wed, 3 Jun 2026 16:22:12 +0200 Subject: [PATCH 1/3] fix path bug in test --- avaframe/tests/test_com4FlowPy.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/avaframe/tests/test_com4FlowPy.py b/avaframe/tests/test_com4FlowPy.py index e98a76c48..6f05ad74e 100644 --- a/avaframe/tests/test_com4FlowPy.py +++ b/avaframe/tests/test_com4FlowPy.py @@ -253,12 +253,13 @@ def createTestRaster(pathTestFolder, rasterName): def test_tileRaster(): - pathTestFolder = pathlib.Path("avaframe/tests/data/testCom4") + _testDIR = pathlib.Path(__file__).parent + pathTestFolder = _testDIR / "data" / "testCom4" rasterName = "testRaster" ext = ".tif" tileName = "testTile" - pathTempFolder = pathlib.Path("avaframe/tests/data/testCom4/tmp") + pathTempFolder = pathTestFolder / "tmp" xDim = 4 yDim = 4 U = 1 @@ -296,12 +297,13 @@ def test_tileRaster(): def test_mergeDict(): - pathTestFolder = pathlib.Path("avaframe/tests/data/testCom4") + _testDIR = pathlib.Path(__file__).parent + pathTestFolder = _testDIR / "data" / "testCom4" rasterName = "testRaster" ext = ".tif" pathRaster = pathTestFolder / (rasterName + ext) tileName = "testTile" - pathTempFolder = pathlib.Path("avaframe/tests/data/testCom4/tmp") + pathTempFolder = pathTestFolder / "tmp" xDim = 4 yDim = 4 U = 1 @@ -409,7 +411,9 @@ def test_mergeDict(): def test_mergeDictToRaster(): - pathTempFolder = pathlib.Path("avaframe/tests/data/testCom4/tmp") + _testDIR = pathlib.Path(__file__).parent + pathTestFolder = _testDIR / "data" / "testCom4" + pathTempFolder = pathTestFolder / "tmp" tileName = "testTile" dictName = "testDict" @@ -426,7 +430,7 @@ def test_mergeDictToRaster(): mergedRaster = SPAM.mergeDictToRaster(pathTempFolder, dictName) - testData = IOf.readRaster(pathlib.Path("avaframe/tests/data/testCom4/testRaster.tif")) + testData = IOf.readRaster(pathTestFolder / "testRaster.tif") testRaster = testData["rasterData"] # due to no overlap: testRaster[testRaster > 0] = 1 @@ -454,13 +458,13 @@ def test_mergeDictToRaster(): def test_mergeDictToPolygon(): - _testDIR = pathlib.Path(__file__).parent - pathTestFolder = _testDIR / "data" / "testCom4" + _testDIR = pathlib.Path(__file__).parent + pathTestFolder = _testDIR / "data" / "testCom4" rasterName = "testRaster" ext = ".tif" pathRaster = pathTestFolder / (rasterName + ext) tileName = "testTile" - pathTempFolder = pathlib.Path("avaframe/tests/data/testCom4/tmp") + pathTempFolder = pathTestFolder / "tmp" xDim = 4 yDim = 4 U = 1 From 4a44d5960c387c961e02c2d8e3754b7814e56c65 Mon Sep 17 00:00:00 2001 From: Paula Date: Wed, 3 Jun 2026 17:16:42 +0200 Subject: [PATCH 2/3] delete tmp folder in last function --- avaframe/tests/test_com4FlowPy.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/avaframe/tests/test_com4FlowPy.py b/avaframe/tests/test_com4FlowPy.py index 6f05ad74e..0d1b6c480 100644 --- a/avaframe/tests/test_com4FlowPy.py +++ b/avaframe/tests/test_com4FlowPy.py @@ -10,6 +10,8 @@ import os import rasterio import geopandas as gpd +import shutil + from avaframe.com4FlowPy import flowClass import avaframe.com4FlowPy.flowCore as flowCore import avaframe.com4FlowPy.splitAndMerge as SPAM @@ -515,6 +517,9 @@ def test_mergeDictToPolygon(): assert np.all(gdfPathPolygons["PRA_id"] == refPolygons["PRA_id"]) assert np.all(gdfPathPolygons.geometry.geom_equals(refPolygons.geometry)) + # delete temporary files + shutil.rmtree(pathTempFolder) + if __name__ == "__main__": test_add_os() From 345146f1c1dfca5b911ea9700141466f98dff90b Mon Sep 17 00:00:00 2001 From: Paula Date: Wed, 3 Jun 2026 17:55:38 +0200 Subject: [PATCH 3/3] use temporary pytest path --- avaframe/tests/test_com4FlowPy.py | 52 ++++++++++++++++++------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/avaframe/tests/test_com4FlowPy.py b/avaframe/tests/test_com4FlowPy.py index 0d1b6c480..6181c08d1 100644 --- a/avaframe/tests/test_com4FlowPy.py +++ b/avaframe/tests/test_com4FlowPy.py @@ -254,9 +254,8 @@ def createTestRaster(pathTestFolder, rasterName): return header -def test_tileRaster(): - _testDIR = pathlib.Path(__file__).parent - pathTestFolder = _testDIR / "data" / "testCom4" +def test_tileRaster(tmp_path): + pathTestFolder = tmp_path / "data" / "testCom4" rasterName = "testRaster" ext = ".tif" @@ -298,9 +297,8 @@ def test_tileRaster(): assert ext21 == ((2 * xDim - 4 * U, 3 * xDim - 4 * U), (yDim - 2 * U, 2 * yDim - 2 * U)) -def test_mergeDict(): - _testDIR = pathlib.Path(__file__).parent - pathTestFolder = _testDIR / "data" / "testCom4" +def test_mergeDict(tmp_path): + pathTestFolder = tmp_path / "data" / "testCom4" rasterName = "testRaster" ext = ".tif" pathRaster = pathTestFolder / (rasterName + ext) @@ -412,13 +410,24 @@ def test_mergeDict(): assert np.all(mergedDict[k] == mergedDictRef[k]) -def test_mergeDictToRaster(): - _testDIR = pathlib.Path(__file__).parent - pathTestFolder = _testDIR / "data" / "testCom4" - pathTempFolder = pathTestFolder / "tmp" +def test_mergeDictToRaster(tmp_path): + pathTestFolder = tmp_path / "data" / "testCom4" + rasterName = "testRaster" + ext = ".tif" + pathRaster = pathTestFolder / (rasterName + ext) tileName = "testTile" + pathTempFolder = pathTestFolder / "tmp" + xDim = 4 + yDim = 4 + U = 1 + if os.path.exists(pathTempFolder) is False: + os.makedirs(pathTempFolder) + + createTestRaster(pathTestFolder, rasterName) + dictName = "testDict" + SPAM.tileRaster(pathRaster, tileName, pathTempFolder, xDim, yDim, U) nTiles = pickle.load(open(pathTempFolder / "nTiles", "rb")) for i in range(nTiles[0] + 1): @@ -459,9 +468,11 @@ def test_mergeDictToRaster(): assert np.all(mergedRaster == testRaster) -def test_mergeDictToPolygon(): +def test_mergeDictToPolygon(tmp_path): _testDIR = pathlib.Path(__file__).parent - pathTestFolder = _testDIR / "data" / "testCom4" + pathRefData = _testDIR / "data" / "testCom4" + + pathTestFolder = tmp_path / "data" / "testCom4" rasterName = "testRaster" ext = ".tif" pathRaster = pathTestFolder / (rasterName + ext) @@ -490,7 +501,8 @@ def test_mergeDictToPolygon(): saveDict.close() gdfPathPolygons = SPAM.mergeDictToPolygon(pathTempFolder, dictName, rasterHeader) - refPolygons = gpd.read_file(pathTestFolder / "refPolygon.geojson") + + refPolygons = gpd.read_file(pathRefData / "refPolygon.geojson") assert len(gdfPathPolygons) == 3 assert np.all(gdfPathPolygons["PRA_id"] == refPolygons["PRA_id"]) @@ -511,22 +523,20 @@ def test_mergeDictToPolygon(): saveDict.close() gdfPathPolygons = SPAM.mergeDictToPolygon(pathTempFolder, dictName, rasterHeader) - refPolygons = gpd.read_file(pathTestFolder / "refPolygon_manipulated.geojson") + refPolygons = gpd.read_file(pathRefData / "refPolygon_manipulated.geojson") assert len(gdfPathPolygons) == 3 assert np.all(gdfPathPolygons["PRA_id"] == refPolygons["PRA_id"]) assert np.all(gdfPathPolygons.geometry.geom_equals(refPolygons.geometry)) - # delete temporary files - shutil.rmtree(pathTempFolder) - if __name__ == "__main__": test_add_os() test_reverseTopology() test_backTracking() test_calculation() - test_tileRaster() - test_mergeDict() - test_mergeDictToRaster() - test_mergeDictToPolygon() + tmpDir = pathlib.Path(__file__).parent / "data" / "testCom4" + test_tileRaster(tmpDir) + test_mergeDict(tmpDir) + test_mergeDictToRaster(tmpDir) + test_mergeDictToPolygon(tmpDir)