Skip to content

Commit f4ea9ee

Browse files
tstirrat15tstirrat15
authored
chore: fix some testifylint issues (#2768)
1 parent 70cd757 commit f4ea9ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+195
-198
lines changed

‎cmd/spicedb/integration/schemawatch_integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestSchemaWatch(t *testing.T) {
2424
"cockroachdb": true,
2525
"spanner": false,
2626
}
27-
require.Equal(t, len(engines), len(datastore.Engines))
27+
require.Len(t, datastore.Engines, len(engines))
2828

2929
for driverName, shouldRun := range engines {
3030
if !shouldRun {

‎cmd/spicedb/integration/serve_integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func TestGracefulShutdown(t *testing.T) {
156156
"cockroachdb": false,
157157
"spanner": false,
158158
}
159-
require.Equal(t, len(engines), len(datastore.Engines))
159+
require.Len(t, datastore.Engines, len(engines))
160160

161161
for driverName, awaitGC := range engines {
162162
t.Run(driverName, func(t *testing.T) {

‎cmd/spicedb/integration/servetesting_race_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"github.com/google/uuid"
1515
"github.com/ory/dockertest/v3"
16-
"github.com/stretchr/testify/assert"
1716
"github.com/stretchr/testify/require"
1817
"google.golang.org/grpc"
1918
"google.golang.org/grpc/credentials/insecure"
@@ -69,7 +68,7 @@ func TestCheckPermissionOnTesterNoFlakes(t *testing.T) {
6968
})
7069
conn.Close()
7170

72-
assert.NoError(t, err)
73-
assert.Equal(t, v1.CheckPermissionResponse_PERMISSIONSHIP_HAS_PERMISSION, result.Permissionship, "Error on attempt #%d", i)
71+
require.NoError(t, err)
72+
require.Equal(t, v1.CheckPermissionResponse_PERMISSIONSHIP_HAS_PERMISSION, result.Permissionship, "Error on attempt #%d", i)
7473
}
7574
}

‎internal/caveats/builder_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func TestMustCaveatExprForTestingWithContext(t *testing.T) {
228228

229229
contextMap := result.GetCaveat().Context.AsMap()
230230
require.Equal(t, "value1", contextMap["key1"])
231-
require.Equal(t, float64(42), contextMap["key2"]) //nolint:testifyrequire these are known/static values
231+
require.Equal(t, float64(42), contextMap["key2"]) //nolint:testifylint // these are known/static values
232232
}
233233

234234
func TestMustCaveatExprForTestingWithContextPanic(t *testing.T) {

‎internal/cursorediterator/basics_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func TestEmpty(t *testing.T) {
3131

3232
items, errs := collectAll(emptySeq)
3333

34-
require.Len(t, items, 0)
35-
require.Len(t, errs, 0)
34+
require.Empty(t, items)
35+
require.Empty(t, errs)
3636
})
3737
}
3838
}

‎internal/cursorediterator/blocks_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func TestCursoredWithIntegerHeader(t *testing.T) {
228228
result := CursoredWithIntegerHeader(ctx, Cursor{}, header, nextFunc)
229229
items := collectNoError(t, result)
230230

231-
require.Len(t, items, 0)
231+
require.Empty(t, items)
232232
})
233233

