From c3ce4ed3eaa120cf99df36193a6f7450dbb3b889 Mon Sep 17 00:00:00 2001
From: Marco Matthies <71844+marcom@users.noreply.github.com>
Date: Mon, 10 Feb 2025 08:54:50 +0100
Subject: [PATCH] Fix unit tests to use correct soil type
---
test/crop_tests.jl | 4 ++--
test/nature_tests.jl | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/crop_tests.jl b/test/crop_tests.jl
index f404a3e..17ec180 100644
--- a/test/crop_tests.jl
+++ b/test/crop_tests.jl
@@ -31,7 +31,7 @@ end
mature = false
events = Ps.Management[]
force_growth = false
- fp = FarmPlot(id, pixels, farmer, Ps.soiltype_nodata, Ps.ALMaSS.CropState(croptype=ct, phase=Ps.ALMaSS.janfirst))
+ fp = FarmPlot(id, pixels, farmer, Ps.nosoildata, Ps.ALMaSS.CropState(croptype=ct, phase=Ps.ALMaSS.janfirst))
@test fp isa FarmPlot
@test fp isa FarmPlot{Ps.ALMaSS.CropState}
@test croptype(fp) isa Ps.ALMaSS.CropType
@@ -46,7 +46,7 @@ end
id = 0
pixels = [(0, 0)]
farmer = 0
- fp = FarmPlot(id, pixels, farmer, Ps.soiltype_nodata, Ps.SimpleCrop.CropState(ct, 0.0cm))
+ fp = FarmPlot(id, pixels, farmer, Ps.nosoildata, Ps.SimpleCrop.CropState(ct, 0.0cm))
@test fp isa FarmPlot
@test fp isa FarmPlot{Ps.SimpleCrop.CropState}
@test croptype(fp) isa Ps.SimpleCrop.CropType
diff --git a/test/nature_tests.jl b/test/nature_tests.jl
index fcbf97f..84ba55d 100644
--- a/test/nature_tests.jl
+++ b/test/nature_tests.jl
@@ -47,9 +47,9 @@ end) # end eval
@testset "Habitat macros" begin
# set up the testing landscape
model = inittestmodel()
- model.landscape[6,6] = Pixel(Ps.agriculture, Ps.soiltype_sand, 1, [], [], [])
+ model.landscape[6,6] = Pixel(Ps.agriculture, Ps.sand, 1, [], [], [])
fp = Ps.FarmPlot(
- 1, [(6,6)], 1, Ps.soiltype_nodata,
+ 1, [(6,6)], 1, Ps.nosoildata,
Ps.ALMaSS.CropState(
croptype = model.crops["winter wheat"],
phase = Ps.ALMaSS.janfirst,
--
GitLab