Changed tests to avoid defining isapprox on UniformScaling

Author: Andy Ferris

test/perspective.jl

@@ -1,8 +1,31 @@
 @testset "Perspective transformation" begin
     @test PerspectiveMap()([2.0, -1.0, 0.5]) ≈ [4.0, -2.0]
 
-    @test cameramap(2.0)                  ≈ LinearMap(UniformScaling(2.0)) ∘ PerspectiveMap()
-    @test cameramap((1.1,2.2))            ≈ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
-    @test cameramap(1.1,       (3.3,4.4)) ≈ Translation([-3.3,-4.4]) ∘ LinearMap(UniformScaling(1.1)) ∘ PerspectiveMap()
-    @test cameramap((1.1,2.2), (3.3,4.4)) ≈ Translation([-3.3,-4.4]) ∘ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
+    if VERSION > v"0.6-"
+        @test cameramap(2.0)                  ≈ LinearMap(UniformScaling(2.0)) ∘ PerspectiveMap()
+        @test cameramap((1.1,2.2))            ≈ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
+        @test cameramap(1.1,       (3.3,4.4)) ≈ Translation([-3.3,-4.4]) ∘ LinearMap(UniformScaling(1.1)) ∘ PerspectiveMap()
+        @test cameramap((1.1,2.2), (3.3,4.4)) ≈ Translation([-3.3,-4.4]) ∘ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
+    else
+        # `isapprox` for `UniformScaling` not defined. Just put a few points through and
+        # test that we get the same results
+        points = [[1.0,1.0,1.0], [-1.0,1.0,1.0], [-1.0,-1.0,1.0], [1.0,-1.0,1.0]]
+
+        trans1 = cameramap(2.0)
+        trans2 = LinearMap(UniformScaling(2.0)) ∘ PerspectiveMap()
+        @test all(isapprox.(trans1.(points), trans2.(points)))
+
+        trans1 = cameramap((1.1,2.2))
+        trans2 = LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
+        @test all(isapprox.(trans1.(points), trans2.(points)))
+
+        trans1 = cameramap(1.1,       (3.3,4.4))
+        trans2 = Translation([-3.3,-4.4]) ∘ LinearMap(UniformScaling(1.1)) ∘ PerspectiveMap()
+        @test all(isapprox.(trans1.(points), trans2.(points)))
+
+        trans1 = cameramap((1.1,2.2), (3.3,4.4))
+        trans2 = Translation([-3.3,-4.4]) ∘ LinearMap([1.1 0; 0 2.2]) ∘ PerspectiveMap()
+        @test all(isapprox.(trans1.(points), trans2.(points)))
+
+    end
 end

test/runtests.jl

@@ -3,9 +3,6 @@ using Base.Test
 using ForwardDiff: Dual, partials
 using StaticArrays
 
-# See https://github.com/JuliaLang/julia/issues/18858
-Base.isapprox(a::UniformScaling, b::UniformScaling; kwargs...) = isapprox(a.λ, b.λ; kwargs...)
-
 @testset "CoordinateTransformations" begin
 
     include("core.jl")