234234
t.Run("cursor index increments correctly", func(t *testing.T) {
@@ -730,7 +730,7 @@ func TestCursoredProducerMapperIterator(t *testing.T) {
730730
result := CursoredProducerMapperIterator(ctx, Cursor{}, concurrency, intFromString, intToString, emptyProducer, mapper)
731731
items := collectNoError(t, result)
732732

733-
require.Len(t, items, 0)
733+
require.Empty(t, items)
734734
})
735735

736736
t.Run("producer error handling", func(t *testing.T) {
@@ -835,7 +835,7 @@ func TestCursoredProducerMapperIterator(t *testing.T) {
835835

836836
require.Error(t, err)
837837
require.Contains(t, err.Error(), "conversion failed")
838-
require.Len(t, items, 0)
838+
require.Empty(t, items)
839839
})
840840

841841
t.Run("context cancellation during producer execution", func(t *testing.T) {

‎internal/cursorediterator/cursor_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func TestCursorCustomHeadValue(t *testing.T) {
9393
t.Run("string converter with empty Cursor", func(t *testing.T) {
9494
value, remaining, err := CursorCustomHeadValue(Cursor{}, stringConverter)
9595
require.NoError(t, err)
96-
require.Equal(t, "", value)
96+
require.Empty(t, value)
9797
require.Nil(t, remaining)
9898
})
9999

@@ -139,14 +139,14 @@ func TestCursorCustomHeadValue(t *testing.T) {
139139
c := Cursor{"3.14", "2.71"}
140140
value, remaining, err := CursorCustomHeadValue(c, floatConverter)
141141
require.NoError(t, err)
142-
require.Equal(t, 2.71, value)
142+
require.Equal(t, 2.71, value) //nolint:testifylint // these values aren't being operated on
143143
require.Equal(t, Cursor{"3.14"}, remaining)
144144
})
145145

146146
t.Run("float converter with empty Cursor", func(t *testing.T) {
147147
value, remaining, err := CursorCustomHeadValue(Cursor{}, floatConverter)
148148
require.NoError(t, err)
149-
require.Equal(t, 0.0, value)
149+
require.Equal(t, 0.0, value) //nolint:testifylint // these values aren't being operated on
150150
require.Nil(t, remaining)
151151
})
152152

@@ -157,15 +157,15 @@ func TestCursorCustomHeadValue(t *testing.T) {
157157
c := Cursor{"true", "false"}
158158
value, remaining, err := CursorCustomHeadValue(c, boolConverter)
159159
require.NoError(t, err)
160-
require.Equal(t, false, value)
160+
require.False(t, value)
161161
require.Equal(t, Cursor{"true"}, remaining)
162162
})
163163

164164
t.Run("bool converter failure", func(t *testing.T) {
165165
c := Cursor{"false", "maybe"}
166166
value, remaining, err := CursorCustomHeadValue(c, boolConverter)
167167
require.Error(t, err)
168-
require.Equal(t, false, value)
168+
require.False(t, value)
169169
require.Nil(t, remaining)
170170
})
171171
}
@@ -186,12 +186,11 @@ func TestCursorType(t *testing.T) {
186186

187187
// Test empty Cursor
188188
empty := Cursor{}
189-
require.Len(t, empty, 0)
189+
require.Empty(t, empty)
190190

191191
// Test nil Cursor
192192
var nilCursor Cursor
193-
require.Len(t, nilCursor, 0)
194-
require.True(t, len(nilCursor) == 0)
193+
require.Empty(t, nilCursor)
195194
})
196195
}
197196

‎internal/cursorediterator/primitives_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ func TestJoin(t *testing.T) {
2020

2121
items, errs := collectAll(result)
2222

23-
require.Len(t, items, 0)
24-
require.Len(t, errs, 0)
23+
require.Empty(t, items)
24+
require.Empty(t, errs)
2525
})
2626

2727
t.Run("single iterator", func(t *testing.T) {
@@ -180,7 +180,7 @@ func TestJoin(t *testing.T) {
180180

181181
items, lastError := collectUntilError(result)
182182

183-
require.Len(t, items, 0)
183+
require.Empty(t, items)
184184
require.Equal(t, testError, lastError)
185185
})
186186

@@ -245,7 +245,7 @@ func TestYieldsError(t *testing.T) {
245245
items, errs := collectAll(result)
246246

247247
require.Len(t, items, 1)
248-
require.Equal(t, "", items[0]) // Default value for string
248+
require.Empty(t, items[0]) // Default value for string
249249
require.Len(t, errs, 1)
250250
require.Equal(t, testError, errs[0])
251251
})
@@ -270,7 +270,7 @@ func TestYieldsError(t *testing.T) {
270270
result(func(item string, err error) bool {
271271
require.False(t, called, "yield should only be called once")
272272
called = true
273-
require.Equal(t, "", item)
273+
require.Empty(t, item)
274274
require.Equal(t, testError, err)
275275
return false
276276
})
@@ -366,7 +366,7 @@ func TestCountingIterator(t *testing.T) {
366366

367367
items := collectNoError(t, result)
368368

369-
require.Len(t, items, 0)
369+
require.Empty(t, items)
370370
require.Equal(t, 0, finalCount)
371371
})
372372

@@ -454,17 +454,17 @@ func TestUncursoredEmpty(t *testing.T) {
454454

455455
items, errs := collectAll(result)
456456

457-
require.Len(t, items, 0)
458-
require.Len(t, errs, 0)
457+
require.Empty(t, items)
458+
require.Empty(t, errs)
459459
})
460460

461461
t.Run("works with different types", func(t *testing.T) {
462462
result := UncursoredEmpty[int]()
463463

464464
items, errs := collectAll(result)
465465

466-
require.Len(t, items, 0)
467-
require.Len(t, errs, 0)
466+
require.Empty(t, items)
467+
require.Empty(t, errs)
468468
})
469469

470470
t.Run("consumer function never called", func(t *testing.T) {
@@ -766,7 +766,7 @@ func TestSpanned(t *testing.T) {
766766

767767
items := collectNoError(t, result)
768768

769-
require.Len(t, items, 0)
769+
require.Empty(t, items)
770770

771771
spans := spanRecorder.Ended()
772772
require.Len(t, spans, 1)

‎internal/datastore/common/changes_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ func TestAddMetadata(t *testing.T) {
407407
require.Len(t, results, 1)
408408
require.True(t, ch.IsEmpty())
409409

410-
require.Equal(t, 1, len(results[0].Metadatas))
410+
require.Len(t, results[0].Metadatas, 1)
411411
require.Equal(t, map[string]any{"foo": "bar"}, results[0].Metadatas[0].AsMap())
412412
}
413413

@@ -444,8 +444,8 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
444444

445445
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev2)
446446
require.NoError(t, err)
447-
require.Equal(t, 1, len(results))
448-
require.Equal(t, 1, len(results[0].Metadatas))
447+
require.Len(t, results, 1)
448+
require.Len(t, results[0].Metadatas, 1)
449449
require.Equal(t, metadata, results[0].Metadatas[0].AsMap())
450450
})
451451

