Merge pull request #109 from SimonDanisch/sd/testcleanup

clean up tests

Author: SimonDanisch

.travis.yml

@@ -4,10 +4,11 @@ os:
   - osx
 julia:
   - 0.4
+  - nightly
 notifications:
   email: false
 script:
     - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-    - julia --inline=no -e 'Pkg.clone(pwd()); Pkg.test("FixedSizeArrays"; coverage=true)'
+    - julia -e 'Pkg.clone(pwd()); Pkg.test("FixedSizeArrays"; coverage=true)'
 after_success:
   - julia -e 'cd(Pkg.dir("FixedSizeArrays")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'

src/array_of_fixedsize.jl

@@ -13,6 +13,8 @@ immutable ExtremaFun <: Functor{2} end
 
 call(::MaxFun, a, b) = max(a, b)
 call(::MinFun, a, b) = min(a, b)
+call(::ExtremaFun, reducevalue, a) = min(reducevalue[1], a), max(reducevalue[2], a)
+
 minimum{T <: FixedArray}(a::Vector{T}) = reduce(MinFun(), a)
 maximum{T <: FixedArray}(a::Vector{T}) = reduce(MaxFun(), a)
 extrema{T <: FixedArray}(a::AbstractVector{T}) = reduce(ExtremaFun(), a)

src/mapreduce.jl

@@ -20,8 +20,8 @@ end
     red
 end
 
-index_expr{T <: Number}(::Type{T}, i::Int, inds::Int...) = :($(symbol("arg$i")))
-index_expr{T <: FixedArray}(::Type{T}, i::Int, inds::Int...) = :($(symbol("arg$i"))[$(inds...)])
+index_expr{T <: Number}(::Type{T}, i::Int, inds::Int...) = :($(Symbol("arg$i")))
+index_expr{T <: FixedArray}(::Type{T}, i::Int, inds::Int...) = :($(Symbol("arg$i"))[$(inds...)])
 inner_expr{N}(args::NTuple{N, DataType}, inds::Int...) = :( F($(ntuple(i -> index_expr(args[i], i, inds...), N)...)) )
 
 

test/runtests.jl

@@ -17,6 +17,11 @@ immutable RGB{T} <: FixedVectorNoTuple{3, T}
         new{T}(a[1], a[2], a[3])
     end
 end
+# subtyping:
+immutable TestType{N,T} <: FixedVector{N,T}
+    a::NTuple{N,T}
+end
+
 
 typealias Vec1d Vec{1, Float64}
 typealias Vec2d Vec{2, Float64}
@@ -37,6 +42,9 @@ end
 
 facts("FixedSizeArrays") do
 
+include("typeinf.jl")
+
+
 context("fsa macro") do
     a = 1
     a1 = @fsa([a,2,3])
@@ -141,6 +149,8 @@ context("Array of FixedArrays") do
 
         @fact maximum(d) --> RGB(typemax(Float64))
         @fact minimum(d) --> RGB(typemin(Float64))
+
+        @fact extrema(c) --> (minimum(c), maximum(c))
     end
 
     context("array ops") do
@@ -1050,13 +1060,6 @@ context("Base.Test") do
     @fact Base.Test.@test_approx_eq(a, Vec(a)) --> nothing
 end
 
-end
-
-# subtyping:
-immutable TestType{N,T} <: FixedVector{N,T}
-    a::NTuple{N,T}
-end
-
 facts("show for subtype") do
 
     Base.show(io::IO, x::TestType) = print(io, "$(x.a)")  # show for new type
@@ -1065,6 +1068,13 @@ facts("show for subtype") do
     @fact string(x) --> "(1,2)"
 end
 
+
 end
 
+end
+
+
+
+
+
 FactCheck.exitstatus()