From e0049b56bdd0dd8ef2175beff8c4a03d238efddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Poisot?= Date: Thu, 16 Feb 2023 21:17:03 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20correct=20check=20on=20layer=20i?= =?UTF-8?q?nner=20type=20(#146)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 correct check on layer inner type * 🟩 prepare for tests * ⚙️ handle the internal type check gracefully * ✅ read/write test passing --- Project.toml | 2 +- src/io/geotiff.jl | 5 +++-- test/01_integration_read.jl | 20 ++++++++++++++++++++ test/Project.toml | 2 ++ test/runtests.jl | 27 ++++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 test/01_integration_read.jl create mode 100644 test/Project.toml diff --git a/Project.toml b/Project.toml index b5d3eb2c8..572210425 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "SpeciesDistributionToolkit" uuid = "72b53823-5c0b-4575-ad0e-8e97227ad13b" authors = ["Timothée Poisot "] -version = "0.0.3" +version = "0.0.4" [deps] ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3" diff --git a/src/io/geotiff.jl b/src/io/geotiff.jl index 645f562aa..5728ad569 100644 --- a/src/io/geotiff.jl +++ b/src/io/geotiff.jl @@ -183,9 +183,10 @@ function _prepare_layer_for_burnin( layer::SimpleSDMPredictor{T}, nodata::T, ) where {T <: Number} - @assert eltype(layer) <: Number + K = SimpleSDMLayers._inner_type(layer) + @assert K <: Number array = replace(layer.grid, nothing => nodata) - array = convert(Matrix{eltype(layer)}, array) + array = convert(Matrix{K}, array) dtype = eltype(array) array_t = reverse(permutedims(array, [2, 1]); dims = 2) return array_t diff --git a/test/01_integration_read.jl b/test/01_integration_read.jl new file mode 100644 index 000000000..d032effbf --- /dev/null +++ b/test/01_integration_read.jl @@ -0,0 +1,20 @@ +module TestThatWeCanReadStuff + +using SpeciesDistributionToolkit +using Test + +# Get some EarthEnv data +layer = SimpleSDMPredictor(RasterData(EarthEnv, LandCover); layer = 1) +D = SimpleSDMLayers._inner_type(layer) + +# Write the data +f = tempname() +SpeciesDistributionToolkit._write_geotiff(f, [layer]; driver = "GTiff", nodata = typemax(D)) +@test isfile(f) + +# Read the data +layer2 = SpeciesDistributionToolkit._read_geotiff(f, SimpleSDMPredictor) +@test typeof(layer2) <: SimpleSDMPredictor +@test all(values(layer) .== values(layer2)) + +end \ No newline at end of file diff --git a/test/Project.toml b/test/Project.toml new file mode 100644 index 000000000..0c363327c --- /dev/null +++ b/test/Project.toml @@ -0,0 +1,2 @@ +[deps] +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/test/runtests.jl b/test/runtests.jl index 9dafe9be2..cb006db78 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1 +1,26 @@ -nothing +using SpeciesDistributionToolkit +using Test + +global anyerrors = false + +tests = [ + "read/write layers" => "01_integration_read.jl", +] + +for test in tests + try + include(test.second) + println("\033[1m\033[32m✓\033[0m\t$(test.first)") + catch e + global anyerrors = true + println("\033[1m\033[31m×\033[0m\t$(test.first)") + println("\033[1m\033[38m→\033[0m\ttest/$(test.second)") + showerror(stdout, e, backtrace()) + println() + break + end +end + +if anyerrors + throw("Tests failed") +end