Skip to content

[test]: fix path bug in com4 test #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fso42 merged 1 commit into from
Jun 10, 2026
Merged

[test]: fix path bug in com4 test #1288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 37 additions & 19 deletions avaframe/tests/test_com4FlowPy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import os
import rasterio
import geopandas as gpd

from avaframe.com4FlowPy import flowClass
import avaframe.com4FlowPy.flowCore as flowCore
import avaframe.com4FlowPy.splitAndMerge as SPAM
Expand Down Expand Up @@ -252,13 +253,13 @@ def createTestRaster(pathTestFolder, rasterName):
return header


def test_tileRaster():
pathTestFolder = pathlib.Path("avaframe/tests/data/testCom4")
def test_tileRaster(tmp_path):
pathTestFolder = tmp_path / "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
Expand Down Expand Up @@ -295,13 +296,13 @@ def test_tileRaster():
assert ext21 == ((2 * xDim - 4 * U, 3 * xDim - 4 * U), (yDim - 2 * U, 2 * yDim - 2 * U))


def test_mergeDict():
pathTestFolder = pathlib.Path("avaframe/tests/data/testCom4")
def test_mergeDict(tmp_path):
pathTestFolder = tmp_path / "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
Expand Down Expand Up @@ -408,11 +409,24 @@ def test_mergeDict():
assert np.all(mergedDict[k] == mergedDictRef[k])


def test_mergeDictToRaster():
pathTempFolder = pathlib.Path("avaframe/tests/data/testCom4/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):
Expand All @@ -426,7 +440,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
Expand All @@ -453,14 +467,16 @@ def test_mergeDictToRaster():
assert np.all(mergedRaster == testRaster)


def test_mergeDictToPolygon():
_testDIR = pathlib.Path(__file__).parent
pathTestFolder = _testDIR / "data" / "testCom4"
def test_mergeDictToPolygon(tmp_path):
_testDIR = pathlib.Path(__file__).parent
pathRefData = _testDIR / "data" / "testCom4"

pathTestFolder = tmp_path / "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
Expand All @@ -484,7 +500,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"])
Expand All @@ -505,7 +522,7 @@ 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"])
Expand All @@ -517,7 +534,8 @@ def test_mergeDictToPolygon():
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)
Loading