Merge branch 'ff/test-coverage' into ff/breaking-changes

Author: ffreyer

src/primitives/rectangles.jl

@@ -311,6 +311,8 @@ Base.isnan(r::Rect) = isnan(origin(r)) || isnan(widths(r))
 Returns a new `Rect{N}` which contains both r1 and r2.
 """
 function Base.union(h1::Rect{N}, h2::Rect{N}) where {N}
+    isnan(h1) && return h2
+    isnan(h2) && return h1
     m = min.(minimum(h1), minimum(h2))
     mm = max.(maximum(h1), maximum(h2))
     return Rect{N}(m, mm - m)
@@ -331,6 +333,7 @@ end
 Perform a intersection between two Rects.
 """
 function Base.intersect(h1::Rect{N}, h2::Rect{N}) where {N}
+    isnan(h1) || isnan(h2) && return Rect{N}()
     m = max.(minimum(h1), minimum(h2))
     mm = min.(maximum(h1), maximum(h2))
     return Rect{N}(m, mm - m)
@@ -341,7 +344,7 @@ function update(b::Rect{N,T}, v::VecTypes{N,T2}) where {N,T,T2}
 end
 
 function update(b::Rect{N,T}, v::VecTypes{N,T}) where {N,T}
-    isnan(b) && return Rect{N, T}(v)
+    isnan(b) && return Rect{N, T}(v, Vec{N, T}(0))
 
     m = min.(minimum(b), v)
     maxi = maximum(b)

test/geometrytypes.jl

@@ -206,6 +206,9 @@ end
     @test widths(r) == Vec2(0)
     @test area(r) == 0
     @test volume(r) == 0
+    @test union(r, Rect2f(1,1,2,2)) == Rect2f(1,1,2,2)
+    @test union(Rect2f(1,1,2,2), r) == Rect2f(1,1,2,2)
+    @test update(r, Vec2f(1,1)) == Rect2f(1,1,0,0)
 
     a = Rect(Vec(0, 1), Vec(2, 3))
     pt_expa = Point{2,Int}[(0, 1), (2, 1), (2, 4), (0, 4)]
@@ -221,6 +224,9 @@ end
     @test widths(a) == Vec(2,3)
     @test area(a) == 2*3
     @test volume(a) == 2*3
+    @test union(a, Rect2f(1,1,2,2)) == Rect2f(0,1,3,3)
+    @test union(Rect2f(1,1,2,2), a) == Rect2f(0,1,3,3)
+    @test update(a, Vec2f(0,0)) == Rect2f(0,0,2,4)
 
     b = Rect(Vec(1, 2, 3), Vec(4, 5, 6))
     pt_expb = Point{3, Int64}[[1, 2, 3], [1, 2, 9], [1, 7, 3], [1, 7, 9],
@@ -235,6 +241,10 @@ end
     @test widths(b) == Vec(4,5,6)
     @test_throws MethodError area(b)
     @test volume(b) == 4*5*6
+    @test union(b, Rect3f(1,1,1,2,2,2)) == Rect3f(1,1,1, 4,6,8)
+    @test union(Rect3f(1,1,1,2,2,2), b) == Rect3f(1,1,1, 4,6,8)
+    @test update(b, Vec3f(0)) == Rect3f(0,0,0,5,7,9)
+
 
     mesh = normal_mesh(b)
     @test faces(mesh) == GLTriangleFace[