d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-31 15:10:42 +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

4
backtester/data/data.go
View File

@@ -158,7 +158,7 @@ func (b *Base) SetStream(s []Event) error {
if s[x].GetExchange() != b.stream[0].GetExchange() ||
s[x].GetAssetType() != b.stream[0].GetAssetType() ||
!s[x].Pair().Equal(b.stream[0].Pair()) {
return fmt.Errorf("%w cannot set base stream from %v %v %v to %v %v %v", errMisMatchedEvent, s[x].GetExchange(), s[x].GetAssetType(), s[x].Pair(), b.stream[0].GetExchange(), b.stream[0].GetAssetType(), b.stream[0].Pair())
return fmt.Errorf("%w cannot set base stream from %v %v %v to %v %v %v", errMismatchedEvent, s[x].GetExchange(), s[x].GetAssetType(), s[x].Pair(), b.stream[0].GetExchange(), b.stream[0].GetAssetType(), b.stream[0].Pair())
}
}
// due to the Next() function, we cannot take
@@ -193,7 +193,7 @@ candles:
if s[x].GetExchange() != b.stream[0].GetExchange() ||
s[x].GetAssetType() != b.stream[0].GetAssetType() ||
!s[x].Pair().Equal(b.stream[0].Pair()) {
return fmt.Errorf("%w %v %v %v received %v %v %v", errMisMatchedEvent, b.stream[0].GetExchange(), b.stream[0].GetAssetType(), b.stream[0].Pair(), s[x].GetExchange(), s[x].GetAssetType(), s[x].Pair())
return fmt.Errorf("%w %v %v %v received %v %v %v", errMismatchedEvent, b.stream[0].GetExchange(), b.stream[0].GetAssetType(), b.stream[0].Pair(), s[x].GetExchange(), s[x].GetAssetType(), s[x].Pair())
}
// todo change b.stream to map
for y := len(b.stream) - 1; y >= 0; y-- {

61
backtester/data/data_test.go
View File

@@ -1,7 +1,6 @@
package data
import (
"errors"
"strings"
"testing"
"time"
@@ -75,18 +74,14 @@ func TestGetDataForCurrency(t *testing.T) {
assert.NoError(t, err)
_, err = d.GetDataForCurrency(nil)
if !errors.Is(err, common.ErrNilEvent) {
t.Errorf("received '%v' expected '%v'", err, common.ErrNilEvent)
}
assert.ErrorIs(t, err, common.ErrNilEvent)
_, err = d.GetDataForCurrency(&fakeEvent{Base: &event.Base{
Exchange: "lol",
AssetType: asset.USDTMarginedFutures,
CurrencyPair: currency.NewPair(currency.EMB, currency.DOGE),
}})
if !errors.Is(err, ErrHandlerNotFound) {
t.Errorf("received '%v' expected '%v'", err, ErrHandlerNotFound)
}
assert.ErrorIs(t, err, ErrHandlerNotFound)
_, err = d.GetDataForCurrency(&fakeEvent{Base: &event.Base{
Exchange: exch,
@@ -211,26 +206,18 @@ func TestSetStream(t *testing.T) {
},
}
err = b.SetStream([]Event{misMatchEvent})
if !errors.Is(err, ErrInvalidEventSupplied) {
t.Fatalf("received '%v' expected '%v'", err, ErrInvalidEventSupplied)
}
require.ErrorIs(t, err, ErrInvalidEventSupplied)
misMatchEvent.Time = time.Now()
err = b.SetStream([]Event{misMatchEvent})
if !errors.Is(err, errMisMatchedEvent) {
t.Fatalf("received '%v' expected '%v'", err, errMisMatchedEvent)
}
require.ErrorIs(t, err, errMismatchedEvent)
err = b.SetStream([]Event{nil})
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Fatalf("received '%v' expected '%v'", err, gctcommon.ErrNilPointer)
}
require.ErrorIs(t, err, gctcommon.ErrNilPointer)
b = nil
err = b.SetStream(nil)
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Errorf("received '%v' expected '%v'", err, gctcommon.ErrNilPointer)
}
assert.ErrorIs(t, err, gctcommon.ErrNilPointer)
}
func TestNext(t *testing.T) {
@@ -464,9 +451,7 @@ func TestIsLive(t *testing.T) {
b = nil
_, err = b.IsLive()
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Errorf("received '%v' expected '%v'", err, gctcommon.ErrNilPointer)
}
assert.ErrorIs(t, err, gctcommon.ErrNilPointer)
}
func TestSetLive(t *testing.T) {
@@ -488,9 +473,7 @@ func TestSetLive(t *testing.T) {
b = nil
err = b.SetLive(false)
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Errorf("received '%v' expected '%v'", err, gctcommon.ErrNilPointer)
}
assert.ErrorIs(t, err, gctcommon.ErrNilPointer)
}
func TestAppendStream(t *testing.T) {
@@ -500,9 +483,8 @@ func TestAppendStream(t *testing.T) {
Base: &event.Base{},
}
err := b.AppendStream(e)
if !errors.Is(err, ErrInvalidEventSupplied) {
t.Errorf("received '%v' expected '%v'", err, ErrInvalidEventSupplied)
}
assert.ErrorIs(t, err, ErrInvalidEventSupplied)
if len(b.stream) != 0 {
t.Errorf("received '%v' expected '%v'", len(b.stream), 0)
}
@@ -512,9 +494,7 @@ func TestAppendStream(t *testing.T) {
e.AssetType = asset.Spot
e.CurrencyPair = cp
err = b.AppendStream(e)
if !errors.Is(err, ErrInvalidEventSupplied) {
t.Fatalf("received '%v' expected '%v'", err, ErrInvalidEventSupplied)
}
require.ErrorIs(t, err, ErrInvalidEventSupplied)
e.Time = tt
err = b.AppendStream(e, e)
@@ -554,34 +534,29 @@ func TestAppendStream(t *testing.T) {
},
}
err = b.AppendStream(misMatchEvent)
if !errors.Is(err, errMisMatchedEvent) {
t.Fatalf("received '%v' expected '%v'", err, errMisMatchedEvent)
}
require.ErrorIs(t, err, errMismatchedEvent)
if len(b.stream) != 2 {
t.Errorf("received '%v' expected '%v'", len(b.stream), 2)
}
err = b.AppendStream(nil)
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Fatalf("received '%v' expected '%v'", err, gctcommon.ErrNilPointer)
}
require.ErrorIs(t, err, gctcommon.ErrNilPointer)
if len(b.stream) != 2 {
t.Errorf("received '%v' expected '%v'", len(b.stream), 2)
}
err = b.AppendStream()
if !errors.Is(err, errNothingToAdd) {
t.Fatalf("received '%v' expected '%v'", err, errNothingToAdd)
}
require.ErrorIs(t, err, errNothingToAdd)
if len(b.stream) != 2 {
t.Errorf("received '%v' expected '%v'", len(b.stream), 2)
}
b = nil
err = b.AppendStream()
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Errorf("received '%v' expected '%v'", err, gctcommon.ErrNilPointer)
}
assert.ErrorIs(t, err, gctcommon.ErrNilPointer)
}
func TestFirst(t *testing.T) {

2
backtester/data/data_types.go
View File

@@ -23,7 +23,7 @@ var (
ErrEndOfData = errors.New("no more data to retrieve")
errNothingToAdd = errors.New("cannot append empty event to stream")
errMisMatchedEvent = errors.New("cannot add event to stream, does not match")
errMismatchedEvent = errors.New("cannot add event to stream, does not match")
)
// HandlerHolder stores an event handler per exchange asset pair

9
backtester/data/kline/csv/csv_test.go
View File

@@ -1,7 +1,6 @@
package csv
import (
"errors"
"path/filepath"
"testing"
@@ -56,9 +55,7 @@ func TestLoadDataInvalid(t *testing.T) {
p,
a,
false)
if !errors.Is(err, common.ErrInvalidDataType) {
t.Errorf("received: %v, expected: %v", err, common.ErrInvalidDataType)
}
assert.ErrorIs(t, err, common.ErrInvalidDataType)
_, err = LoadData(
-1,
@@ -68,7 +65,5 @@ func TestLoadDataInvalid(t *testing.T) {
p,
a,
true)
if !errors.Is(err, errNoUSDData) {
t.Errorf("received: %v, expected: %v", err, errNoUSDData)
}
assert.ErrorIs(t, err, errNoUSDData)
}

9
backtester/data/kline/database/database_test.go
View File

@@ -1,7 +1,6 @@
package database
import (
"errors"
"fmt"
"os"
"path/filepath"
@@ -192,12 +191,8 @@ func TestLoadDataInvalid(t *testing.T) {
dStart := time.Date(2020, 1, 0, 0, 0, 0, 0, time.UTC)
dEnd := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
_, err := LoadData(dStart, dEnd, gctkline.FifteenMin.Duration(), exch, -1, p, a, false)
if !errors.Is(err, common.ErrInvalidDataType) {
t.Errorf("received: %v, expected: %v", err, common.ErrInvalidDataType)
}
assert.ErrorIs(t, err, common.ErrInvalidDataType)
_, err = LoadData(dStart, dEnd, gctkline.FifteenMin.Duration(), exch, -1, p, a, true)
if !errors.Is(err, errNoUSDData) {
t.Errorf("received: %v, expected: %v", err, errNoUSDData)
}
assert.ErrorIs(t, err, errNoUSDData)
}

14
backtester/data/kline/kline_test.go
View File

@@ -1,7 +1,6 @@
package kline
import (
"errors"
"testing"
"time"
@@ -31,9 +30,8 @@ func TestLoad(t *testing.T) {
Base: &data.Base{},
}
err := d.Load()
if !errors.Is(err, errNoCandleData) {
t.Errorf("received: %v, expected: %v", err, errNoCandleData)
}
assert.ErrorIs(t, err, errNoCandleData)
d.Item = &gctkline.Item{
Exchange: exch,
Pair: p,
@@ -155,9 +153,7 @@ func TestAppend(t *testing.T) {
},
}
err := d.AppendResults(&item)
if !errors.Is(err, gctkline.ErrItemNotEqual) {
t.Errorf("received: %v, expected: %v", err, gctkline.ErrItemNotEqual)
}
assert.ErrorIs(t, err, gctkline.ErrItemNotEqual)
item.Exchange = testExchange
item.Pair = p
@@ -170,9 +166,7 @@ func TestAppend(t *testing.T) {
assert.NoError(t, err)
err = d.AppendResults(nil)
if !errors.Is(err, gctcommon.ErrNilPointer) {
t.Errorf("received: %v, expected: %v", err, gctcommon.ErrNilPointer)
}
assert.ErrorIs(t, err, gctcommon.ErrNilPointer)
}
func TestStreamOpen(t *testing.T) {