Fix v1.2 tests

Tokazama · Mar 21, 2020 · 746c3f3 · 746c3f3 · Tokazama · Mar 21, 2020
1 parent bcaa74e
commit 746c3f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/test/findfirst_tests.jl b/test/findfirst_tests.jl
@@ -37,12 +37,12 @@
  for f in (<, >, <=, >=, ==)
  @testset "Comparison: $f" begin
  @testset "findfirst($f($i1), $b)" begin
- @test @inferred(typed_findfirst(f(i1), m)) == @inferred(typed_findfirst(f(i1), b))
- @test @inferred(typed_findfirst(f(i1), s)) == @inferred(typed_findfirst(f(i1), b))
+ @test @inferred(typed_findfirst(f(i1), m)) == @inferred(catch_nothing(find_first(f(i1), b)))
+ @test @inferred(typed_findfirst(f(i1), s)) == @inferred(catch_nothing(find_first(f(i1), b)))
  end
  @testset "findfirst($f($i2), $b)" begin
- @test @inferred(typed_findfirst(f(i2), m)) == @inferred(typed_findfirst(f(i2), b))
- @test @inferred(typed_findfirst(f(i2), s)) == @inferred(typed_findfirst(f(i2), b))
+ @test @inferred(typed_findfirst(f(i2), m)) == @inferred(catch_nothing(find_first(f(i2), b)))
+ @test @inferred(typed_findfirst(f(i2), s)) == @inferred(catch_nothing(find_first(f(i2), b)))
  end
  end
  end
@@ -57,10 +57,10 @@
  @testset "Number: $i" begin
  for f in (<, >, <=, >=, ==)
  @testset "findfirst($f($i), $m" begin
- @test @inferred(typed_findfirst(f(i), m)) == @inferred(typed_findfirst(f(i), b))
+ @test @inferred(typed_findfirst(f(i), m)) == @inferred(catch_nothing(find_first(f(i), b)))
  end
  @testset "findfirst($f($i), $s" begin
- @test @inferred(typed_findfirst(f(i), s)) == @inferred(typed_findfirst(f(i), b))
+ @test @inferred(typed_findfirst(f(i), s)) == @inferred(catch_nothing(find_first(f(i), b)))
  end
  end
  end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -10,6 +10,10 @@ using StaticRanges: ArrayInterface.ismutable
 using Base: OneTo, step_hp
 using Base.Order
 
+catch_nothing(x) = x
+catch_nothing(x::Nothing) = 0
+
+
 #=
 When using ranges find_all will produce either an AbstractUnitRange or GapRange.
 Therefore, in order test type stability at this level we just ensure it only ever