Skip to content

Commit 40cdc84

Browse files
committed
Fix some errors in tests
1 parent 2e56472 commit 40cdc84

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/run.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ end
119119

120120
function _all_modellists_collection(object)
121121
if isa(object, AbstractArray)
122-
return all(x -> x isa ModelList, object)
122+
return all(x -> x isa ModelList || x isa ModelMapping{SingleScale}, object)
123123
elseif isa(object, AbstractDict)
124-
return all(x -> x isa ModelList, values(object))
124+
return all(x -> x isa ModelList || x isa ModelMapping{SingleScale}, values(object))
125125
end
126126
return false
127127
end

test/test-mapping.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ end
176176
process3=Process3Model(),
177177
status=(var1=15.0, var2=0.3)
178178
)
179-
baseline_outputs = @test_deprecated run!(models_single_scale, meteo)
179+
baseline_outputs = run!(models_single_scale, meteo)
180180

181181
outputs_from_models_args = run!(
182182
PlantSimEngine.ModelMapping(

test/test-simulation.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ end;
3232
)
3333
meteo = Atmosphere(T=20.0, Wind=1.0, Rh=0.65)
3434

35-
@test_deprecated run!(models, meteo)
35+
run!(models, meteo)
3636
@test_deprecated run!([models], meteo)
3737
@test_throws ErrorException run!(ModelMapping("mod1" => models), meteo)
3838

0 commit comments

Comments
 (0)