@@ -467,8 +467,8 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
467467

468468
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev2)
469469
require.NoError(t, err)
470-
require.Equal(t, 1, len(results))
471-
require.Equal(t, 3, len(results[0].Metadatas))
470+
require.Len(t, results, 1)
471+
require.Len(t, results[0].Metadatas, 3)
472472

473473
resultMaps := make([]map[string]any, 3)
474474
for i, meta := range results[0].Metadatas {
@@ -507,8 +507,8 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
507507

508508
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev2)
509509
require.NoError(t, err)
510-
require.Equal(t, 1, len(results))
511-
require.Equal(t, 1, len(results[0].Metadatas))
510+
require.Len(t, results, 1)
511+
require.Len(t, results[0].Metadatas, 1)
512512
})
513513

514514
t.Run("metadata across different revisions", func(t *testing.T) {
@@ -528,12 +528,12 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
528528

529529
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev3)
530530
require.NoError(t, err)
531-
require.Equal(t, 2, len(results))
531+
require.Len(t, results, 2)
532532

533-
require.Equal(t, 1, len(results[0].Metadatas))
533+
require.Len(t, results[0].Metadatas, 1)
534534
require.Equal(t, metadata1, results[0].Metadatas[0].AsMap())
535535

536-
require.Equal(t, 1, len(results[1].Metadatas))
536+
require.Len(t, results[1].Metadatas, 1)
537537
require.Equal(t, metadata2, results[1].Metadatas[0].AsMap())
538538
})
539539

@@ -551,8 +551,8 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
551551

552552
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev2)
553553
require.NoError(t, err)
554-
require.Equal(t, 1, len(results))
555-
require.Equal(t, 2, len(results[0].Metadatas))
554+
require.Len(t, results, 1)
555+
require.Len(t, results[0].Metadatas, 2)
556556
})
557557

558558
t.Run("deduplication edge cases", func(t *testing.T) {
@@ -580,8 +580,8 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
580580

581581
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev2)
582582
require.NoError(t, err)
583-
require.Equal(t, 1, len(results))
584-
require.Equal(t, 4, len(results[0].Metadatas))
583+
require.Len(t, results, 1)
584+
require.Len(t, results[0].Metadatas, 4)
585585
})
586586

587587
t.Run("metadata ordering preservation", func(t *testing.T) {
@@ -605,8 +605,8 @@ func TestAddRevisionMetadataComprehensive(t *testing.T) {
605605

606606
results, err := ch.FilterAndRemoveRevisionChanges(revisions.TransactionIDKeyLessThanFunc, rev2)
607607
require.NoError(t, err)
608-
require.Equal(t, 1, len(results))
609-
require.Equal(t, 3, len(results[0].Metadatas))
608+
require.Len(t, results, 1)
609+
require.Len(t, results[0].Metadatas, 3)
610610

611611
require.Equal(t, metadata1, results[0].Metadatas[0].AsMap())
612612
require.Equal(t, metadata2, results[0].Metadatas[1].AsMap())

‎internal/datastore/common/chunkbytes_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func TestWriteChunkedBytes_InsertWithTombstones(t *testing.T) {
232232
// Should have 1 UPDATE (tombstone old) + 1 INSERT query
233233
require.Len(t, txn.capturedSQL, 2)
234234
require.Len(t, txn.updateQueries, 1)
235-
require.Len(t, txn.deleteQueries, 0)
235+
require.Empty(t, txn.deleteQueries)
236236

237237
// Check the UPDATE query (tombstone old chunks that are alive)
238238
updateSQL := txn.capturedSQL[0]
@@ -284,7 +284,7 @@ func TestWriteChunkedBytes_DeleteAndInsert(t *testing.T) {
284284
// Should have 1 DELETE + 1 INSERT query
285285
require.Len(t, txn.capturedSQL, 2)
286286
require.Len(t, txn.deleteQueries, 1)
287-
require.Len(t, txn.updateQueries, 0)
287+
require.Empty(t, txn.updateQueries)
288288

289289
// Check the DELETE query
290290
deleteSQL := txn.capturedSQL[0]
@@ -383,7 +383,7 @@ func TestWriteAndReadZeroByteChunk(t *testing.T) {
383383
data, err := chunker.ReadChunkedBytes(context.Background(), "test-key")
384384
require.NoError(t, err)
385385
require.NotNil(t, data)
386-
require.Len(t, data, 0)
386+
require.Empty(t, data)
387387
require.Equal(t, []byte{}, data)
388388
}
389389

0 commit comments

Comments
 (0)