Fix tests

Author: meggart

Project.toml

@@ -36,7 +36,7 @@ Shapefile = "0.6, 0.7"
 StatsBase = "0.32, 0.33"
 Tables = "0.2, 1.0"
 WeightedOnlineStats = "0.5, 0.6"
-YAXArrays = "0.2.1, 0.3, 0.4"
+YAXArrays = "0.4"
 Zarr = "0.6.2, 0.7"
 julia = "1.6"
 

test/access.jl

@@ -87,36 +87,24 @@ using DiskArrayTools: DiskArrayStack
   data1=readcubedata(d)
   #Test saving cubes
   dire=tempname()
-  YAXdir(dire)
-  savecube(data1,"mySavedCube")
+  savecube(data1,dire)
 
 
-  data3=readcubedata(loadcube("mySavedCube"))
+  data3=readcubedata(Cube(dire))
   @test data1.axes==data3.axes
   @test data1.data==data3.data
 
   # Test loadOrGenerate macro
   d=subsetcube(c,time=Date(2001)..Date(2005),lon=(10,11),lat=(50,51),variable=["gross_primary_productivity","net_ecosystem_exchange"])
 
-  rmcube("Anomalies")
-  @loadOrGenerate danom=>"Anomalies" begin
-      danom = removeMSC(d)
-  end
-
-  @test danom.data isa Array
-
-  @loadOrGenerate danom=>"Anomalies" begin
-      error("This should never execute")
-  end;
-  @test danom.data isa DiskArrayStack
+  danom = removeMSC(d)
 
   zp = tempname()
   savecube(danom, zp, overwrite=true)
 
-  @test danom.data isa DiskArrayStack
 
   danom=readcubedata(danom)
-  danom2=readcubedata(loadcube(zp))
+  danom2=readcubedata(Cube(zp))
 
   @test danom.axes==danom2.axes
   @test all(map(isequal,danom.data,danom2.data))

test/runtests.jl

@@ -11,8 +11,8 @@ cgermany = c[
   var = ["gross", "net_ecosystem", "air_temperature_2m", "terrestrial_ecosystem", "land_surface_temperature"],
   time = 2000:2010
 ]
-savecube(cgermany,"germanycube",
-  chunksize=Dict("lon"=>20,"lat"=>20,"time"=>92))
+cgermany = setchunks(cgermany,Dict("lon"=>20,"lat"=>20,"time"=>92))
+savecube(cgermany,"germanycube")
 YAXArrays.YAXDefaults.cubedir[] = joinpath(newcubedir,"germanycube")
 include("access.jl")
 include("analysis.jl")