fix tests on 1.0

Author: Michael Abbott

test/_fast.jl

@@ -4,14 +4,16 @@ using Test, AxisKeys, BenchmarkTools
 
     A = wrapdims(rand(2,3), 11.0:12.0, [:a, :b, :c])
 
-    # getindex
-    @test 0 == @ballocated $A[1, 1]
-    @test 272 >= @ballocated $A[1, :]
-    @test (@inferred A[1, :]; true)
-    @test (@inferred view(A, 1, :); true)
-
-    # getkey
-    @test 32 >= @ballocated $A(11.0, :a)
+    if VERSION >= v"1.1"
+        # getindex
+        @test 0 == @ballocated $A[1, 1]
+        @test 272 >= @ballocated $A[1, :]
+        @test (@inferred A[1, :]; true)
+        @test (@inferred view(A, 1, :); true)
+
+        # getkey
+        @test 32 >= @ballocated $A(11.0, :a)
+    end
 
     al_A = @ballocated view($A,1,:) # 96
     @test al_A == @ballocated $A(11.0,:)
@@ -25,10 +27,12 @@ using Test, AxisKeys, BenchmarkTools
     # with names
     N = wrapdims(rand(2,3), row=11.0:12.0, col=[:a, :b, :c])
 
-    @test 0 == @ballocated $N[1, 1]
-    @test 0 == @ballocated $N[col=1, row=1]
-    @test 288 >= @ballocated $N[row=1]
-    @test (@inferred N[row=1]; true)
+    if VERSION >= v"1.1"
+        @test 0 == @ballocated $N[1, 1]
+        @test 0 == @ballocated $N[col=1, row=1]
+        @test 288 >= @ballocated $N[row=1]
+        @test (@inferred N[row=1]; true)
+    end
 
     # extraction
     @test 0 == @ballocated axiskeys($N)
@@ -58,7 +62,7 @@ end
         @test 80 >= @ballocated KeyedArray($M, row='a':'b', col=10:10:30) # 464 >=
         @test 80 >= @ballocated NamedDimsArray($M, row='a':'b', col=10:10:30) # 400 >=
     end
-    @ballocated wrapdims($M, row='a':'b', col=10:10:30) # 560 >=
+    @test 560 >= @ballocated wrapdims($M, row='a':'b', col=10:10:30) # 560 >=
 
     @test (@inferred KeyedArray(M, row='a':'b', col=10:10:30); true)
     @test (@inferred NamedDimsArray(M, row='a':'b', col=10:10:30); true)

test/_packages.jl

@@ -69,11 +69,11 @@ end
 @testset "inverted" begin
 
     K = wrapdims(rand(4,5))
-    @test K[:, Not(4)] == K[:, vcat(1:3, 5)] == K(:, !=(4))
+    @test K[:, Not(4)] == K[:, vcat(1:3, 5)] == K(:, Base.Fix2(!=,4))
     @test K[Not(1,4), :] == K[2:3, :] == K(r -> 2<=r<=3, :)
 
     N = wrapdims(rand(Int8, 2,3,4), a=[:one, :two], b='α':'γ', c=31:34)
-    @test N[b=Not(2)] == N[:,[1,3],:] == N(b=!=('β')) == N(:,['α','γ'],:)
+    @test N[b=Not(2)] == N[:,[1,3],:] == N(b=Base.Fix2(!=,'β')) == N(:,['α','γ'],:)
     @test N[c=Not(2,4)] == N(c=Index[Not(2,4)])
 
 end