Merge pull request #107 from Tokazama/range-tests

Better test coverage for ranges

Author: chriselrod

Project.toml

@@ -1,6 +1,6 @@
 name = "ArrayInterface"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "2.14.13"
+version = "2.14.14"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/ranges.jl

@@ -85,15 +85,15 @@ struct OptionallyStaticUnitRange{F<:Integer,L<:Integer} <: AbstractUnitRange{Int
         if step(x) == 1
             return OptionallyStaticUnitRange(static_first(x), static_last(x))
         else
-            throw(ArgumentError("step must be 1, got $(step(r))"))
+            throw(ArgumentError("step must be 1, got $(step(x))"))
         end
     end
 
     function OptionallyStaticUnitRange(x::AbstractRange)
         if step(x) == 1
             return OptionallyStaticUnitRange(static_first(x), static_last(x))
         else
-            throw(ArgumentError("step must be 1, got $(step(r))"))
+            throw(ArgumentError("step must be 1, got $(step(x))"))
         end
     end
 end
@@ -251,6 +251,7 @@ unsafe_isempty_unit_range(fst, lst) = fst > lst
 unsafe_length_one_to(lst::Int) = lst
 unsafe_length_one_to(::StaticInt{L}) where {L} = L
 
+# TODO this should probably be renamed because the point is that it is safe
 @inline function unsafe_length_step_range(start::Int, step::Int, stop::Int)
     if step > 1
         return Base.checked_add(Int(div(unsigned(stop - start), step)), 1)

test/runtests.jl

@@ -199,6 +199,20 @@ end
         @test @inferred(1:2:StaticInt(10)) == 1:2:10
         @test @inferred(1:StaticInt(2):10) == 1:2:10
         @test @inferred(StaticInt(1):2:10) == 1:2:10 
+        @test @inferred(StaticInt(1):UInt(10)) === StaticInt(1):10 
+        @test @inferred(UInt(1):StaticInt(1):StaticInt(10)) === 1:StaticInt(10)
+        @test @inferred(ArrayInterface.OptionallyStaticUnitRange{Int,Int}(1:10)) == 1:10
+        @test @inferred(ArrayInterface.OptionallyStaticUnitRange(1:10)) == 1:10
+
+        @inferred(ArrayInterface.OptionallyStaticUnitRange(1:10))
+
+        @test @inferred(ArrayInterface.OptionallyStaticStepRange(StaticInt(1), 1, UInt(10))) == StaticInt(1):1:10 
+        @test @inferred(ArrayInterface.OptionallyStaticStepRange(UInt(1), 1, StaticInt(10))) == StaticInt(1):1:10 
+        @test @inferred(ArrayInterface.OptionallyStaticStepRange(1:10)) == 1:1:10
+
+        @test_throws ArgumentError ArrayInterface.OptionallyStaticUnitRange(1:2:10)
+        @test_throws ArgumentError ArrayInterface.OptionallyStaticUnitRange{Int,Int}(1:2:10)
+        @test_throws ArgumentError ArrayInterface.OptionallyStaticStepRange(1, 0, 10)
 
         @test @inferred(StaticInt(1):StaticInt(1):StaticInt(10)) === ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), StaticInt(10))
         @test @inferred(StaticInt(1):StaticInt(1):10) === ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), 10)
@@ -226,13 +240,16 @@ end
     @test isnothing(@inferred(ArrayInterface.known_first(typeof(1:4))))
     @test isone(@inferred(ArrayInterface.known_first(Base.OneTo(4))))
     @test isone(@inferred(ArrayInterface.known_first(typeof(Base.OneTo(4)))))
+    @test isone(@inferred(ArrayInterface.known_first(typeof(StaticInt(1):2:10))))
 
     @test isnothing(@inferred(ArrayInterface.known_last(1:4)))
     @test isnothing(@inferred(ArrayInterface.known_last(typeof(1:4))))
+    @test isone(@inferred(ArrayInterface.known_last(typeof(StaticInt(-1):StaticInt(2):StaticInt(1)))))
 
     @test isnothing(@inferred(ArrayInterface.known_step(typeof(1:0.2:4))))
     @test isone(@inferred(ArrayInterface.known_step(1:4)))
     @test isone(@inferred(ArrayInterface.known_step(typeof(1:4))))
+    @test isone(@inferred(ArrayInterface.known_step(typeof(Base.Slice(1:4)))))
 
     @testset "length" begin
         @test @inferred(length(ArrayInterface.OptionallyStaticUnitRange(1, 0))) == 0
@@ -244,6 +261,16 @@ end
 
         @test @inferred(length(StaticInt(1):StaticInt(2):StaticInt(0))) == 0
         @test @inferred(length(StaticInt(0):StaticInt(-2):StaticInt(1))) == 0
+
+        @test @inferred(ArrayInterface.known_length(typeof(ArrayInterface.OptionallyStaticStepRange(StaticInt(1), 2, 10)))) === nothing
+        @test @inferred(ArrayInterface.known_length(typeof(ArrayInterface.OptionallyStaticStepRange(StaticInt(1), StaticInt(1), StaticInt(10))))) === 10
+        @test @inferred(ArrayInterface.known_length(typeof(ArrayInterface.OptionallyStaticStepRange(StaticInt(2), StaticInt(1), StaticInt(10))))) === 9
+        @test @inferred(ArrayInterface.known_length(typeof(ArrayInterface.OptionallyStaticStepRange(StaticInt(2), StaticInt(2), StaticInt(10))))) === 5
+
+        @test @inferred(length(ArrayInterface.OptionallyStaticStepRange(StaticInt(1), 2, 10))) == 5
+        @test @inferred(length(ArrayInterface.OptionallyStaticStepRange(StaticInt(1), StaticInt(1), StaticInt(10)))) == 10
+        @test @inferred(length(ArrayInterface.OptionallyStaticStepRange(StaticInt(2), StaticInt(1), StaticInt(10)))) == 9
+        @test @inferred(length(ArrayInterface.OptionallyStaticStepRange(StaticInt(2), StaticInt(2), StaticInt(10)))) == 5
     end
 
     @test @inferred(getindex(ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), 10), 1)) == 1