Add some more tests and tweak range methods.

PainterQubits · Dec 6, 2017 · 664b715 · 664b715
1 parent 2a9a61a
commit 664b715
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/range.jl b/src/range.jl
@@ -81,8 +81,14 @@ range(a::Quantity{<:AbstractFloat}, st::Quantity{<:Real}, len::Integer) =
     range(a, float(st), len)
 range(a::Quantity{<:AbstractFloat}, st::Quantity{<:AbstractFloat}, len::Integer) =
     _range(promote(a, st)..., len)
+_range(a::T, st::T, len) where {T<:Quantity} = range(a, st, len)
+_range(a, st, len) = throw(DimensionError(a, st))
+
 range(a::Quantity, st::Real, len::Integer) = range(promote(a, st)..., len)
 range(a::Real, st::Quantity, len::Integer) = range(promote(a, st)..., len)
 
-_range(a::T, st::T, len) where {T<:Quantity} = range(a, st, len)
-_range(a, st, len) = throw(DimensionError(a, st))
+# the following is needed to give sane error messages when doing e.g. range(1°, 2V, 5)
+function range(a::T, step, len::Integer) where {T<:Quantity}
+    dimension(a) != dimension(step) && throw(DimensionError(a,step))
+    return Base._range(TypeOrder(T), TypeArithmetic(T), a, step, len)
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -851,7 +851,18 @@ end
             @test @inferred(length(r)) === 5
             @test @inferred(step(r)) === 1m
 
+            @test @inferred(first(range(1mm, 2m, 4))) === 1mm
+            @test @inferred(step(range(1mm, 2m, 4))) === 2m
+            @test @inferred(last(range(1mm, 2m, 4))) === 6001mm
             @test_throws ArgumentError 1m:0m:5m
+
+            @test_throws DimensionError range(1m, 2V, 5)
+            try
+                range(1m, 2V, 5)
+            catch e
+                @test e.x == 1m
+                @test e.y == 2V
+            end
         end
         @testset ">> StepRangeLen" begin
             @test isa(@inferred(colon(1.0m, 1m, 5m)), StepRangeLen{typeof(1.0m)})