d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-13 23:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

codebase: Replace !errors.Is(err, target) with testify (#1931)

Browse Source 
* tests: Replace !errors.Is(err, target) with testify equivalents

* codebase: Manual !errors.Is(err, target) replacements

* typo: Replace errMisMatchedEvent with errMismatchedEvent

* tests: Enhance error messages for better output

* tests: Refactor error assertions in various test cases to use require and improve clarity

* misc linter: Fix assert should wording

* tests: Simplify assertions in TestCreateSignals for clarity and conciseness

* tests: Enhance assertion message in TestCreateSignals
This commit is contained in:
Adrian Gallagher
2025-06-10 16:29:57 +10:00
committed by GitHub
parent 122ab2f849
commit 19b8957f3f
109 changed files with 2485 additions and 5670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
exchanges/request/client_test.go
View File

@@ -1,7 +1,6 @@
package request
import (
"errors"
"net/http"
"net/url"
"slices"
@@ -22,9 +21,7 @@ func (c *clientTracker) contains(check *http.Client) bool {
func TestCheckAndRegister(t *testing.T) {
t.Parallel()
err := tracker.checkAndRegister(nil)
if !errors.Is(err, errHTTPClientIsNil) {
t.Fatalf("received: '%v' but expected: '%v'", err, errHTTPClientIsNil)
}
require.ErrorIs(t, err, errHTTPClientIsNil)
newLovelyClient := new(http.Client)
err = tracker.checkAndRegister(newLovelyClient)
@@ -35,23 +32,17 @@ func TestCheckAndRegister(t *testing.T) {
}
err = tracker.checkAndRegister(newLovelyClient)
if !errors.Is(err, errCannotReuseHTTPClient) {
t.Fatalf("received: '%v' but expected: '%v'", err, errCannotReuseHTTPClient)
}
require.ErrorIs(t, err, errCannotReuseHTTPClient)
}
func TestDeRegister(t *testing.T) {
t.Parallel()
err := tracker.deRegister(nil)
if !errors.Is(err, errHTTPClientIsNil) {
t.Fatalf("received: '%v' but expected: '%v'", err, errHTTPClientIsNil)
}
require.ErrorIs(t, err, errHTTPClientIsNil)
newLovelyClient := new(http.Client)
err = tracker.deRegister(newLovelyClient)
if !errors.Is(err, errHTTPClientNotFound) {
t.Fatalf("received: '%v' but expected: '%v'", err, errHTTPClientNotFound)
}
require.ErrorIs(t, err, errHTTPClientNotFound)
err = tracker.checkAndRegister(newLovelyClient)
require.NoError(t, err)
@@ -70,9 +61,8 @@ func TestDeRegister(t *testing.T) {
func TestNewProtectedClient(t *testing.T) {
t.Parallel()
if _, err := newProtectedClient(nil); !errors.Is(err, errHTTPClientIsNil) {
t.Fatalf("received: '%v' but expected: '%v'", err, errHTTPClientIsNil)
}
_, err := newProtectedClient(nil)
require.ErrorIs(t, err, errHTTPClientIsNil)
newLovelyClient := new(http.Client)
protec, err := newProtectedClient(newLovelyClient)
@@ -86,17 +76,15 @@ func TestNewProtectedClient(t *testing.T) {
func TestClientSetProxy(t *testing.T) {
t.Parallel()
err := (&client{}).setProxy(nil)
if !errors.Is(err, errNoProxyURLSupplied) {
t.Fatalf("received: '%v' but expected: '%v'", err, errNoProxyURLSupplied)
}
require.ErrorIs(t, err, errNoProxyURLSupplied)
pp, err := url.Parse("lol.com")
if err != nil {
t.Fatal(err)
}
err = (&client{protected: new(http.Client)}).setProxy(pp)
if !errors.Is(err, errTransportNotSet) {
t.Fatalf("received: '%v' but expected: '%v'", err, errTransportNotSet)
}
require.ErrorIs(t, err, errTransportNotSet)
err = (&client{protected: common.NewHTTPClientWithTimeout(0)}).setProxy(pp)
require.NoError(t, err)
}
@@ -104,9 +92,8 @@ func TestClientSetProxy(t *testing.T) {
func TestClientSetHTTPClientTimeout(t *testing.T) {
t.Parallel()
err := (&client{protected: new(http.Client)}).setHTTPClientTimeout(time.Second)
if !errors.Is(err, errTransportNotSet) {
t.Fatalf("received: '%v' but expected: '%v'", err, errTransportNotSet)
}
require.ErrorIs(t, err, errTransportNotSet)
err = (&client{protected: common.NewHTTPClientWithTimeout(0)}).setHTTPClientTimeout(time.Second)
require.NoError(t, err)
}

41
exchanges/request/request_test.go
View File

@@ -390,9 +390,7 @@ func TestDoRequest_RetryNonRecoverable(t *testing.T) {
Path: testURL + "/always-retry",
}, nil
}, UnauthenticatedRequest)
if !errors.Is(err, errFailedToRetryRequest) {
t.Fatalf("received: %v but expected: %v", err, errFailedToRetryRequest)
}
require.ErrorIs(t, err, errFailedToRetryRequest)
}
func TestDoRequest_NotRetryable(t *testing.T) {
@@ -415,9 +413,7 @@ func TestDoRequest_NotRetryable(t *testing.T) {
Path: testURL + "/always-retry",
}, nil
}, UnauthenticatedRequest)
if !errors.Is(err, notRetryErr) {
t.Fatalf("received: %v but expected: %v", err, notRetryErr)
}
require.ErrorIs(t, err, notRetryErr)
}
func TestGetNonce(t *testing.T) {
@@ -457,9 +453,8 @@ func TestSetProxy(t *testing.T) {
t.Parallel()
var r *Requester
err := r.SetProxy(nil)
if !errors.Is(err, ErrRequestSystemIsNil) {
t.Fatalf("received: '%v', but expected: '%v'", err, ErrRequestSystemIsNil)
}
require.ErrorIs(t, err, ErrRequestSystemIsNil)
r, err = New("test", &http.Client{Transport: new(http.Transport)}, WithLimiter(globalshell))
if err != nil {
t.Fatal(err)
@@ -506,9 +501,7 @@ func TestBasicLimiter(t *testing.T) {
ctx, cancel := context.WithDeadline(ctx, tn.Add(time.Nanosecond))
defer cancel()
err = r.SendPayload(ctx, Unset, func() (*Item, error) { return &i, nil }, UnauthenticatedRequest)
if !errors.Is(err, context.DeadlineExceeded) {
t.Fatalf("received: %v but expected: %v", err, context.DeadlineExceeded)
}
require.ErrorIs(t, err, context.DeadlineExceeded)
}
func TestEnableDisableRateLimit(t *testing.T) {
@@ -554,26 +547,22 @@ func TestEnableDisableRateLimit(t *testing.T) {
func TestSetHTTPClient(t *testing.T) {
var r *Requester
err := r.SetHTTPClient(nil)
if !errors.Is(err, ErrRequestSystemIsNil) {
t.Fatalf("received: '%v', but expected: '%v'", err, ErrRequestSystemIsNil)
}
require.ErrorIs(t, err, ErrRequestSystemIsNil)
client := new(http.Client)
r = new(Requester)
err = r.SetHTTPClient(client)
require.NoError(t, err)
err = r.SetHTTPClient(client)
if !errors.Is(err, errCannotReuseHTTPClient) {
t.Fatalf("received: '%v', but expected: '%v'", err, errCannotReuseHTTPClient)
}
require.ErrorIs(t, err, errCannotReuseHTTPClient)
}
func TestSetHTTPClientTimeout(t *testing.T) {
var r *Requester
err := r.SetHTTPClientTimeout(0)
if !errors.Is(err, ErrRequestSystemIsNil) {
t.Fatalf("received: '%v', but expected: '%v'", err, ErrRequestSystemIsNil)
}
require.ErrorIs(t, err, ErrRequestSystemIsNil)
r = new(Requester)
err = r.SetHTTPClient(common.NewHTTPClientWithTimeout(2))
if err != nil {
@@ -586,9 +575,8 @@ func TestSetHTTPClientTimeout(t *testing.T) {
func TestSetHTTPClientUserAgent(t *testing.T) {
var r *Requester
err := r.SetHTTPClientUserAgent("")
if !errors.Is(err, ErrRequestSystemIsNil) {
t.Fatalf("received: '%v', but expected: '%v'", err, ErrRequestSystemIsNil)
}
require.ErrorIs(t, err, ErrRequestSystemIsNil)
r = new(Requester)
err = r.SetHTTPClientUserAgent("")
require.NoError(t, err)
@@ -597,9 +585,8 @@ func TestSetHTTPClientUserAgent(t *testing.T) {
func TestGetHTTPClientUserAgent(t *testing.T) {
var r *Requester
_, err := r.GetHTTPClientUserAgent()
if !errors.Is(err, ErrRequestSystemIsNil) {
t.Fatalf("received: '%v', but expected: '%v'", err, ErrRequestSystemIsNil)
}
require.ErrorIs(t, err, ErrRequestSystemIsNil)
r = new(Requester)
err = r.SetHTTPClientUserAgent("sillyness")
require.NoError(t, err)