Skip to content
This repository was archived by the owner on Dec 30, 2025. It is now read-only.

Commit 609ac63

Browse files
rez1dent3rez1dent3
authored
Merge pull request #30 from gripmock/ranker-fix
ranker fix (empty default)
2 parents f3c3e39 + fe0f4e0 commit 609ac63

File tree

6 files changed

+130
-130
lines changed

6 files changed

+130
-130
lines changed

‎contains_test.go‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ func TestContains_Simple(t *testing.T) {
1818
}
1919

2020
func TestContains_Map_Left(t *testing.T) {
21-
a := map[string]interface{}{
21+
a := map[string]any{
2222
"a": "a",
2323
"b": "b",
24-
"c": map[string]interface{}{
24+
"c": map[string]any{
2525
"f": []string{"a", "b", "c"},
2626
"d": "d",
2727
"e": []int{1, 2, 3},
2828
},
2929
}
3030

31-
b := map[string]interface{}{
32-
"c": map[string]interface{}{
31+
b := map[string]any{
32+
"c": map[string]any{
3333
"d": "d",
3434
"e": []int{1, 2, 3},
3535
"f": []string{"a", "b", "c"},
@@ -50,18 +50,18 @@ func TestContains_Map_Left(t *testing.T) {
5050
}
5151

5252
func TestContains_Map_Right(t *testing.T) {
53-
a := map[string]interface{}{
53+
a := map[string]any{
5454
"a": "a",
5555
"b": "b",
56-
"c": map[string]interface{}{
56+
"c": map[string]any{
5757
"f": []string{"a", "b", "c"},
5858
"d": "d",
5959
"e": []int{1, 2, 3},
6060
},
6161
}
6262

63-
b := map[string]interface{}{
64-
"c": map[string]interface{}{
63+
b := map[string]any{
64+
"c": map[string]any{
6565
"d": "d",
6666
"e": []int{1, 2, 3},
6767
"f": []string{"a", "b", "c"},
@@ -87,10 +87,10 @@ func TestContains_Slices_Left(t *testing.T) {
8787
require.False(t, deeply.Contains([]int{1, 3, 2}, []int{1, 2, 3}))
8888
require.False(t, deeply.Contains([]int{1, 2}, []int{1, 2, 3}))
8989

90-
require.True(t, deeply.Contains([]interface{}{1, 2, 3}, []interface{}{1, 2, 3}))
90+
require.True(t, deeply.Contains([]any{1, 2, 3}, []any{1, 2, 3}))
9191

92-
require.False(t, deeply.Contains([]interface{}{1, 3, 2}, []interface{}{1, 2, 3}))
93-
require.False(t, deeply.Contains([]interface{}{1, 2}, []interface{}{1, 2, 3}))
92+
require.False(t, deeply.Contains([]any{1, 3, 2}, []any{1, 2, 3}))
93+
require.False(t, deeply.Contains([]any{1, 2}, []any{1, 2, 3}))
9494
}
9595

9696
func TestContains_Slices_Right(t *testing.T) {
@@ -99,33 +99,33 @@ func TestContains_Slices_Right(t *testing.T) {
9999
require.False(t, deeply.Contains([]int{1, 2, 3}, []int{1, 3, 2}))
100100
require.False(t, deeply.Contains([]int{1, 2, 3}, []int{1, 2}))
101101

102-
require.True(t, deeply.Contains([]interface{}{1, 2, 3}, []interface{}{1, 2, 3}))
102+
require.True(t, deeply.Contains([]any{1, 2, 3}, []any{1, 2, 3}))
103103

104-
require.False(t, deeply.Contains([]interface{}{1, 2, 3}, []interface{}{1, 3, 2}))
105-
require.False(t, deeply.Contains([]interface{}{1, 2, 3}, []interface{}{1, 2}))
104+
require.False(t, deeply.Contains([]any{1, 2, 3}, []any{1, 3, 2}))
105+
require.False(t, deeply.Contains([]any{1, 2, 3}, []any{1, 2}))
106106
}
107107

108108
func TestContains_MapStable(t *testing.T) {
109-
a := map[string][]interface{}{
109+
a := map[string][]any{
110110
"items": {
111-
map[string]interface{}{
111+
map[string]any{
112112
"high": json.Number("72057594037927936"),
113113
"low": json.Number("18446744073709551615"),
114114
},
115-
map[string]interface{}{
115+
map[string]any{
116116
"low": json.Number("2"),
117117
"high": json.Number("1"),
118118
},
119119
},
120120
}
121121

122-
b := map[string][]interface{}{
122+
b := map[string][]any{
123123
"items": {
124-
map[string]interface{}{
124+
map[string]any{
125125
"low": json.Number("18446744073709551615"),
126126
"high": json.Number("72057594037927936"),
127127
},
128-
map[string]interface{}{
128+
map[string]any{
129129
"high": json.Number("1"),
130130
"low": json.Number("2"),
131131
},
@@ -160,11 +160,11 @@ func TestContains_Slices_OrderIgnore(t *testing.T) {
160160

161161
require.True(t, deeply.ContainsIgnoreArrayOrder([]int{1, 2, 3}, []int{1, 2, 3}))
162162
require.True(t, deeply.ContainsIgnoreArrayOrder([]int{1, 2, 3}, []int{1, 3, 2}))
163-
require.True(t, deeply.ContainsIgnoreArrayOrder([]interface{}{1, 2, 3}, []interface{}{1, 2, 3}))
164-
require.True(t, deeply.ContainsIgnoreArrayOrder([]interface{}{1, 2, 3}, []interface{}{1, 3, 2}))
163+
require.True(t, deeply.ContainsIgnoreArrayOrder([]any{1, 2, 3}, []any{1, 2, 3}))
164+
require.True(t, deeply.ContainsIgnoreArrayOrder([]any{1, 2, 3}, []any{1, 3, 2}))
165165

166166
require.False(t, deeply.ContainsIgnoreArrayOrder([]int{1, 2, 3}, []int{1, 2}))
167-
require.False(t, deeply.ContainsIgnoreArrayOrder([]interface{}{1, 2, 3}, []interface{}{1, 2}))
167+
require.False(t, deeply.ContainsIgnoreArrayOrder([]any{1, 2, 3}, []any{1, 2}))
168168
}
169169

170170
func TestContains_Boundary(t *testing.T) {
@@ -174,35 +174,35 @@ func TestContains_Boundary(t *testing.T) {
174174

175175
require.True(t, deeply.Contains(nil, nil))
176176

177-
require.False(t, deeply.Contains(map[string]interface{}{
177+
require.False(t, deeply.Contains(map[string]any{
178178
"field1": "hello",
179-
}, map[string]interface{}{
179+
}, map[string]any{
180180
"field2": "hello field1",
181181
}))
182182

183-
require.True(t, deeply.Contains(map[string]interface{}{
183+
require.True(t, deeply.Contains(map[string]any{
184184
"name": "Afra Gokce",
185185
"age": 1,
186186
"girl": true,
187187
"null": nil,
188-
"greetings": map[string]interface{}{
188+
"greetings": map[string]any{
189189
"hola": "mundo",
190190
"merhaba": "dunya",
191191
},
192-
"cities": []interface{}{
192+
"cities": []any{
193193
"Istanbul",
194194
"Jakarta",
195195
},
196-
}, map[string]interface{}{
196+
}, map[string]any{
197197
"name": "Afra Gokce",
198198
"age": 1,
199199
"girl": true,
200200
"null": nil,
201-
"greetings": map[string]interface{}{
201+
"greetings": map[string]any{
202202
"hola": "mundo",
203203
"merhaba": "dunya",
204204
},
205-
"cities": []interface{}{
205+
"cities": []any{
206206
"Istanbul",
207207
"Jakarta",
208208
},

‎equals_test.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ func TestEquals_Simple(t *testing.T) {
1616
}
1717

1818
func TestEquals_Map_Left(t *testing.T) {
19-
a := map[string]interface{}{
19+
a := map[string]any{
2020
"a": "a",
2121
"b": "b",
22-
"c": map[string]interface{}{
22+
"c": map[string]any{
2323
"f": []string{"a", "b", "c"},
2424
"d": "d",
2525
"e": []int{1, 2, 3},
2626
},
2727
}
2828

29-
b := map[string]interface{}{
30-
"c": map[string]interface{}{
29+
b := map[string]any{
30+
"c": map[string]any{
3131
"d": "d",
3232
"e": []int{1, 2, 3},
3333
"f": []string{"a", "b", "c"},
@@ -48,18 +48,18 @@ func TestEquals_Map_Left(t *testing.T) {
4848
}
4949

5050
func TestEquals_Map_Right(t *testing.T) {
51-
a := map[string]interface{}{
51+
a := map[string]any{
5252
"a": "a",
5353
"b": "b",
54-
"c": map[string]interface{}{
54+
"c": map[string]any{
5555
"f": []string{"a", "b", "c"},
5656
"d": "d",
5757
"e": []int{1, 2, 3},
5858
},
5959
}
6060

61-
b := map[string]interface{}{
62-
"c": map[string]interface{}{
61+
b := map[string]any{
62+
"c": map[string]any{
6363
"d": "d",
6464
"e": []int{1, 2, 3},
6565
"f": []string{"a", "b", "c"},
@@ -85,10 +85,10 @@ func TestEquals_Slices_Left(t *testing.T) {
8585
require.False(t, deeply.Equals([]int{1, 3, 2}, []int{1, 2, 3}))
8686
require.False(t, deeply.Equals([]int{1, 2}, []int{1, 2, 3}))
8787

88-
require.True(t, deeply.Equals([]interface{}{1, 2, 3}, []interface{}{1, 2, 3}))
88+
require.True(t, deeply.Equals([]any{1, 2, 3}, []any{1, 2, 3}))
8989

90-
require.False(t, deeply.Equals([]interface{}{1, 3, 2}, []interface{}{1, 2, 3}))
91-
require.False(t, deeply.Equals([]interface{}{1, 2}, []interface{}{1, 2, 3}))
90+
require.False(t, deeply.Equals([]any{1, 3, 2}, []any{1, 2, 3}))
91+
require.False(t, deeply.Equals([]any{1, 2}, []any{1, 2, 3}))
9292
}
9393

9494
func TestEquals_Slices_Right(t *testing.T) {
@@ -97,10 +97,10 @@ func TestEquals_Slices_Right(t *testing.T) {
9797
require.False(t, deeply.Equals([]int{1, 2, 3}, []int{1, 3, 2}))
9898
require.False(t, deeply.Equals([]int{1, 2, 3}, []int{1, 2}))
9999

100-
require.True(t, deeply.Equals([]interface{}{1, 2, 3}, []interface{}{1, 2, 3}))
100+
require.True(t, deeply.Equals([]any{1, 2, 3}, []any{1, 2, 3}))
101101

102-
require.False(t, deeply.Equals([]interface{}{1, 2, 3}, []interface{}{1, 3, 2}))
103-
require.False(t, deeply.Equals([]interface{}{1, 2, 3}, []interface{}{1, 2}))
102+
require.False(t, deeply.Equals([]any{1, 2, 3}, []any{1, 3, 2}))
103+
require.False(t, deeply.Equals([]any{1, 2, 3}, []any{1, 2}))
104104
}
105105

106106
func TestEquals_Slices_OrderIgnore(t *testing.T) {
@@ -110,11 +110,11 @@ func TestEquals_Slices_OrderIgnore(t *testing.T) {
110110

111111
require.True(t, deeply.EqualsIgnoreArrayOrder([]int{1, 2, 3}, []int{1, 2, 3}))
112112
require.True(t, deeply.EqualsIgnoreArrayOrder([]int{1, 2, 3}, []int{1, 3, 2}))
113-
require.True(t, deeply.EqualsIgnoreArrayOrder([]interface{}{1, 2, 3}, []interface{}{1, 2, 3}))
114-
require.True(t, deeply.EqualsIgnoreArrayOrder([]interface{}{1, 2, 3}, []interface{}{1, 3, 2}))
113+
require.True(t, deeply.EqualsIgnoreArrayOrder([]any{1, 2, 3}, []any{1, 2, 3}))
114+
require.True(t, deeply.EqualsIgnoreArrayOrder([]any{1, 2, 3}, []any{1, 3, 2}))
115115

116116
require.False(t, deeply.EqualsIgnoreArrayOrder([]int{1, 2, 3}, []int{1, 2}))
117-
require.False(t, deeply.EqualsIgnoreArrayOrder([]interface{}{1, 2, 3}, []interface{}{1, 2}))
117+
require.False(t, deeply.EqualsIgnoreArrayOrder([]any{1, 2, 3}, []any{1, 2}))
118118
}
119119

120120
func TestEquals_Boundary(t *testing.T) {
@@ -124,29 +124,29 @@ func TestEquals_Boundary(t *testing.T) {
124124

125125
require.True(t, deeply.Equals(nil, nil))
126126

127-
require.True(t, deeply.Equals(map[string]interface{}{
127+
require.True(t, deeply.Equals(map[string]any{
128128
"name": "Afra Gokce",
129129
"age": 1,
130130
"girl": true,
131131
"null": nil,
132-
"greetings": map[string]interface{}{
132+
"greetings": map[string]any{
133133
"hola": "mundo",
134134
"merhaba": "dunya",
135135
},
136-
"cities": []interface{}{
136+
"cities": []any{
137137
"Istanbul",
138138
"Jakarta",
139139
},
140-
}, map[string]interface{}{
140+
}, map[string]any{
141141
"name": "Afra Gokce",
142142
"age": 1,
143143
"girl": true,
144144
"null": nil,
145-
"greetings": map[string]interface{}{
145+
"greetings": map[string]any{
146146
"hola": "mundo",
147147
"merhaba": "dunya",
148148
},
149-
"cities": []interface{}{
149+
"cities": []any{
150150
"Istanbul",
151151
"Jakarta",
152152
},

‎matches.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func mapDeepMatches(expect, actual any, compare cmp) bool {
111111
// If there is an error converting the expected or actual values to strings, or if
112112
// there is an error matching the regular expression with the string, the function
113113
// logs the error and returns false.
114-
func regexMatch(expect, actual interface{}) bool {
114+
func regexMatch(expect, actual any) bool {
115115
// If actual is a boolean, return false.
116116
if _, ok := actual.(bool); ok {
117117
return false

0 commit comments

Comments
 (0)