Merge pull request #63 from awesome-spectral-indices/fm/tests

light tests restructure
awesome-spectral-indices · Apr 12, 2024 · b9d71d9 · b9d71d9
2 parents fd6a5e1 + d14a8be
commit b9d71d9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/test/DataFrames/compute_index.jl b/test/DataFrames/compute_index.jl
@@ -4,6 +4,7 @@ using DataFrames
 using Random
 using Combinatorics
 using StatsBase
+include("../test_utils.jl")
 Random.seed!(17)
 
 floats = [Float64, Float32, Float16]

diff --git a/test/DataFrames/compute_kernel.jl b/test/DataFrames/compute_kernel.jl
@@ -2,6 +2,8 @@ using Test
 using SpectralIndices
 using DataFrames
 
+floats = [Float64, Float32, Float16]
+
 function convert_to_kwargs(df::DataFrame)
     kwargs = [(Symbol(band) => DataFrame(band => df[:, band])) for band in names(df)]
     return kwargs

diff --git a/test/YAXArrays/compute_index.jl b/test/YAXArrays/compute_index.jl
@@ -5,6 +5,7 @@ using DimensionalData
 using Random
 using Combinatorics
 using StatsBase
+include("../test_utils.jl")
 Random.seed!(17)
 
 floats = [Float64, Float32, Float16]

diff --git a/test/compute_index.jl b/test/compute_index.jl
@@ -4,6 +4,7 @@ using YAXArrays
 using Random
 using Combinatorics
 using StatsBase
+include("test_utils.jl")
 Random.seed!(17)
 
 floats = [Float64, Float32, Float16]

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -5,28 +5,27 @@ using Test
     include("qa.jl")
 end
 
-@safetestset "Utils" begin
-    include("utils.jl")
-    include("DataFrames/datasets.jl")
-    include("YAXArrays/datasets.jl")
+@testset "Utils" begin
+    @safetestset "General utils" include("utils.jl")
+    @safetestset "DataFrames datasets" include("DataFrames/datasets.jl")
+    @safetestset "YAXArrays datasets" include("YAXArrays/datasets.jl")
 end
 
-@safetestset "Axioms" begin
-    include("indices.jl")
-    include("platforms.jl")
-    include("bands.jl")
-    include("constants.jl")
+@testset "Axioms" begin
+    @safetestset "Indices" include("indices.jl")
+    @safetestset "Platforms" include("platforms.jl")
+    @safetestset "Bands" include("bands.jl")
+    @safetestset "Constants" include("constants.jl")
 end
 
-@safetestset "Compute Indices" begin
-    include("test_utils.jl")
-    include("compute_index.jl")
-    include("DataFrames/compute_index.jl")
-    include("YAXArrays/compute_index.jl")
+@testset "Compute Indices" begin
+    @safetestset "Built-in types" include("compute_index.jl")
+    @safetestset "DataFrames" include("DataFrames/compute_index.jl")
+    @safetestset "YAXArrays" include("YAXArrays/compute_index.jl")
 end
 
-@safetestset "Compute Kernels" begin
-    include("compute_kernel.jl")
-    include("DataFrames/compute_kernel.jl")
-    include("YAXArrays/compute_kernel.jl")
+@testset "Compute Kernels" begin
+    @safetestset "Built-in types" include("compute_kernel.jl")
+    @safetestset "DataFrames" include("DataFrames/compute_kernel.jl")
+    @safetestset "YAXArrays" include("YAXArrays/compute_kernel.jl")
 end