Fix test_metricity failure to test (#88)

richardreeve · KristofferC · commit 9c4f1bc33e8e · 2017-11-29T16:38:44.000+01:00
* Fix Base.Test to Compat.Test for 0.7. * Return test_metricity to a macro. Add in better @testset structure for debugging. Fix ./ misread. * Fix float conversion for F64 type. * Add in Bray-Curtis metricity test. * Fix indentation for testset * Pairwise tests were not being carried out either. Now generating errors. * Colwise tests now tidied up into testsets and incorrect test failures reduced by switching from ≈ to all( .≈ ). * Fix test failures due to rounding errors in accumulations. * Change back to function from macro for consistency.
diff --git a/test/F64.jl b/test/F64.jl
@@ -21,7 +21,7 @@ Base.:^(a::F64, b::F64) = F64(a.x^b.x)
 Base.:^(a::Number, b::F64) = a^b.x
 Base.log(a::F64) = F64(log(a.x))
 Base.isfinite(a::F64) = isfinite(a.x)
-Base.float(a::F64) = a
+Base.float(a::F64) = a.x
 Base.rtoldefault(a::Type{F64}, b::Type{F64}) = Base.rtoldefault(Float64, Float64)
 # comparison
 Base.isapprox(a::F64, b::F64) = isapprox(a.x, b.x)
@@ -40,4 +40,4 @@ Base.convert(::Type{F64}, a::T) where {T <: Number} = F64(a)
 
 # conversion
 Base.Int64(a::F64) = Int64(a.x)
-Base.Int32(a::F64) = Int32(a.x)
+Base.Int32(a::F64) = Int32(a.x)
diff --git a/test/REQUIRE b/test/REQUIRE
@@ -0,0 +1 @@
+Compat 0.33.0
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using Distances
-using Base.Test
+using Compat.Test
 
 include("F64.jl")
 include("test_dists.jl")
diff --git a/test/test_dists.jl b/test/test_dists.jl
