Skip to content

Commit f5ae5e8

Browse files
barweissbarweiss
authored
Revert "Add tests directory for tuple tests (#5)" (#8)
This reverts commit c16834e. Reverting this because Go coverage tools expect the test files to be in the same package as the tested files, otherwise coverage detection will be off.
1 parent 69b6995 commit f5ae5e8

File tree

11 files changed

+191
-201
lines changed

11 files changed

+191
-201
lines changed

‎scripts/gen/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func main() {
7575
tpl: codeTpl,
7676
},
7777
{
78-
fullPath: path.Join(outputDir, "tests", fmt.Sprintf("tuple%d_test.go", tupleLength)),
78+
fullPath: path.Join(outputDir, fmt.Sprintf("tuple%d_test.go", tupleLength)),
7979
tpl: testTpl,
8080
},
8181
}

‎scripts/gen/tuple_test.tpl‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
1-
package tuple_test
1+
package tuple
22

33
import (
44
"testing"
55

66
"github.com/stretchr/testify/require"
7-
"github.com/barweiss/go-tuple"
87
)
98

109
{{/* These variables can be used when the context of dot changes. */}}
1110
{{$indexes := .Indexes}}
1211
{{$len := .Len}}
1312

1413
func TestT{{.Len}}_New(t *testing.T) {
15-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
16-
require.Equal(t, tuple.T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}]{
14+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
15+
require.Equal(t, T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}]{
1716
{{range .Indexes -}}
1817
V{{.}}: {{. | quote}},
1918
{{end}}
2019
}, tup)
2120
}
2221

2322
func TestT{{.Len}}_Len(t *testing.T) {
24-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
23+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
2524
require.Equal(t, {{.Len}}, tup.Len())
2625
}
2726

2827
func TestT{{.Len}}_Values(t *testing.T) {
29-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
28+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
3029
{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}v{{$index}}{{end}} := tup.Values()
3130
{{range .Indexes -}}
3231
require.Equal(t, {{. | quote}}, v{{.}})
3332
{{end -}}
3433
}
3534

3635
func TestT{{.Len}}_String(t *testing.T) {
37-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
36+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
3837
require.Equal(t, `[{{range $i, $index := .Indexes}}{{if gt $i 0}} {{end}}{{. | quote}}{{end}}]`, tup.String())
3938
}
4039

