Convert polygon to Codec

2022-01-18 12:04:17 -06:00
parent 11d96fb928
commit abd7e98f31
3 changed files with 223 additions and 219 deletions
@@ -4,86 +4,52 @@ import (
 	"testing"

 	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgtype/testutil"
 )

-func TestPolygonTranscode(t *testing.T) {
-	testutil.TestSuccessfulTranscode(t, "polygon", []interface{}{
-		&pgtype.Polygon{
-			P:     []pgtype.Vec2{{3.14, 1.678901234}, {7.1, 5.234}, {5.0, 3.234}},
-			Valid: true,
-		},
-		&pgtype.Polygon{
-			P:     []pgtype.Vec2{{3.14, -1.678}, {7.1, -5.234}, {23.1, 9.34}},
-			Valid: true,
-		},
-		&pgtype.Polygon{},
-	})
+func isExpectedEqPolygon(a interface{}) func(interface{}) bool {
+	return func(v interface{}) bool {
+		ap := a.(pgtype.Polygon)
+		vp := v.(pgtype.Polygon)
+
+		if !(ap.Valid == vp.Valid && len(ap.P) == len(vp.P)) {
+			return false
+		}
+
+		for i := range ap.P {
+			if ap.P[i] != vp.P[i] {
+				return false
+			}
+		}
+
+		return true
+	}
 }

-func TestPolygon_Set(t *testing.T) {
-	tests := []struct {
-		name    string
-		arg     interface{}
-		valid   bool
-		wantErr bool
-	}{
+func TestPolygonTranscode(t *testing.T) {
+	testPgxCodec(t, "polygon", []PgxTranscodeTestCase{
 		{
-			name:    "string",
-			arg:     "((3.14,1.678901234),(7.1,5.234),(5.0,3.234))",
-			valid:   true,
-			wantErr: false,
-		}, {
-			name:    "[]float64",
-			arg:     []float64{1, 2, 3.45, 6.78, 1.23, 4.567, 8.9, 1.0},
-			valid:   true,
-			wantErr: false,
-		}, {
-			name:    "[]Vec2",
-			arg:     []pgtype.Vec2{{1, 2}, {2.3, 4.5}, {6.78, 9.123}},
-			valid:   true,
-			wantErr: false,
-		}, {
-			name:    "null",
-			arg:     nil,
-			valid:   false,
-			wantErr: false,
-		}, {
-			name:    "invalid_string_1",
-			arg:     "((3.14,1.678901234),(7.1,5.234),(5.0,3.234x))",
-			valid:   false,
-			wantErr: true,
-		}, {
-			name:    "invalid_string_2",
-			arg:     "(3,4)",
-			valid:   false,
-			wantErr: true,
-		}, {
-			name:    "invalid_[]float64",
-			arg:     []float64{1, 2, 3.45, 6.78, 1.23, 4.567, 8.9},
-			valid:   false,
-			wantErr: true,
-		}, {
-			name:    "invalid_type",
-			arg:     []int{1, 2, 3, 6},
-			valid:   false,
-			wantErr: true,
-		}, {
-			name:    "empty_[]float64",
-			arg:     []float64{},
-			valid:   false,
-			wantErr: false,
+			pgtype.Polygon{
+				P:     []pgtype.Vec2{{3.14, 1.678901234}, {7.1, 5.234}, {5.0, 3.234}},
+				Valid: true,
+			},
+			new(pgtype.Polygon),
+			isExpectedEqPolygon(pgtype.Polygon{
+				P:     []pgtype.Vec2{{3.14, 1.678901234}, {7.1, 5.234}, {5.0, 3.234}},
+				Valid: true,
+			}),
 		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			dst := &pgtype.Polygon{}
-			if err := dst.Set(tt.arg); (err != nil) != tt.wantErr {
-				t.Errorf("Set() error = %v, wantErr %v", err, tt.wantErr)
-			}
-			if dst.Valid != tt.valid {
-				t.Errorf("Expected valid: %v; got: %v", tt.valid, dst.Valid)
-			}
-		})
-	}
+		{
+			pgtype.Polygon{
+				P:     []pgtype.Vec2{{3.14, -1.678}, {7.1, -5.234}, {23.1, 9.34}},
+				Valid: true,
+			},
+			new(pgtype.Polygon),
+			isExpectedEqPolygon(pgtype.Polygon{
+				P:     []pgtype.Vec2{{3.14, -1.678}, {7.1, -5.234}, {23.1, 9.34}},
+				Valid: true,
+			}),
+		},
+		{pgtype.Polygon{}, new(pgtype.Polygon), isExpectedEqPolygon(pgtype.Polygon{})},
+		{nil, new(pgtype.Polygon), isExpectedEqPolygon(pgtype.Polygon{})},
+	})
 }