Move Assert helper methods to geom package

Author: tomas-novotny

CHANGELOG.md

@@ -6,7 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased](https://github.com/gravitton/geometry/compare/v1.1.0...master)
+## [Unreleased](https://github.com/gravitton/geometry/compare/v1.1.1...master)
+
+
+## [v1.1.1 (2025-10-27)](https://github.com/gravitton/geometry/compare/v1.1.0...v1.1.1)
+### Fixed
+- Move Assert helper methods to `geom` package
 
 
 ## [v1.1.0 (2025-10-27)](https://github.com/gravitton/geometry/compare/v1.0.0...v1.1.0)

circle_test.go

@@ -141,18 +141,3 @@ func TestCircle_Immutable(t *testing.T) {
 
 	AssertCircle(t, c1, 1, 2, 10)
 }
-
-func AssertCircle[T Number](t *testing.T, c Circle[T], x, y, radius T, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !AssertPoint(t, c.Center, x, y, append(messages, "Center.")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, float64(c.Radius), float64(radius), Delta, append(messages, "Radius: ")...) {
-		ok = false
-	}
-
-	return ok
-}

line_test.go

@@ -114,18 +114,3 @@ func TestLine_Immutable(t *testing.T) {
 
 	assert.True(t, l.Equal(lineInt))
 }
-
-func AssertLine[T Number](t *testing.T, l Line[T], sx, sy, ex, ey T, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !AssertPoint(t, l.Start, sx, sy, append(messages, "Start.")...) {
-		ok = false
-	}
-	if !AssertPoint(t, l.End, ex, ey, append(messages, "End.")...) {
-		ok = false
-	}
-
-	return ok
-}

padding_test.go

@@ -74,24 +74,3 @@ func TestPadding_Unmarshall(t *testing.T) {
 	assert.NoError(t, json.Unmarshal([]byte(`{"t":0.10,"r":3,"b":0.60,"l":2.40}`), &p2))
 	AssertPadding(t, p2, 0.1, 3.0, 0.6, 2.4)
 }
-
-func AssertPadding[T Number](t *testing.T, p Padding[T], top, right, bottom, left T, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !assert.EqualDelta(t, float64(p.Top), float64(top), Delta, append(messages, "Top: ")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, float64(p.Right), float64(right), Delta, append(messages, "Right: ")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, float64(p.Bottom), float64(bottom), Delta, append(messages, "Bottom: ")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, float64(p.Left), float64(left), Delta, append(messages, "Left: ")...) {
-		ok = false
-	}
-
-	return ok
-}

point_test.go

@@ -157,18 +157,3 @@ func TestPoint_Immutable(t *testing.T) {
 	AssertPoint(t, p1, 1, 2)
 	AssertPoint(t, p2, 3, -3)
 }
-
-func AssertPoint[T Number](t *testing.T, p Point[T], x, y T, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !assert.EqualDelta(t, float64(p.X), float64(x), Delta, append(messages, "X: ")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, float64(p.Y), float64(y), Delta, append(messages, "Y: ")...) {
-		ok = false
-	}
-
-	return ok
-}

polygon_test.go

@@ -134,26 +134,3 @@ func TestPolygon_Unmarshall(t *testing.T) {
 	assert.NoError(t, json.Unmarshal([]byte(`[{"x":0,"y":0},{"x":2.5,"y":0.5},{"x":2,"y":1}]`), &p2))
 	AssertPolygon(t, p2, nil)
 }
-
-func AssertPolygon[T Number](t *testing.T, p Polygon[T], vertices []Point[T], messages ...string) bool {
-	t.Helper()
-
-	return AssertVertices(t, p.Vertices, vertices, messages...)
-}
-
-func AssertVertices[T Number](t *testing.T, vertices []Point[T], points []Point[T], messages ...string) bool {
-	t.Helper()
-
-	if !assert.Equal(t, len(vertices), len(points), append(messages, "Length: ")...) {
-		return false
-	}
-
-	ok := true
-	for i := 0; i < len(vertices); i++ {
-		if !AssertPoint(t, vertices[i], points[i].X, points[i].Y, append(messages, fmt.Sprintf("#%d.", i))...) {
-			ok = false
-		}
-	}
-
-	return ok
-}

rectangle_test.go

@@ -235,18 +235,3 @@ func TestRectangle_Immutable(t *testing.T) {
 
 	AssertRect(t, r, 1, 2, 2, 3)
 }
-
-func AssertRect[T Number](t *testing.T, r Rectangle[T], cx, cy, w, h T, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !AssertPoint(t, r.Center, cx, cy, append(messages, "Center.")...) {
-		ok = false
-	}
-	if !AssertSize(t, r.Size, w, h, append(messages, "Size.")...) {
-		ok = false
-	}
-
-	return ok
-}

regular_polygon_test.go

@@ -14,18 +14,18 @@ var (
 
 func TestRegularPolygon_New(t *testing.T) {
 	rp := RegPol(Pt(0, 0), Sz(2, 2), 4, 0)
-	assertRegularPolygon(t, rp, 0, 0, 2, 2, 4, 0)
+	AssertRegularPolygon(t, rp, 0, 0, 2, 2, 4, 0)
 
 	triangle := Triangle(Pt(1, -1), Sz(3, 3), PointTop)
-	assertRegularPolygon(t, triangle, 1, -1, 3, 3, 3, RegularPolygonAngle(3, PointTop))
+	AssertRegularPolygon(t, triangle, 1, -1, 3, 3, 3, RegularPolygonAngle(3, PointTop))
 	//AssertVertices(t, triangle.Vertices(), []Point[float64]{{0, 0}})
 
 	square := Square(Pt(50.0, 50.0), Sz(100.0, 100.0), PointTop)
-	assertRegularPolygon(t, square, 50, 50, 100, 100, 4, RegularPolygonAngle(4, PointTop))
+	AssertRegularPolygon(t, square, 50, 50, 100, 100, 4, RegularPolygonAngle(4, PointTop))
 	//AssertVertices(t, square.Vertices(), []Point[float64]{{0, 0}})
 
 	hexagon := Hexagon(Pt(0, 0), Sz(10, 10), PointTop)
-	assertRegularPolygon(t, hexagon, 0, 0, 10, 10, 6, RegularPolygonAngle(6, PointTop))
+	AssertRegularPolygon(t, hexagon, 0, 0, 10, 10, 6, RegularPolygonAngle(6, PointTop))
 	//AssertVertices(t, hexagon.Vertices(), []Point[float64]{{0, 0}})
 }
 
@@ -41,20 +41,20 @@ func TestRegularPolygonAngle(t *testing.T) {
 }
 
 func TestRegularPolygon_Translate(t *testing.T) {
-	assertRegularPolygon(t, regPolygonInt.Translate(Vec(1, -2)), 2, 0, 2, 2, 4, 0)
+	AssertRegularPolygon(t, regPolygonInt.Translate(Vec(1, -2)), 2, 0, 2, 2, 4, 0)
 }
 
 func TestRegularPolygon_MoveTo(t *testing.T) {
-	assertRegularPolygon(t, regPolygonInt.MoveTo(Pt(-3, 5)), -3, 5, 2, 2, 4, 0)
+	AssertRegularPolygon(t, regPolygonInt.MoveTo(Pt(-3, 5)), -3, 5, 2, 2, 4, 0)
 }
 
 func TestRegularPolygon_Scale(t *testing.T) {
-	assertRegularPolygon(t, regPolygonInt.Scale(0.5), 1, 2, 1, 1, 4, 0)
-	assertRegularPolygon(t, regPolygonInt.ScaleXY(2, 3), 1, 2, 4, 6, 4, 0)
+	AssertRegularPolygon(t, regPolygonInt.Scale(0.5), 1, 2, 1, 1, 4, 0)
+	AssertRegularPolygon(t, regPolygonInt.ScaleXY(2, 3), 1, 2, 4, 6, 4, 0)
 }
 
 func TestRegularPolygon_Rotate(t *testing.T) {
-	assertRegularPolygon(t, regPolygonInt.Rotate(math.Pi), 1, 2, 2, 2, 4, math.Pi)
+	AssertRegularPolygon(t, regPolygonInt.Rotate(math.Pi), 1, 2, 2, 2, 4, math.Pi)
 }
 
 func TestRegularPolygon_Vertices(t *testing.T) {
@@ -110,11 +110,11 @@ func TestRegularPolygon_Empty(t *testing.T) {
 }
 
 func TestRegularPolygon_Int(t *testing.T) {
-	assertRegularPolygon(t, regPolygonInt.Int(), 1, 2, 2, 2, 4, 0.0)
+	AssertRegularPolygon(t, regPolygonInt.Int(), 1, 2, 2, 2, 4, 0.0)
 }
 
 func TestRegularPolygon_Float(t *testing.T) {
-	assertRegularPolygon(t, regPolygonInt.Float(), 1.0, 2.0, 2.0, 2.0, 4, 0.0)
+	AssertRegularPolygon(t, regPolygonInt.Float(), 1.0, 2.0, 2.0, 2.0, 4, 0.0)
 }
 
 func TestRegularPolygon_Immutable(t *testing.T) {
@@ -125,7 +125,7 @@ func TestRegularPolygon_Immutable(t *testing.T) {
 	rp.Scale(2)
 	rp.ScaleXY(2, 3)
 
-	assertRegularPolygon(t, rp, 0, 1, 2, 3, 4, 0)
+	AssertRegularPolygon(t, rp, 0, 1, 2, 3, 4, 0)
 }
 
 func TestRegularPolygon_String(t *testing.T) {
@@ -139,26 +139,5 @@ func TestRegularPolygon_Marshall(t *testing.T) {
 func TestRegularPolygon_Unmarshall(t *testing.T) {
 	var p1 RegularPolygon[int]
 	assert.NoError(t, json.Unmarshal([]byte(`{"x":1,"y":2,"w":2,"h":2,"n":4,"a":0}`), &p1))
-	assertRegularPolygon(t, p1, 1, 2, 2, 2, 4, 0)
-}
-
-func assertRegularPolygon[T Number](t *testing.T, p RegularPolygon[T], x, y, w, h T, n int, angle float64, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !AssertPoint(t, p.Center, x, y, append(messages, "Center.")...) {
-		ok = false
-	}
-	if !AssertSize(t, p.Size, w, h, append(messages, "Size.")...) {
-		ok = false
-	}
-	if !assert.Equal(t, p.N, n, append(messages, "N: ")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, p.Angle, angle, Delta, append(messages, "Angle: ")...) {
-		ok = false
-	}
-
-	return ok
+	AssertRegularPolygon(t, p1, 1, 2, 2, 2, 4, 0)
 }

size_test.go

@@ -120,18 +120,3 @@ func TestSize_Immutable(t *testing.T) {
 
 	AssertSize(t, s, 2, 3)
 }
-
-func AssertSize[T Number](t *testing.T, s Size[T], w, h T, messages ...string) bool {
-	t.Helper()
-
-	ok := true
-
-	if !assert.EqualDelta(t, float64(s.Width), float64(w), Delta, append(messages, "Width: ")...) {
-		ok = false
-	}
-	if !assert.EqualDelta(t, float64(s.Height), float64(h), Delta, append(messages, "Height: ")...) {
-		ok = false
-	}
-
-	return ok
-}