Improve x/ tests with require (ava-labs#1454)

joshua-kim · Jun 15, 2023 · 689aec6 · 689aec6
1 parent 764c456
commit 689aec6
Show file tree

Hide file tree

Showing 12 changed files with 836 additions and 716 deletions.
diff --git a/api/health/health_test.go b/api/health/health_test.go
@@ -42,8 +42,7 @@ func awaitHealthy(t *testing.T, r Reporter, healthy bool) {
 }
 
 func awaitLiveness(t *testing.T, r Reporter, liveness bool) {
-	require := require.New(t)
-	require.Eventually(func() bool {
+	require.Eventually(t, func() bool {
 		_, ok := r.Liveness()
 		return ok == liveness
 	}, awaitTimeout, awaitFreq)

diff --git a/genesis/config_test.go b/genesis/config_test.go
@@ -60,8 +60,7 @@ func TestAllocationLess(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			require := require.New(t)
-			require.Equal(tt.expected, tt.alloc1.Less(tt.alloc2))
+			require.Equal(t, tt.expected, tt.alloc1.Less(tt.alloc2))
 		})
 	}
 }
diff --git a/utils/sampler/weighted_heap_test.go b/utils/sampler/weighted_heap_test.go
@@ -73,8 +73,7 @@ func TestWeightedHeapElementLess(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			require := require.New(t)
-			require.Equal(tt.expected, tt.elt1.Less(tt.elt2))
+			require.Equal(t, tt.expected, tt.elt1.Less(tt.elt2))
 		})
 	}
 }
diff --git a/vms/components/avax/utxo_id_test.go b/vms/components/avax/utxo_id_test.go
@@ -111,8 +111,7 @@ func TestUTXOIDLess(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			require := require.New(t)
-			require.Equal(tt.expected, tt.id1.Less(&tt.id2))
+			require.Equal(t, tt.expected, tt.id1.Less(&tt.id2))
 		})
 	}
 }

diff --git a/vms/secp256k1fx/keychain_test.go b/vms/secp256k1fx/keychain_test.go
@@ -27,8 +27,7 @@ var (
 )
 
 func TestNewKeychain(t *testing.T) {
-	require := require.New(t)
-	require.NotNil(NewKeychain())
+	require.NotNil(t, NewKeychain())
 }
 
 func TestKeychainGetUnknownAddr(t *testing.T) {