go/cache: use assert/require

Signed-off-by: Andrew Mason <andrew@planetscale.com>

Author: Andrew Mason

go/cache/theine/singleflight_test.go

@@ -32,19 +32,19 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDo(t *testing.T) {
 	g := NewGroup[string, string]()
 	v, err, _ := g.Do("key", func() (string, error) {
 		return "bar", nil
 	})
-	if got, want := fmt.Sprintf("%v (%T)", v, v), "bar (string)"; got != want {
-		t.Errorf("Do = %v; want %v", got, want)
-	}
-	if err != nil {
-		t.Errorf("Do error = %v", err)
-	}
+
+	assert.Equal(t, "bar (string)", fmt.Sprintf("%v (%T)", v, v), "incorrect Do value")
+	assert.NoError(t, err, "got Do error")
 }
 
 func TestDoErr(t *testing.T) {
@@ -53,12 +53,9 @@ func TestDoErr(t *testing.T) {
 	v, err, _ := g.Do("key", func() (string, error) {
 		return "", someErr
 	})
-	if err != someErr {
-		t.Errorf("Do error = %v; want someErr %v", err, someErr)
-	}
-	if v != "" {
-		t.Errorf("unexpected non-nil value %#v", v)
-	}
+
+	assert.ErrorIs(t, err, someErr, "incorrect Do error")
+	assert.Empty(t, v, "unexpected non-empty value")
 }
 
 func TestDoDupSuppress(t *testing.T) {
@@ -88,23 +85,20 @@ func TestDoDupSuppress(t *testing.T) {
 			defer wg2.Done()
 			wg1.Done()
 			v, err, _ := g.Do("key", fn)
-			if err != nil {
-				t.Errorf("Do error: %v", err)
+			if !assert.NoError(t, err, "unexpected Do error") {
 				return
 			}
-			if s := v; s != "bar" {
-				t.Errorf("Do = %T %v; want %q", v, v, "bar")
-			}
+
+			assert.Equal(t, "bar", v, "unexpected Do value")
 		}()
 	}
 	wg1.Wait()
 	// At least one goroutine is in fn now and all of them have at
 	// least reached the line before the Do.
 	c <- "bar"
 	wg2.Wait()
-	if got := atomic.LoadInt32(&calls); got <= 0 || got >= n {
-		t.Errorf("number of calls = %d; want over 0 and less than %d", got, n)
-	}
+	got := atomic.LoadInt32(&calls)
+	assert.True(t, got > 0 && got < n, "number of calls not between 0 and %d", n)
 }
 
 // Test singleflight behaves correctly after Do panic.
@@ -137,11 +131,9 @@ func TestPanicDo(t *testing.T) {
 
 	select {
 	case <-done:
-		if panicCount != n {
-			t.Errorf("Expect %d panic, but got %d", n, panicCount)
-		}
+		assert.Equal(t, int32(n), panicCount, "unexpected number of panics")
 	case <-time.After(time.Second):
-		t.Fatalf("Do hangs")
+		require.Fail(t, "Do hangs")
 	}
 }
 
@@ -159,9 +151,7 @@ func TestGoexitDo(t *testing.T) {
 		go func() {
 			var err error
 			defer func() {
-				if err != nil {
-					t.Errorf("Error should be nil, but got: %v", err)
-				}
+				assert.NoError(t, err)
 				if atomic.AddInt32(&waited, -1) == 0 {
 					close(done)
 				}
@@ -173,7 +163,7 @@ func TestGoexitDo(t *testing.T) {
 	select {
 	case <-done:
 	case <-time.After(time.Second):
-		t.Fatalf("Do hangs")
+		require.Fail(t, "Do hangs")
 	}
 }
 
@@ -202,9 +192,8 @@ func randKeys(b *testing.B, count, length uint) []string {
 	key := make([]byte, length)
 
 	for i := range uint(count) {
-		if _, err := io.ReadFull(rand.Reader, key); err != nil {
-			b.Fatalf("Failed to generate random key %d of %d of length %d: %s", i+1, count, length, err)
-		}
+		_, err := io.ReadFull(rand.Reader, key)
+		require.NoError(b, err, "Failed to generate random key %d of %d length %d", i+1, count, length)
 		keys = append(keys, string(key))
 	}
 	return keys