Refactor tests

Author: juliohm

test/Project.toml

@@ -1,6 +1,7 @@
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
 CoDa = "5900dafe-f573-5c72-b367-76665857777b"
+ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/runtests.jl

@@ -2,25 +2,19 @@ using TableDistances
 using CategoricalArrays
 using Distances
 using Tables
+using ColorTypes
 using CoDa
 using Test
 
 @testset "TableDistances.jl" begin
   @testset "Pairwise" begin
-    # test data
+    # compositional data
     table₁ = (a = rand(4), b = rand(Composition{5}, 4))
     table₂ = (a = rand(6), b = rand(Composition{5}, 6))
-    table₃ = (a = ["a", "b", "a", "c"], b = [1, 4, 1, 5])
-    table₄ = (a = categorical(table₃.a), b = categorical(table₃.b))
-    table₅ = (a = categorical(table₃.a, ordered=true), b = categorical(table₃.b, ordered=true))
-
-    # specific columns
     euclidcol₁ = Tables.getcolumn(table₁, :a)
     euclidcol₂ = Tables.getcolumn(table₂, :a)
     codacol₁   = Tables.getcolumn(table₁, :b)
     codacol₂   = Tables.getcolumn(table₂, :b)
-
-    # column normalization
     D₁ = pairwise(TableDistance(normalize=true), table₁, table₂)
     D₂ = pairwise(TableDistance(normalize=false), table₁, table₂)
     D₃ = 0.5*pairwise(Euclidean(), euclidcol₁, euclidcol₂) +
@@ -41,13 +35,16 @@ using Test
     @test D₁ ≈ D₂
 
     # unordered categorical values
+    table₁ = (a = ["a", "b", "a", "c"], b = [1, 4, 1, 5])
+    table₂ = (a = categorical(table₁.a), b = categorical(table₁.b))
+    table₃ = (a = categorical(table₁.a, ordered=true), b = categorical(table₁.b, ordered=true))
     D = [
       0.0  1.0  0.0  1.0
       1.0  0.0  1.0  1.0
       0.0  1.0  0.0  1.0
       1.0  1.0  1.0  0.0
     ]
-    @test pairwise(TableDistance(), table₃) == pairwise(TableDistance(), table₄) == D
+    @test pairwise(TableDistance(), table₁) == pairwise(TableDistance(), table₂) == D
 
     # ordered categorical values
     D = [
@@ -56,6 +53,6 @@ using Test
       0.0  1.0  0.0  2.0
       2.0  1.0  2.0  0.0
     ]
-    @test pairwise(TableDistance(), table₅) == D
+    @test pairwise(TableDistance(), table₃) == D
   end
 end