use assert.Error

Author: zhangchiqing

utils/merr/closer_test.go

@@ -36,29 +36,29 @@ func TestCloseAndMergeError(t *testing.T) {
 	// Test case 3: only close error
 	closer.closeError = errors.New("close error")
 	err = CloseAndMergeError(closer, nil)
-	require.NotNil(t, err)
+	require.Error(t, err)
 	require.Contains(t, err.Error(), "close error")
 
 	// Test case 4: both original error and close error
 	err = CloseAndMergeError(closer, errors.New("original error"))
-	require.NotNil(t, err)
+	require.Error(t, err)
 	require.Contains(t, err.Error(), "original error")
 	require.Contains(t, err.Error(), "close error")
 
 	// Test case 5: original error is storage.ErrNotFound
 	err = CloseAndMergeError(closer, fmt.Errorf("not found error: %w", storage.ErrNotFound))
-	require.NotNil(t, err)
+	require.Error(t, err)
 	require.ErrorIs(t, err, storage.ErrNotFound)
 
 	// Test case 6: close error is storage.ErrNotFound
 	closer.closeError = fmt.Errorf("not found error: %w", storage.ErrNotFound)
 	err = CloseAndMergeError(closer, nil)
-	require.NotNil(t, err)
+	require.Error(t, err)
 	require.True(t, errors.Is(err, storage.ErrNotFound))
 
 	// Test case 7: error check works with multierror
 	closer.closeError = fmt.Errorf("exception")
 	err = CloseAndMergeError(closer, fmt.Errorf("not found error: %w", storage.ErrNotFound))
-	require.NotNil(t, err)
+	require.Error(t, err)
 	require.True(t, errors.Is(err, storage.ErrNotFound))
 }