Merge pull request #44 from Sov-trotter/tests_improv

Improve tests and minor fixes

Author: SimonDanisch

src/offsetintegers.jl

@@ -4,7 +4,7 @@
 
 OffsetInteger type mainly for indexing.
 * `O` - The offset relative to Julia arrays. This helps reduce copying when
-communicating with 0-indexed systems such ad OpenGL.
+communicating with 0-indexed systems such as OpenGL.
 """
 struct OffsetInteger{O, T <: Integer} <: Integer
     i::T

test/geometrytypes.jl

@@ -295,8 +295,8 @@ end
     rect2 = Rect(0.0, 0.0, 2.0, 1.0)
     @test !overlaps(rect1, rect2)
     rect1 = Rect(1.0, 1.0, 2.0, 2.0)
-    rect2 = Rect(1.0, 1.0, 2.0, 2.0)
-    @test !overlaps(rect1, rect2)
+    rect2 = Rect(1.5, 1.5, 2.0, 2.0)
+    @test overlaps(rect1, rect2)
 
 
     rect1 = Rect(1.0, 1.0, 2.0, 2.0)

test/runtests.jl

@@ -75,6 +75,11 @@ using LinearAlgebra
             filtered = filter(i -> i.value < 0.7, x)
             @test length(filtered) == 7
         end
+        @test GeometryBasics.getcolumn(plain, :name) == pnames
+        @test GeometryBasics.MetaType(Polygon) == PolygonMeta{Polygon,T,Typ,Names,Types} where Types where Names where Typ<:GeometryBasics.AbstractPolygon{Polygon,T} where T
+        @test_throws ErrorException GeometryBasics.meta(plain)
+        @test GeometryBasics.MetaFree(PolygonMeta) == Polygon
+        
     end
 
     @testset "point with metadata" begin
@@ -360,7 +365,10 @@ end
 
     @test hasproperty(m, :xx)
     @test hasproperty(m, :color)
+    @test_throws ErrorException GeometryBasics.MetaType(Simplex)
+    @test_throws ErrorException GeometryBasics.MetaFree(Simplex)
 
+    
     @test m.xx === xx
     @test m.color === color
 
@@ -421,5 +429,35 @@ end
     @test found && point ≈ Point(0.0, 4.0)
     @test intersects(a, f) === (false, Point(0.0, 0.0))
 end
+@testset "Offsetintegers" begin
+    x = 1
+    @test GeometryBasics.raw(x) isa Int64
+    @test GeometryBasics.value(x) == x
+
+    x = ZeroIndex(1)
+    @test eltype(x) == Int64
+
+    x = OffsetInteger{0}(1)
+    @test typeof(x) == OffsetInteger{0,Int64}
+
+    x1 = OffsetInteger{0}(2)
+    @test GeometryBasics.pure_max(x, x1) == x1
+    @test promote_rule(typeof(x), typeof(x1)) == OffsetInteger{0,Int64}
+    x2 = 1
+    @test promote_rule(typeof(x2), typeof(x1)) == Int64
+    @test Base.to_index(x1) == 2
+    @test -(x1) == OffsetInteger{0,Int64}(-2)
+    @test abs(x1) == OffsetInteger{0,Int64}(2)
+    @test +(x, x1) == OffsetInteger{0,Int64}(3)
+    @test *(x, x1) == OffsetInteger{0,Int64}(2)
+    @test -(x, x1) == OffsetInteger{0,Int64}(-1)
+    #test for /
+    @test div(x, x1) == OffsetInteger{0,Int64}(0)
+    @test !==(x, x1) 
+    @test !>=(x, x1) 
+    @test <=(x, x1)
+    @test !>(x, x1)
+    @test <(x, x1)
+end
 
 end  # testset "GeometryBasics"