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

Commit 6bd7e67

Browse files
peczenyjpeczenyj
committed
run testifylint -fix ./...
1 parent 3189a41 commit 6bd7e67

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎csbufio/reader_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestReaderContextDone(t *testing.T) {
2222
n, err := rc.Read(p)
2323
require.ErrorIs(t, err, context.Canceled)
2424
require.Equal(t, 0, n)
25-
require.Len(t, p, 0)
25+
require.Empty(t, p)
2626

2727
err = rc.Close()
2828
require.ErrorIs(t, err, context.Canceled)

‎csbufio/writer_test.go‎

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

2727
b, err := io.ReadAll(pr)
2828
require.NoError(t, err, "error reading")
29-
require.Equal(t, 0, len(b), "")
29+
require.Empty(t, b, "")
3030

3131
err = wc.Close()
3232
require.ErrorIs(t, err, context.Canceled)

‎store_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestStore(t *testing.T) {
3636
}
3737

3838
store, err = cloudstorage.NewStore(localFsConf)
39-
require.Nil(t, err)
39+
require.NoError(t, err)
4040
require.NotNil(t, store)
4141
}
4242

@@ -60,10 +60,10 @@ func TestJwtConf(t *testing.T) {
6060
// t.Logf("b64 %q", v)
6161
conf := &cloudstorage.Config{}
6262
err := json.Unmarshal([]byte(configInput), conf)
63-
require.Nil(t, err)
63+
require.NoError(t, err)
6464
conf.JwtConf.PrivateKey = "------helo-------\naGVsbG8td29ybGQ=\n-----------------end--------"
6565
require.NotNil(t, conf.JwtConf)
66-
require.Nil(t, conf.JwtConf.Validate())
66+
require.NoError(t, conf.JwtConf.Validate())
6767
require.Equal(t, "aGVsbG8td29ybGQ=", conf.JwtConf.PrivateKey)
6868
require.Equal(t, "service_account", conf.JwtConf.Type)
6969

@@ -84,9 +84,9 @@ func TestJwtConf(t *testing.T) {
8484
}`
8585
conf = &cloudstorage.Config{}
8686
err = json.Unmarshal([]byte(configInput), conf)
87-
require.Nil(t, err)
87+
require.NoError(t, err)
8888
require.NotNil(t, conf.JwtConf)
89-
require.Nil(t, conf.JwtConf.Validate())
89+
require.NoError(t, conf.JwtConf.Validate())
9090
require.Equal(t, "aGVsbG8td29ybGQ=", conf.JwtConf.PrivateKey)
9191
require.Equal(t, "service_account", conf.JwtConf.Type)
9292
}

‎testutils/testutils.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func ensureContents(t *testing.T, store cloudstorage.Store, name, data, msg stri
325325
caller := caller(2)
326326

327327
obj, err := store.Get(context.Background(), name)
328-
require.Equalf(t, nil, err, msg, caller)
328+
require.NoErrorf(t, err, msg, caller)
329329
if err != nil {
330330
return
331331
}
@@ -335,13 +335,13 @@ func ensureContents(t *testing.T, store cloudstorage.Store, name, data, msg stri
335335
f, err := obj.Open(cloudstorage.ReadOnly)
336336
defer func() {
337337
err = obj.Close()
338-
require.Equalf(t, nil, err, msg, caller)
338+
require.NoErrorf(t, err, msg, caller)
339339
}()
340-
require.Equalf(t, nil, err, msg, caller)
340+
require.NoErrorf(t, err, msg, caller)
341341
require.Equalf(t, fmt.Sprintf("%p", f), fmt.Sprintf("%p", obj.File()), msg, caller)
342342

343343
bytes, err := io.ReadAll(f)
344-
require.Equalf(t, nil, err, msg, caller)
344+
require.NoErrorf(t, err, msg, caller)
345345
require.Equalf(t, data, string(bytes), msg, caller)
346346
}
347347

@@ -362,14 +362,14 @@ func Copy(t *testing.T, store cloudstorage.Store) {
362362
obj := createFile(t, store, "from/test.csv", testcsv)
363363

364364
dest, err := store.NewObject("to/testcopy.csv")
365-
require.Equalf(t, nil, err, caller)
365+
require.NoErrorf(t, err, caller)
366366

367367
err = cloudstorage.Copy(context.Background(), store, obj, dest)
368-
require.Equalf(t, nil, err, caller)
368+
require.NoErrorf(t, err, caller)
369369

370370
// After copy, old should exist
371371
obj2, err := store.Get(context.Background(), "from/test.csv")
372-
require.Equalf(t, nil, err, caller)
372+
require.NoErrorf(t, err, caller)
373373
require.Equalf(t, "from/test.csv", obj2.Name(), caller)
374374

375375
// And also to should exist
@@ -492,7 +492,7 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
492492
createObjects := func(names []string) {
493493
for _, n := range names {
494494
obj, err := store.NewObject(n)
495-
require.Equalf(t, nil, err, "failed trying to call new object on:%v of %v", n, names)
495+
require.NoErrorf(t, err, "failed trying to call new object on:%v of %v", n, names)
496496
if obj == nil {
497497
continue
498498
}
@@ -534,20 +534,20 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
534534
iter, _ := store.Objects(context.Background(), q)
535535
objs, err := cloudstorage.ObjectsAll(iter)
536536
require.NoError(t, err)
537-
require.Equal(t, 15, len(objs), "incorrect list len. wanted 15 got %d", len(objs))
537+
require.Len(t, objs, 15, "incorrect list len. wanted 15 got %d", len(objs))
538538
iter.Close()
539539

540540
iter, _ = store.Objects(context.Background(), q)
541541
objr, err := cloudstorage.ObjectResponseFromIter(iter)
542542
require.NoError(t, err)
543-
require.Equal(t, 15, len(objr.Objects), "incorrect list len. wanted 15 got %d", len(objr.Objects))
543+
require.Len(t, objr.Objects, 15, "incorrect list len. wanted 15 got %d", len(objr.Objects))
544544

545545
// Now we are going to re-run this test using store.List() instead of store.Objects()
546546
q = cloudstorage.NewQuery("list-test/")
547547
q.Sorted()
548548
objResp, err := store.List(context.Background(), q)
549549
require.NoError(t, err)
550-
require.Equal(t, 15, len(objResp.Objects), "incorrect list len. wanted 15 got %d", len(objResp.Objects))
550+
require.Len(t, objResp.Objects, 15, "incorrect list len. wanted 15 got %d", len(objResp.Objects))
551551

552552
// Now we are going to re-run this test using an Object Iterator
553553
// that uses store.List() instead of store.Objects()
@@ -567,14 +567,14 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
567567
require.Equal(t, names[i], o.Name(), "unexpected name.")
568568
i++
569569
}
570-
require.Equal(t, 15, len(objs), "incorrect list len. wanted 15 got %d", len(objs))
570+
require.Len(t, objs, 15, "incorrect list len. wanted 15 got %d", len(objs))
571571

572572
q = cloudstorage.NewQuery("list-test/b")
573573
q.Sorted()
574574
iter, _ = store.Objects(context.Background(), q)
575575
objs, err = cloudstorage.ObjectsAll(iter)
576576
require.NoError(t, err)
577-
require.Equal(t, 5, len(objs), "incorrect list len. wanted 5 got %d", len(objs))
577+
require.Len(t, objs, 5, "incorrect list len. wanted 5 got %d", len(objs))
578578

579579
for i, o := range objs {
580580
require.Equal(t, names[i+5], o.Name(), "unexpected name.")
@@ -595,12 +595,12 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
595595
i++
596596
}
597597

598-
require.Equal(t, 5, len(objs), "incorrect list len.")
598+
require.Len(t, objs, 5, "incorrect list len.")
599599

600600
q = cloudstorage.NewQueryForFolders("list-test/")
601601
folders, err = store.Folders(context.Background(), q)
602602
require.NoError(t, err)
603-
require.Equal(t, 3, len(folders), "incorrect list len. wanted 3 folders. %v", folders)
603+
require.Len(t, folders, 3, "incorrect list len. wanted 3 folders. %v", folders)
604604
sort.Strings(folders)
605605
require.Equal(t, []string{"list-test/a/", "list-test/b/", "list-test/c/"}, folders)
606606

@@ -621,20 +621,20 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
621621
q.PageSize = 500
622622
folders, err = store.Folders(context.Background(), q)
623623
require.NoError(t, err)
624-
require.Equal(t, 3, len(folders), "incorrect list len. wanted 3 folders. %v", folders)
624+
require.Len(t, folders, 3, "incorrect list len. wanted 3 folders. %v", folders)
625625
require.Equal(t, []string{"list-test/a/", "list-test/b/", "list-test/c/"}, folders)
626626

627627
q = cloudstorage.NewQueryForFolders("list-test/b/")
628628
folders, err = store.Folders(context.Background(), q)
629629
require.NoError(t, err)
630-
require.Equal(t, 2, len(folders), "incorrect list len. wanted 2 folders. %v", folders)
630+
require.Len(t, folders, 2, "incorrect list len. wanted 2 folders. %v", folders)
631631
require.Equal(t, []string{"list-test/b/b1/", "list-test/b/b2/"}, folders)
632632

633633
ctx, cancel := context.WithCancel(context.Background())
634634
cancel()
635635
folders, err = store.Folders(ctx, q)
636636
require.Error(t, err)
637-
require.Equal(t, 0, len(folders), "incorrect list len. wanted 0 folders. %v", folders)
637+
require.Empty(t, folders, "incorrect list len. wanted 0 folders. %v", folders)
638638

639639
// List objects from a missing folder
640640
q = cloudstorage.NewQuery("does-not-exist/")
@@ -769,12 +769,12 @@ func TestReadWriteCloser(t *testing.T, store cloudstorage.Store) {
769769
data := fmt.Sprintf("pad:%v:pid:%v:time:%v:index:%v:", padding, os.Getpid(), time.Now().Nanosecond(), i)
770770

771771
wc, err := store.NewWriter(fileName, nil)
772-
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
772+
require.NoErrorf(t, err, "at loop-cnt:%v", i)
773773
buf1 := bytes.NewBufferString(data)
774774
_, err = buf1.WriteTo(wc)
775-
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
775+
require.NoErrorf(t, err, "at loop-cnt:%v", i)
776776
err = wc.Close()
777-
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
777+
require.NoErrorf(t, err, "at loop-cnt:%v", i)
778778
time.Sleep(time.Millisecond * 100)
779779

780780
wc, err = store.NewWriterWithContext(context.Background(), fileName, nil, cloudstorage.Opts{IfNotExists: true})
@@ -791,18 +791,18 @@ func TestReadWriteCloser(t *testing.T, store cloudstorage.Store) {
791791
deleteIfExists(store, "prefix/test.csv")
792792

793793
rc, err := store.NewReader(fileName)
794-
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
794+
require.NoErrorf(t, err, "at loop-cnt:%v", i)
795795
if rc == nil {
796796
t.Fatalf("could not create reader")
797797
return
798798
}
799799
buf2 := bytes.Buffer{}
800800
_, err = buf2.ReadFrom(rc)
801-
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
801+
require.NoErrorf(t, err, "at loop-cnt:%v", i)
802802
require.Equalf(t, data, buf2.String(), "round trip data don't match: loop-cnt:%v", i) // extra data means we didn't truncate the file
803803

804804
// make sure we clean up and close
805-
require.Nil(t, rc.Close())
805+
require.NoError(t, rc.Close())
806806

807807
_, err = store.NewReader("bogus/notreal.csv")
808808
require.Equalf(t, cloudstorage.ErrObjectNotFound, err, "at loop-cnt:%v", i)
@@ -887,7 +887,7 @@ func MultipleRW(t *testing.T, store cloudstorage.Store, conf *cloudstorage.Confi
887887
require.Equal(t, fmt.Sprintf("%p", f2), fmt.Sprintf("%p", obj2.File()))
888888
bytes, err := io.ReadAll(f2)
889889
require.NoError(t, err)
890-
require.Nil(t, f2.Close())
890+
require.NoError(t, f2.Close())
891891

892892
require.Equal(t, data, string(bytes))
893893

0 commit comments

Comments
 (0)