Make the tests compact

JuliaIntervals · Aug 11, 2020 · ce08851 · ce08851
1 parent ba320f9
commit ce08851
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 38 deletions.
diff --git a/src/intervals/arithmetic.jl b/src/intervals/arithmetic.jl
@@ -99,9 +99,9 @@ function *(x::S, a::Interval{T}) where {T, S<:AbstractFloat}
     (iszero(a) || iszero(x)) && return zero(Interval{T})
 
     if x ≥ 0.0
-        c = @round(Interval{T}, a.lo*x, a.hi*x)
+        return @round(Interval{T}, a.lo*x, a.hi*x)
     else
-        c = @round(Interval{T}, a.hi*x, a.lo*x)
+        return @round(Interval{T}, a.hi*x, a.lo*x)
     end
 
 end
@@ -155,9 +155,9 @@ function /(a::Interval{T}, x::S) where {T, S<:AbstractFloat}
     iszero(a) && return zero(Interval{T})
 
     if x ≥ 0.0
-        c = @round(Interval{T}, a.lo/x, a.hi/x)
+        return @round(Interval{T}, a.lo/x, a.hi/x)
     else
-        c = @round(Interval{T}, a.hi/x, a.lo/x)
+        return @round(Interval{T}, a.hi/x, a.lo/x)
     end
 
 end

diff --git a/test/interval_tests/numeric.jl b/test/interval_tests/numeric.jl
@@ -393,40 +393,18 @@ end
 
 @testset "function call for mathematical operators" begin
 
-    @testset "+ operator" begin
-        @test which(+, (Interval{Float64}, Float32)).module == IntervalArithmetic
-        @test which(+, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(+, (Interval{BigFloat}, Float64)).module == IntervalArithmetic
-        @test which(+, (Interval{Float64}, BigFloat)).module == IntervalArithmetic
-        @test which(+, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(+, (Interval{BigFloat}, Float32)).module == IntervalArithmetic
-    end
-
-    @testset "- operator" begin
-        @test which(-, (Interval{Float64}, Float32)).module == IntervalArithmetic
-        @test which(-, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(-, (Interval{BigFloat}, Float64)).module == IntervalArithmetic
-        @test which(-, (Interval{Float64}, BigFloat)).module == IntervalArithmetic
-        @test which(-, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(-, (Interval{BigFloat}, Float32)).module == IntervalArithmetic
-    end
-
-    @testset "* operator" begin
-        @test which(*, (Interval{Float64}, Float32)).module == IntervalArithmetic
-        @test which(*, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(*, (Interval{BigFloat}, Float64)).module == IntervalArithmetic
-        @test which(*, (Interval{Float64}, BigFloat)).module == IntervalArithmetic
-        @test which(*, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(*, (Interval{BigFloat}, Float32)).module == IntervalArithmetic
-    end
-
-    @testset "/ operator" begin
-        @test which(/, (Interval{Float64}, Float32)).module == IntervalArithmetic
-        @test which(/, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(/, (Interval{BigFloat}, Float64)).module == IntervalArithmetic
-        @test which(/, (Interval{Float64}, BigFloat)).module == IntervalArithmetic
-        @test which(/, (Interval{Float32}, Float64)).module == IntervalArithmetic
-        @test which(/, (Interval{BigFloat}, Float32)).module == IntervalArithmetic
+    types = [Float32, Float64, BigFloat]
+    operations = [+, *, -, /]
+
+    for op in operations
+        for T1 in types
+            for T2 in types
+                @test which(op, (Interval{T1}, T2)).module == IntervalArithmetic
+                if(op != /)
+                    @test which(op, (T1, Interval{T2})).module == IntervalArithmetic
+                end
+            end
+        end
     end
 end