Fix GoString() for tuples to include the package name

barweiss · barweiss · commit 778c499bec15 · 2021-12-28T21:12:02.000+02:00
diff --git a/scripts/gen/tuple_test.tpl b/scripts/gen/tuple_test.tpl
@@ -39,7 +39,7 @@ func TestT{{.Len}}_String(t *testing.T) {
 
 func TestT{{.Len}}_GoString(t *testing.T) {
 	tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
-	require.Equal(t, `T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}]{
+	require.Equal(t, `tuple.T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}]{
 		{{- range $i, $index := .Indexes -}}
 		{{- if gt $i 0}}, {{end -}}
 		V{{$index}}: {{$index | quote}}
diff --git a/tuple1_test.go b/tuple1_test.go
@@ -31,7 +31,7 @@ func TestT1_String(t *testing.T) {
 
 func TestT1_GoString(t *testing.T) {
 	tup := New1("1")
-	require.Equal(t, `T1[string]{V1: "1"}`, tup.GoString())
+	require.Equal(t, `tuple.T1[string]{V1: "1"}`, tup.GoString())
 }
 
 func TestT1_ToArray(t *testing.T) {
diff --git a/tuple2_test.go b/tuple2_test.go
@@ -33,7 +33,7 @@ func TestT2_String(t *testing.T) {
 
 func TestT2_GoString(t *testing.T) {
 	tup := New2("1", "2")
-	require.Equal(t, `T2[string, string]{V1: "1", V2: "2"}`, tup.GoString())
+	require.Equal(t, `tuple.T2[string, string]{V1: "1", V2: "2"}`, tup.GoString())
 }
 
 func TestT2_ToArray(t *testing.T) {
diff --git a/tuple3_test.go b/tuple3_test.go
@@ -35,7 +35,7 @@ func TestT3_String(t *testing.T) {
 
 func TestT3_GoString(t *testing.T) {
 	tup := New3("1", "2", "3")
-	require.Equal(t, `T3[string, string, string]{V1: "1", V2: "2", V3: "3"}`, tup.GoString())
+	require.Equal(t, `tuple.T3[string, string, string]{V1: "1", V2: "2", V3: "3"}`, tup.GoString())
 }
 
 func TestT3_ToArray(t *testing.T) {
diff --git a/tuple4_test.go b/tuple4_test.go
@@ -37,7 +37,7 @@ func TestT4_String(t *testing.T) {
 
 func TestT4_GoString(t *testing.T) {
 	tup := New4("1", "2", "3", "4")
-	require.Equal(t, `T4[string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4"}`, tup.GoString())
+	require.Equal(t, `tuple.T4[string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4"}`, tup.GoString())
 }
 
 func TestT4_ToArray(t *testing.T) {
diff --git a/tuple5_test.go b/tuple5_test.go
@@ -39,7 +39,7 @@ func TestT5_String(t *testing.T) {
 
 func TestT5_GoString(t *testing.T) {
 	tup := New5("1", "2", "3", "4", "5")
-	require.Equal(t, `T5[string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5"}`, tup.GoString())
+	require.Equal(t, `tuple.T5[string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5"}`, tup.GoString())
 }
 
 func TestT5_ToArray(t *testing.T) {
diff --git a/tuple6_test.go b/tuple6_test.go
@@ -41,7 +41,7 @@ func TestT6_String(t *testing.T) {
 
 func TestT6_GoString(t *testing.T) {
 	tup := New6("1", "2", "3", "4", "5", "6")
-	require.Equal(t, `T6[string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6"}`, tup.GoString())
+	require.Equal(t, `tuple.T6[string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6"}`, tup.GoString())
 }
 
 func TestT6_ToArray(t *testing.T) {
diff --git a/tuple7_test.go b/tuple7_test.go
@@ -43,7 +43,7 @@ func TestT7_String(t *testing.T) {
 
 func TestT7_GoString(t *testing.T) {
 	tup := New7("1", "2", "3", "4", "5", "6", "7")
-	require.Equal(t, `T7[string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7"}`, tup.GoString())
+	require.Equal(t, `tuple.T7[string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7"}`, tup.GoString())
 }
 
 func TestT7_ToArray(t *testing.T) {
diff --git a/tuple8_test.go b/tuple8_test.go
@@ -45,7 +45,7 @@ func TestT8_String(t *testing.T) {
 
 func TestT8_GoString(t *testing.T) {
 	tup := New8("1", "2", "3", "4", "5", "6", "7", "8")
-	require.Equal(t, `T8[string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8"}`, tup.GoString())
+	require.Equal(t, `tuple.T8[string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8"}`, tup.GoString())
 }
 
 func TestT8_ToArray(t *testing.T) {
diff --git a/tuple9_test.go b/tuple9_test.go
@@ -47,7 +47,7 @@ func TestT9_String(t *testing.T) {
 
 func TestT9_GoString(t *testing.T) {
 	tup := New9("1", "2", "3", "4", "5", "6", "7", "8", "9")
-	require.Equal(t, `T9[string, string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8", V9: "9"}`, tup.GoString())
+	require.Equal(t, `tuple.T9[string, string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8", V9: "9"}`, tup.GoString())
 }
 
 func TestT9_ToArray(t *testing.T) {
diff --git a/util.go b/util.go
@@ -35,7 +35,7 @@ func tupGoString(values []any) string {
 		fields[i] = fmt.Sprintf("V%d: %#v", i+1, val)
 	}
 
-	return fmt.Sprintf("T%d[%s]{%s}",
+	return fmt.Sprintf("tuple.T%d[%s]{%s}",
 		len(values),
 		strings.Join(types, ", "),
 		strings.Join(fields, ", "),

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func TestT1_String(t *testing.T) {`
`31`	`31`
`32`	`32`	`func TestT1_GoString(t *testing.T) {`
`33`	`33`	`tup := New1("1")`
`34`		- require.Equal(t, `T1[string]{V1: "1"}`, tup.GoString())
	`34`	+ require.Equal(t, `tuple.T1[string]{V1: "1"}`, tup.GoString())
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func TestT1_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func TestT2_String(t *testing.T) {`
`33`	`33`
`34`	`34`	`func TestT2_GoString(t *testing.T) {`
`35`	`35`	`tup := New2("1", "2")`
`36`		- require.Equal(t, `T2[string, string]{V1: "1", V2: "2"}`, tup.GoString())
	`36`	+ require.Equal(t, `tuple.T2[string, string]{V1: "1", V2: "2"}`, tup.GoString())
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func TestT2_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func TestT3_String(t *testing.T) {`
`35`	`35`
`36`	`36`	`func TestT3_GoString(t *testing.T) {`
`37`	`37`	`tup := New3("1", "2", "3")`
`38`		- require.Equal(t, `T3[string, string, string]{V1: "1", V2: "2", V3: "3"}`, tup.GoString())
	`38`	+ require.Equal(t, `tuple.T3[string, string, string]{V1: "1", V2: "2", V3: "3"}`, tup.GoString())
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func TestT3_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func TestT4_String(t *testing.T) {`
`37`	`37`
`38`	`38`	`func TestT4_GoString(t *testing.T) {`
`39`	`39`	`tup := New4("1", "2", "3", "4")`
`40`		- require.Equal(t, `T4[string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4"}`, tup.GoString())
	`40`	+ require.Equal(t, `tuple.T4[string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4"}`, tup.GoString())
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func TestT4_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func TestT5_String(t *testing.T) {`
`39`	`39`
`40`	`40`	`func TestT5_GoString(t *testing.T) {`
`41`	`41`	`tup := New5("1", "2", "3", "4", "5")`
`42`		- require.Equal(t, `T5[string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5"}`, tup.GoString())
	`42`	+ require.Equal(t, `tuple.T5[string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5"}`, tup.GoString())
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func TestT5_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func TestT6_String(t *testing.T) {`
`41`	`41`
`42`	`42`	`func TestT6_GoString(t *testing.T) {`
`43`	`43`	`tup := New6("1", "2", "3", "4", "5", "6")`
`44`		- require.Equal(t, `T6[string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6"}`, tup.GoString())
	`44`	+ require.Equal(t, `tuple.T6[string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6"}`, tup.GoString())
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func TestT6_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func TestT7_String(t *testing.T) {`
`43`	`43`
`44`	`44`	`func TestT7_GoString(t *testing.T) {`
`45`	`45`	`tup := New7("1", "2", "3", "4", "5", "6", "7")`
`46`		- require.Equal(t, `T7[string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7"}`, tup.GoString())
	`46`	+ require.Equal(t, `tuple.T7[string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7"}`, tup.GoString())
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func TestT7_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func TestT8_String(t *testing.T) {`
`45`	`45`
`46`	`46`	`func TestT8_GoString(t *testing.T) {`
`47`	`47`	`tup := New8("1", "2", "3", "4", "5", "6", "7", "8")`
`48`		- require.Equal(t, `T8[string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8"}`, tup.GoString())
	`48`	+ require.Equal(t, `tuple.T8[string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8"}`, tup.GoString())
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func TestT8_ToArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func TestT9_String(t *testing.T) {`
`47`	`47`
`48`	`48`	`func TestT9_GoString(t *testing.T) {`
`49`	`49`	`tup := New9("1", "2", "3", "4", "5", "6", "7", "8", "9")`
`50`		- require.Equal(t, `T9[string, string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8", V9: "9"}`, tup.GoString())
	`50`	+ require.Equal(t, `tuple.T9[string, string, string, string, string, string, string, string, string]{V1: "1", V2: "2", V3: "3", V4: "4", V5: "5", V6: "6", V7: "7", V8: "8", V9: "9"}`, tup.GoString())
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func TestT9_ToArray(t *testing.T) {`