4140
func TestT{{.Len}}_GoString(t *testing.T) {
42-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
41+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
4342
require.Equal(t, `tuple.T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}]{
4443
{{- range $i, $index := .Indexes -}}
4544
{{- if gt $i 0}}, {{end -}}
@@ -49,14 +48,14 @@ func TestT{{.Len}}_GoString(t *testing.T) {
4948
}
5049

5150
func TestT{{.Len}}_ToArray(t *testing.T) {
52-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
51+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
5352
require.Equal(t, [{{.Len}}]any{
5453
{{range .Indexes -}}{{. | quote}},{{end}}
5554
}, tup.Array())
5655
}
5756

5857
func TestT{{.Len}}_ToSlice(t *testing.T) {
59-
tup := tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
58+
tup := New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}})
6059
require.Equal(t, []any{
6160
{{range .Indexes -}}{{. | quote}},{{end}}
6261
}, tup.Slice())
@@ -94,8 +93,8 @@ func TestT{{.Len}}_FromArrayX(t *testing.T) {
9493

9594
for _, tt := range tests {
9695
t.Run(tt.name, func(t *testing.T) {
97-
do := func () tuple.T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}] {
98-
return tuple.FromArray{{.Len}}X[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.array)
96+
do := func () T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}] {
97+
return FromArray{{.Len}}X[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.array)
9998
}
10099

101100
if tt.wantPanic {
@@ -105,7 +104,7 @@ func TestT{{.Len}}_FromArrayX(t *testing.T) {
105104
return
106105
}
107106

108-
require.Equal(t, tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), do())
107+
require.Equal(t, New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), do())
109108
})
110109
}
111110
}
@@ -142,14 +141,14 @@ func TestT{{.Len}}_FromArray(t *testing.T) {
142141

143142
for _, tt := range tests {
144143
t.Run(tt.name, func(t *testing.T) {
145-
tup, err := tuple.FromArray{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.array)
144+
tup, err := FromArray{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.array)
146145
if tt.wantErr {
147146
require.Error(t, err)
148147
return
149148
}
150149

151150
require.NoError(t, err)
152-
require.Equal(t, tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), tup)
151+
require.Equal(t, New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), tup)
153152
})
154153
}
155154
}
@@ -206,8 +205,8 @@ func TestT{{.Len}}_FromSliceX(t *testing.T) {
206205

207206
for _, tt := range tests {
208207
t.Run(tt.name, func(t *testing.T) {
209-
do := func () tuple.T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}] {
210-
return tuple.FromSlice{{.Len}}X[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.slice)
208+
do := func () T{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}] {
209+
return FromSlice{{.Len}}X[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.slice)
211210
}
212211

213212
if tt.wantPanic {
@@ -217,7 +216,7 @@ func TestT{{.Len}}_FromSliceX(t *testing.T) {
217216
return
218217
}
219218

220-
require.Equal(t, tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), do())
219+
require.Equal(t, New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), do())
221220
})
222221
}
223222
}
@@ -274,14 +273,14 @@ func TestT{{.Len}}_FromSlice(t *testing.T) {
274273

275274
for _, tt := range tests {
276275
t.Run(tt.name, func(t *testing.T) {
277-
tup, err := tuple.FromSlice{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.slice)
276+
tup, err := FromSlice{{.Len}}[{{range $i, $index := .Indexes}}{{if gt $i 0}}, {{end}}string{{end}}](tt.slice)
278277
if tt.wantErr {
279278
require.Error(t, err)
280279
return
281280
}
282281

283282
require.NoError(t, err)
284-
require.Equal(t, tuple.New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), tup)
283+
require.Equal(t, New{{len .Indexes}}({{range .Indexes}}{{. | quote}},{{end}}), tup)
285284
})
286285
}
287286
}

‎tests/tuple1_test.go‎ renamed to ‎tuple1_test.go‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,48 @@
1-
package tuple_test
1+
package tuple
22

33
import (
44
"testing"
55

6-
"github.com/barweiss/go-tuple"
76
"github.com/stretchr/testify/require"
87
)
98

109
func TestT1_New(t *testing.T) {
11-
tup := tuple.New1("1")
12-
require.Equal(t, tuple.T1[string]{
10+
tup := New1("1")
11+
require.Equal(t, T1[string]{
1312
V1: "1",
1413
}, tup)
1514
}
1615

1716
func TestT1_Len(t *testing.T) {
18-
tup := tuple.New1("1")
17+
tup := New1("1")
1918
require.Equal(t, 1, tup.Len())
2019
}
2120

2221
func TestT1_Values(t *testing.T) {
23-
tup := tuple.New1("1")
22+
tup := New1("1")
2423
v1 := tup.Values()
2524
require.Equal(t, "1", v1)
2625
}
2726

2827
func TestT1_String(t *testing.T) {
29-
tup := tuple.New1("1")
28+
tup := New1("1")
3029
require.Equal(t, `["1"]`, tup.String())
3130
}
3231

3332
func TestT1_GoString(t *testing.T) {
34-
tup := tuple.New1("1")
33+
tup := New1("1")
3534
require.Equal(t, `tuple.T1[string]{V1: "1"}`, tup.GoString())
3635
}
3736

3837
func TestT1_ToArray(t *testing.T) {
39-
tup := tuple.New1("1")
38+
tup := New1("1")
4039
require.Equal(t, [1]any{
4140
"1",
4241
}, tup.Array())
4342
}
4443

4544
func TestT1_ToSlice(t *testing.T) {
46-
tup := tuple.New1("1")
45+
tup := New1("1")
4746
require.Equal(t, []any{
4847
"1",
4948
}, tup.Slice())
@@ -72,8 +71,8 @@ func TestT1_FromArrayX(t *testing.T) {
7271

7372
for _, tt := range tests {
7473
t.Run(tt.name, func(t *testing.T) {
75-
do := func() tuple.T1[string] {
76-
return tuple.FromArray1X[string](tt.array)
74+
do := func() T1[string] {
75+
return FromArray1X[string](tt.array)
7776
}
7877

7978
if tt.wantPanic {
@@ -83,7 +82,7 @@ func TestT1_FromArrayX(t *testing.T) {
8382
return
8483
}
8584

86-
require.Equal(t, tuple.New1("1"), do())
85+
require.Equal(t, New1("1"), do())
8786
})
8887
}
8988
}
@@ -111,14 +110,14 @@ func TestT1_FromArray(t *testing.T) {
111110

112111
for _, tt := range tests {
113112
t.Run(tt.name, func(t *testing.T) {
114-
tup, err := tuple.FromArray1[string](tt.array)
113+
tup, err := FromArray1[string](tt.array)
115114
if tt.wantErr {
116115
require.Error(t, err)
117116
return
118117
}
119118

120119
require.NoError(t, err)
121-
require.Equal(t, tuple.New1("1"), tup)
120+
require.Equal(t, New1("1"), tup)
122121
})
123122
}
124123
}
@@ -164,8 +163,8 @@ func TestT1_FromSliceX(t *testing.T) {
164163

165164
for _, tt := range tests {
166165
t.Run(tt.name, func(t *testing.T) {
167-
do := func() tuple.T1[string] {
168-
return tuple.FromSlice1X[string](tt.slice)
166+
do := func() T1[string] {
167+
return FromSlice1X[string](tt.slice)
169168
}
170169

171170
if tt.wantPanic {
@@ -175,7 +174,7 @@ func TestT1_FromSliceX(t *testing.T) {
175174
return
176175
}
177176

178-
require.Equal(t, tuple.New1("1"), do())
177+
require.Equal(t, New1("1"), do())
179178
})
180179
}
181180
}
@@ -221,14 +220,14 @@ func TestT1_FromSlice(t *testing.T) {
221220

222221
for _, tt := range tests {
223222
t.Run(tt.name, func(t *testing.T) {
224-
tup, err := tuple.FromSlice1[string](tt.slice)
223+
tup, err := FromSlice1[string](tt.slice)
225224
if tt.wantErr {
226225
require.Error(t, err)
227226
return
228227
}
229228

230229
require.NoError(t, err)
231-
require.Equal(t, tuple.New1("1"), tup)
230+
require.Equal(t, New1("1"), tup)
232231
})
233232
}
234233
}

0 commit comments

Comments
 (0)