a few more tests for OffsetIntegers & FixedArrays

Author: ffreyer

src/fixed_arrays.jl

@@ -57,7 +57,8 @@ macro fixed_vector(name_parent)
         function $(name){S}(x::T) where {S,T <: Tuple}
             return $(name){S,StaticArrays.promote_tuple_eltype(T)}(x)
         end
-        $(name){S,T}(x::StaticVector) where {S,T} = $(name){S,T}(Tuple(x))
+        $(name){S,T}(x::StaticVector{S}) where {S,T} = $(name){S,T}(Tuple(x))
+        $(name){S,T}(x::StaticVector) where {S,T} = $(name){S,T}(ntuple(i -> x[i], S))
 
         @generated function (::Type{$(name){S,T}})(x::$(name)) where {S,T}
             idx = [:(x[$i]) for i in 1:S]
@@ -139,7 +140,7 @@ const VecTypes{N,T} = Union{StaticVector{N,T},NTuple{N,T}}
 const Vecf{N} = Vec{N,Float32}
 const PointT{T} = Point{N,T} where N
 const Pointf{N} = Point{N,Float32}
-    
+
 Base.isnan(p::Union{AbstractPoint,Vec}) = any(isnan, p)
 Base.isinf(p::Union{AbstractPoint,Vec}) = any(isinf, p)
 Base.isfinite(p::Union{AbstractPoint,Vec}) = all(isfinite, p)
@@ -177,9 +178,9 @@ export Vecf, Pointf
     Vec{N, T}(args...)
     Vec{N, T}(args::Union{AbstractVector, Tuple, NTuple, StaticVector})
 
-Constructs a Vec of length `N` from the given arguments. 
+Constructs a Vec of length `N` from the given arguments.
 
-Note that Point and Vec don't follow strict mathematical definitions. Instead 
+Note that Point and Vec don't follow strict mathematical definitions. Instead
 we allow them to be used interchangeably.
 
 ## Aliases
@@ -197,9 +198,9 @@ Vec
     Point{N, T}(args...)
     Point{N, T}(args::Union{AbstractVector, Tuple, NTuple, StaticVector})
 
-Constructs a Point of length `N` from the given arguments. 
+Constructs a Point of length `N` from the given arguments.
 
-Note that Point and Vec don't follow strict mathematical definitions. Instead 
+Note that Point and Vec don't follow strict mathematical definitions. Instead
 we allow them to be used interchangeably.
 
 ## Aliases

test/fixed_arrays.jl

@@ -1,6 +1,22 @@
 using Test
 
-@testset "conversion" begin
+@testset "Construction and Conversion" begin
+    for VT in [Point, Vec]
+        for T in [Int32, Float32, Float64, UInt16, BigFloat]
+            p = VT{3, T}(1,2,3)
+            @test p[1] == T(1)
+            @test p[2] == T(2)
+            @test p[3] == T(3)
+        end
+
+        for VT2 in [Point, Vec]
+            @test VT{2, Float32}(VT2{3, Float32}(1,2,3)) == VT{2, Float32}(1,2)
+            @test VT{2, Float32}(VT2{3, Float64}(1,2,3)) == VT{2, Float32}(1,2)
+        end
+        @test VT{2, Float32}(Float32[1,2,3]) == VT{2, Float32}(1,2)
+        @test VT{2, Float32}([1,2,3]) == VT{2, Float32}(1,2)
+    end
+
     @test convert(Point, (2, 3)) === Point(2, 3)
     @test convert(Point, (2.0, 3)) === Point(2.0, 3.0)
 end
@@ -17,6 +33,10 @@ end
                 T = ifelse(T1 == Point, Point, ifelse(T2 == Point, Point, Vec))
                 @test T(2, 2, 4) == T1(1,2,3) .+ T2(1, 0, 1)
                 @test T(foo.((1,2,3), (1, 0, 1))) == foo.(T1(1,2,3), T2(1, 0, 1))
+                @test T1(1,2,3) .* T2(1,2,3) == T(1, 4, 9)
+                # TODO: repair this:
+                # @test foo.(T1(1,2,3), [T2(1,1,1), T2(2,2,2)]) == [T(1,2,3), T(2,4,6)]
+                # @test foo.([T2(1,1,1), T2(2,2,2)], T1(1,2,3)) == [T(0, -3, -8), T(3, 0, -5)]
             end
         end
 
@@ -51,7 +71,7 @@ end
             for T2 in (Vec, Point, tuple)
                 T1 == tuple && T2 == tuple && continue
                 T = ifelse(T1 == Point, Point, ifelse(T2 == Point, Point, Vec))
-                @test T(foo2.((1,2,3), (1, 0, 1), (3, 2, 1), (2,2,0))) == 
+                @test T(foo2.((1,2,3), (1, 0, 1), (3, 2, 1), (2,2,0))) ==
                     foo2.(T1(1,2,3), T2(1, 0, 1), T2(3, 2, 1), T2(2,2,0))
             end
         end
@@ -80,7 +100,7 @@ end
 @testset "Mat" begin
     M3 = Mat3(1,2,3, 4,5,6, 7,8,9)
     @test M3 isa Mat{3,3,Int,9}
-    
+
     @testset "indexing" begin
         for i in 1:9
             @test getindex(M3, i) == i

test/runtests.jl

@@ -312,21 +312,23 @@ end
     x = OffsetInteger{0}(1)
     @test typeof(x) == OffsetInteger{0,Int}
 
-    x1 = OffsetInteger{0}(2)
-    x2 = 1
-    @test Base.to_index(x1) == 2
-    @test -(x1)    == OffsetInteger{0,Int}(-2)
-    @test abs(x1)  == OffsetInteger{0,Int}(2)
-    @test +(x, x1) == OffsetInteger{0,Int}(3)
-    @test *(x, x1) == OffsetInteger{0,Int}(2)
-    @test -(x, x1) == OffsetInteger{0,Int}(-1)
-    #test for /
-    @test div(x, x1) == OffsetInteger{0,Int}(0)
-    @test !==(x, x1)
-    @test !>=(x, x1)
-    @test <=(x, x1)
-    @test !>(x, x1)
-    @test <(x, x1)
+    for x1 in [OffsetInteger{0}(2), 2, 0x02]
+        @test Base.to_index(x1) == 2
+        @test -(x1)    == OffsetInteger{0,Int}(-2)
+        @test abs(x1)  == OffsetInteger{0,Int}(2)
+        for x in [OffsetInteger{0}(1), 1, 0x01]
+            @test +(x, x1) == OffsetInteger{0,Int}(3)
+            @test *(x, x1) == OffsetInteger{0,Int}(2)
+            @test -(x, x1) == OffsetInteger{0,Int}(-1)
+            #test for /
+            @test div(x, x1) == OffsetInteger{0,Int}(0)
+            @test !==(x, x1)
+            @test !>=(x, x1)
+            @test <=(x, x1)
+            @test !>(x, x1)
+            @test <(x, x1)
+        end
+    end
 end
 
 @testset "Tests from GeometryTypes" begin