Merge pull request #138 from kshyatt/ksh/tests

some small tests

Author: iamed2

test/categoricalvector.jl

@@ -11,6 +11,9 @@ A = AxisArray(data[idx,:], AxisArrays.CategoricalVector(v[idx]), [:a, :b])
 @test AxisArrays.axistrait(axes(A)[1]) <: AxisArrays.Categorical
 
 v = AxisArrays.CategoricalVector(collect([1; 8; 10:15]))
+@test size(v) == (8,)
+@test size(v, 1) == 8
+@test size(v, 2) == 1
 @test AxisArrays.axistrait(axes(A)[1]) <: AxisArrays.Categorical
 A = AxisArray(reshape(1:16, 8, 2), v, [:a, :b])
 

test/combine.jl

@@ -32,6 +32,7 @@ ABdata = zeros(6,6,2)
 ABdata[1:4,1:4,:] = Adata
 ABdata[3:6,3:6,:] = Bdata
 @test merge(A,B) == AxisArray(ABdata, Axis{:X}([1,2,3,4,5,6]), Axis{:Y}([10.,20,30,40,50,60]), Axis{:Z}([:First, :Second]))
+@test_throws ErrorException AxisArrays.axismerge(:notouter, Axis{:X}([1,2,3,4]), Axis{:X}([1,2,3,4]))
 
 AC = AxisArray(cat(3, Adata, Cdata), :X, :Y, :Z)
 B2 = AxisArray(Bdata, :X, :Y, :Z)

test/indexing.jl

@@ -233,6 +233,10 @@ A = AxisArray([1 2; 3 4], Axis{:x}([1.0,4.0]), Axis{:y}([2.0,6.1]))
 @test @inferred(A[Axis{:x}(atvalue(2.0, atol=5))]) == [1,2]
 @test_throws BoundsError A[Axis{:x}(atvalue(4.00000001, rtol=0))]
 
+# Showing Values
+@test sprint(show, AxisArrays.ExactValue(1)) == "ExactValue(1)"
+@test sprint(show, AxisArrays.TolValue(1., 0.1)) == "TolValue(1.0, tol=0.1)"
+
 # Indexing with ExactValue on Dimensional axes
 A = AxisArray([2.0,4.0,6.1], Axis{:x}([-10,1,3]))
 @test @inferred(A[AxisArrays.ExactValue(1)]) == @inferred(A[atvalue(1)]) == 4.0

test/sortedvector.jl

@@ -5,6 +5,11 @@ A = AxisArray(reshape(1:16, 8, 2), v, [:a, :b])
 @test A[ClosedInterval(8.,12.), :] == A[2:5, :]
 @test A[1. .. 1., :] == A[1:1, :]
 @test A[10. .. 10., :] == A[2:3, :]
+@test size(v) == (8,)
+@test size(v, 1) == 8
+@test size(v, 2) == 1
+# test StepRange indexing
+@test v[1:2:8] == [1.0; 10.0; 12.0; 14.0]
 
 # Test SortedVector with a hierarchical index (indexed using Tuples)
 srand(1234)