Skip to content

Commit 063239f

Browse files
authored
[chore]: enable len and empty rules from testifylint (#5832)
#### Description Testifylint is a linter that provides best practices with the use of testify. This PR enables [empty](https://github.com/Antonboom/testifylint?tab=readme-ov-file#empty) and [len](https://github.com/Antonboom/testifylint?tab=readme-ov-file#len) rules from [testifylint](https://github.com/Antonboom/testifylint) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent aef9e4f commit 063239f

33 files changed

Lines changed: 132 additions & 134 deletions

File tree

.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,11 @@ linters-settings:
306306
testifylint:
307307
enable-all: true
308308
disable:
309-
- empty
310309
- error-is-as
311310
- error-nil
312311
- expected-actual
313312
- float-compare
314313
- go-require
315-
- len
316314
- negative-positive
317315
- require-error
318316
- suite-extra-assert-call

baggage/baggage_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -815,25 +815,25 @@ func TestBaggageSetMember(t *testing.T) {
815815
assert.NoError(t, err)
816816
assert.NotContains(t, b0.list, key)
817817
assert.Equal(t, baggage.Item{}, b1.list[key])
818-
assert.Equal(t, 0, len(b0.list))
819-
assert.Equal(t, 1, len(b1.list))
818+
assert.Empty(t, b0.list)
819+
assert.Len(t, b1.list, 1)
820820

821821
m.value = "v"
822822
b2, err := b1.SetMember(m)
823823
assert.NoError(t, err)
824824
assert.Equal(t, baggage.Item{}, b1.list[key])
825825
assert.Equal(t, baggage.Item{Value: "v"}, b2.list[key])
826-
assert.Equal(t, 1, len(b1.list))
827-
assert.Equal(t, 1, len(b2.list))
826+
assert.Len(t, b1.list, 1)
827+
assert.Len(t, b2.list, 1)
828828

829829
p := properties{{key: "p"}}
830830
m.properties = p
831831
b3, err := b2.SetMember(m)
832832
assert.NoError(t, err)
833833
assert.Equal(t, baggage.Item{Value: "v"}, b2.list[key])
834834
assert.Equal(t, baggage.Item{Value: "v", Properties: []baggage.Property{{Key: "p"}}}, b3.list[key])
835-
assert.Equal(t, 1, len(b2.list))
836-
assert.Equal(t, 1, len(b3.list))
835+
assert.Len(t, b2.list, 1)
836+
assert.Len(t, b3.list, 1)
837837

838838
// The returned baggage needs to be immutable and should use a copy of the
839839
// properties slice.
@@ -849,8 +849,8 @@ func TestBaggageSetMember(t *testing.T) {
849849
assert.NotContains(t, b3.list, m.key)
850850
assert.Equal(t, baggage.Item{Value: "v", Properties: []baggage.Property{{Key: "p"}}}, b4.list[key])
851851
assert.Equal(t, baggage.Item{}, b4.list[m.key])
852-
assert.Equal(t, 1, len(b3.list))
853-
assert.Equal(t, 2, len(b4.list))
852+
assert.Len(t, b3.list, 1)
853+
assert.Len(t, b4.list, 2)
854854
}
855855

856856
func TestBaggageSetFalseMember(t *testing.T) {
@@ -862,16 +862,16 @@ func TestBaggageSetFalseMember(t *testing.T) {
862862
assert.Error(t, err)
863863
assert.NotContains(t, b0.list, key)
864864
assert.Equal(t, baggage.Item{}, b1.list[key])
865-
assert.Equal(t, 0, len(b0.list))
866-
assert.Equal(t, 0, len(b1.list))
865+
assert.Empty(t, b0.list)
866+
assert.Empty(t, b1.list)
867867

868868
m.value = "v"
869869
b2, err := b1.SetMember(m)
870870
assert.Error(t, err)
871871
assert.Equal(t, baggage.Item{}, b1.list[key])
872872
assert.Equal(t, baggage.Item{Value: ""}, b2.list[key])
873-
assert.Equal(t, 0, len(b1.list))
874-
assert.Equal(t, 0, len(b2.list))
873+
assert.Empty(t, b1.list)
874+
assert.Empty(t, b2.list)
875875
}
876876

877877
func TestBaggageSetFalseMembers(t *testing.T) {
@@ -883,25 +883,25 @@ func TestBaggageSetFalseMembers(t *testing.T) {
883883
assert.NoError(t, err)
884884
assert.NotContains(t, b0.list, key)
885885
assert.Equal(t, baggage.Item{}, b1.list[key])
886-
assert.Equal(t, 0, len(b0.list))
887-
assert.Equal(t, 1, len(b1.list))
886+
assert.Empty(t, b0.list)
887+
assert.Len(t, b1.list, 1)
888888

889889
m.value = "v"
890890
b2, err := b1.SetMember(m)
891891
assert.NoError(t, err)
892892
assert.Equal(t, baggage.Item{}, b1.list[key])
893893
assert.Equal(t, baggage.Item{Value: "v"}, b2.list[key])
894-
assert.Equal(t, 1, len(b1.list))
895-
assert.Equal(t, 1, len(b2.list))
894+
assert.Len(t, b1.list, 1)
895+
assert.Len(t, b2.list, 1)
896896

897897
p := properties{{key: "p"}}
898898
m.properties = p
899899
b3, err := b2.SetMember(m)
900900
assert.NoError(t, err)
901901
assert.Equal(t, baggage.Item{Value: "v"}, b2.list[key])
902902
assert.Equal(t, baggage.Item{Value: "v", Properties: []baggage.Property{{Key: "p"}}}, b3.list[key])
903-
assert.Equal(t, 1, len(b2.list))
904-
assert.Equal(t, 1, len(b3.list))
903+
assert.Len(t, b2.list, 1)
904+
assert.Len(t, b3.list, 1)
905905

906906
// The returned baggage needs to be immutable and should use a copy of the
907907
// properties slice.
@@ -917,8 +917,8 @@ func TestBaggageSetFalseMembers(t *testing.T) {
917917
assert.NotContains(t, b3.list, m.key)
918918
assert.Equal(t, baggage.Item{Value: "v", Properties: []baggage.Property{{Key: "p"}}}, b4.list[key])
919919
assert.Equal(t, baggage.Item{}, b4.list[m.key])
920-
assert.Equal(t, 1, len(b3.list))
921-
assert.Equal(t, 1, len(b4.list))
920+
assert.Len(t, b3.list, 1)
921+
assert.Len(t, b4.list, 1)
922922
}
923923

924924
func TestNilBaggageMembers(t *testing.T) {

exporters/otlp/otlplog/otlploggrpc/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ func TestClient(t *testing.T) {
556556
require.NoError(t, client.UploadLogs(ctx, resourceLogs))
557557
require.NoError(t, client.UploadLogs(ctx, resourceLogs))
558558

559-
require.Equal(t, 1, len(errs))
559+
require.Len(t, errs, 1)
560560
want := fmt.Sprintf("%s (%d log records rejected)", msg, n)
561561
assert.ErrorContains(t, errs[0], want)
562562
})

exporters/otlp/otlplog/otlploggrpc/exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func TestExporter(t *testing.T) {
228228
require.NoError(t, e.Export(ctx, records))
229229
require.NoError(t, e.Export(ctx, records))
230230

231-
require.Equal(t, 1, len(errs))
231+
require.Len(t, errs, 1)
232232
want := fmt.Sprintf("%s (%d log records rejected)", msg, n)
233233
assert.ErrorContains(t, errs[0], want)
234234
})

exporters/otlp/otlplog/otlploghttp/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ func TestClient(t *testing.T) {
558558
require.NoError(t, client.UploadLogs(ctx, resourceLogs))
559559
require.NoError(t, client.UploadLogs(ctx, resourceLogs))
560560

561-
require.Equal(t, 1, len(errs))
561+
require.Len(t, errs, 1)
562562
want := fmt.Sprintf("%s (%d log records rejected)", msg, n)
563563
assert.ErrorContains(t, errs[0], want)
564564
})
@@ -697,7 +697,7 @@ func TestConfig(t *testing.T) {
697697
t.Cleanup(func() { close(rCh) })
698698
t.Cleanup(func() { require.NoError(t, exp.Shutdown(ctx)) })
699699
assert.NoError(t, exp.Export(ctx, make([]log.Record, 1)), "failed retry")
700-
assert.Len(t, rCh, 0, "failed HTTP responses did not occur")
700+
assert.Empty(t, rCh, "failed HTTP responses did not occur")
701701
})
702702

703703
t.Run("WithRetryAndExporterErr", func(t *testing.T) {

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func TestConfigs(t *testing.T) {
324324
assert.NotNil(t, c.Metrics.GRPCCredentials)
325325
} else {
326326
// nolint:staticcheck // ignoring tlsCert.RootCAs.Subjects is deprecated ERR because cert does not come from SystemCertPool.
327-
assert.Equal(t, 1, len(c.Metrics.TLSCfg.RootCAs.Subjects()))
327+
assert.Len(t, c.Metrics.TLSCfg.RootCAs.Subjects(), 1)
328328
}
329329
},
330330
},

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/otest/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ func RunClientTests(f ClientFactory) func(*testing.T) {
208208
require.NoError(t, client.ForceFlush(ctx))
209209
rm := collector.Collect().Dump()
210210
// Data correctness is not important, just it was received.
211-
require.Greater(t, len(rm), 0, "no data uploaded")
211+
require.NotEmpty(t, rm, "no data uploaded")
212212

213213
require.NoError(t, client.Shutdown(ctx))
214214
rm = collector.Collect().Dump()
215-
assert.Len(t, rm, 0, "client did not flush all data")
215+
assert.Empty(t, rm, "client did not flush all data")
216216
})
217217

218218
t.Run("UploadMetrics", func(t *testing.T) {
@@ -269,7 +269,7 @@ func RunClientTests(f ClientFactory) func(*testing.T) {
269269
require.NoError(t, client.UploadMetrics(ctx, resourceMetrics))
270270
require.NoError(t, client.Shutdown(ctx))
271271

272-
require.Equal(t, 1, len(errs))
272+
require.Len(t, errs, 1)
273273
want := fmt.Sprintf("%s (%d metric data points rejected)", msg, n)
274274
assert.ErrorContains(t, errs[0], want)
275275
})

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform/error_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestMultiErr(t *testing.T) {
5757
// language so this doesn't become a change-indicator.
5858
msg := me.Error()
5959
lines := strings.Split(msg, "\n")
60-
assert.Equalf(t, 4, len(lines), "expected a 4 line error message, got:\n\n%s", msg)
60+
assert.Lenf(t, lines, 4, "expected a 4 line error message, got:\n\n%s", msg)
6161
assert.Contains(t, msg, name)
6262
assert.Contains(t, msg, e0.Error())
6363
assert.Contains(t, msg, testErr.Error())

exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func TestConfig(t *testing.T) {
189189
t.Cleanup(func() { close(rCh) })
190190
t.Cleanup(func() { require.NoError(t, exp.Shutdown(ctx)) })
191191
assert.NoError(t, exp.Export(ctx, &metricdata.ResourceMetrics{}), "failed retry")
192-
assert.Len(t, rCh, 0, "failed HTTP responses did not occur")
192+
assert.Empty(t, rCh, "failed HTTP responses did not occur")
193193
})
194194

195195
t.Run("WithRetryAndExporterErr", func(t *testing.T) {

exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func TestConfigs(t *testing.T) {
324324
assert.NotNil(t, c.Metrics.GRPCCredentials)
325325
} else {
326326
// nolint:staticcheck // ignoring tlsCert.RootCAs.Subjects is deprecated ERR because cert does not come from SystemCertPool.
327-
assert.Equal(t, 1, len(c.Metrics.TLSCfg.RootCAs.Subjects()))
327+
assert.Len(t, c.Metrics.TLSCfg.RootCAs.Subjects(), 1)
328328
}
329329
},
330330
},

0 commit comments

Comments
 (0)