Fix broken tests after rebase

src/crop/almass.jl

@@ -8,7 +8,7 @@
 module ALMaSS
 
 using Persefone:
-    EventType,
+    Management,
     FarmPlot,
     Length,
     m,
@@ -86,7 +86,7 @@ mutable struct CropState
     LAItotal::Float64
     LAIgreen::Float64
     #biomass::Float64 #XXX I need to figure out how to calculate this
-    events::Vector{EventType}
+    events::Vector{Management}
 end
 
 croptype(cs::CropState) = cs.croptype

src/crop/cropmodels.jl

@@ -62,7 +62,7 @@ function make_cropstate(model::SimulationModel, cropmodel::AbstractString)
         cs = ALMaSS.CropState(
                 model.crops["natural grass"],
                 phase,
-                0.0, 0.0m, 0.0, 0.0, Vector{EventType}()
+                0.0, 0.0m, 0.0, 0.0, Vector{Management}()
         )
     elseif cropmodel == "simple"
         cs = SimpleCrop.CropState(

test/crop_tests.jl

@@ -22,7 +22,7 @@ end
     ct = Ps.ALMaSS.CropType("olive tree", missing, missing, missing, missing, missing,
                             missing, missing)
     fp = FarmPlot(0, [(0,0)],
-                  Ps.ALMaSS.CropState(ct, Ps.ALMaSS.janfirst, 0.0, 0.0m, 0.0, 0.0, Ps.EventType[]))
+                  Ps.ALMaSS.CropState(ct, Ps.ALMaSS.janfirst, 0.0, 0.0m, 0.0, 0.0, Ps.Management[]))
     @test fp isa FarmPlot
     @test fp isa FarmPlot{Ps.ALMaSS.CropState}
     @test croptype(fp) isa Ps.ALMaSS.CropType

test/nature_tests.jl

@@ -47,7 +47,7 @@ end) # end eval
 @testset "Habitat macros" begin
     # set up the testing landscape
     model = inittestmodel()
-    model.landscape[6,6] = Pixel(Ps.agriculture, 1, [], [])
+    model.landscape[6,6] = Pixel(Ps.agriculture, 1, [], [], [])
     fp = Ps.FarmPlot(
         1, [(6,6)],
         Ps.ALMaSS.CropState(