diff --git a/charger/ocpp/connector_test.go b/charger/ocpp/connector_test.go index 835f3ad17..459c612ce 100644 --- a/charger/ocpp/connector_test.go +++ b/charger/ocpp/connector_test.go @@ -1,7 +1,6 @@ package ocpp import ( - "context" "testing" "time" @@ -27,7 +26,7 @@ func (suite *connTestSuite) SetupTest() { // setup instance Instance() suite.cp = NewChargePoint(util.NewLogger("foo"), "abc") - suite.conn, _ = NewConnector(context.TODO(), util.NewLogger("foo"), 1, suite.cp, "", Timeout) + suite.conn, _ = NewConnector(suite.T().Context(), util.NewLogger("foo"), 1, suite.cp, "", Timeout) suite.clock = clock.NewMock() suite.conn.clock = suite.clock diff --git a/charger/ocpp_test.go b/charger/ocpp_test.go index 9ed429bca..42a95703f 100644 --- a/charger/ocpp_test.go +++ b/charger/ocpp_test.go @@ -1,7 +1,6 @@ package charger import ( - "context" "errors" "testing" "time" @@ -113,7 +112,7 @@ func (suite *ocppTestSuite) TestConnect() { suite.Require().True(cp1.IsConnected()) // 1st charge point- local - c1, err := NewOCPP(context.TODO(), "test-1", 1, "", "", 0, false, false, false, true, ocppTestConnectTimeout) + c1, err := NewOCPP(suite.T().Context(), "test-1", 1, "", "", 0, false, false, false, true, ocppTestConnectTimeout) suite.Require().NoError(err) // status and meter values @@ -162,7 +161,7 @@ func (suite *ocppTestSuite) TestConnect() { suite.Require().True(cp2.IsConnected()) // 2nd charge point - local - c2, err := NewOCPP(context.TODO(), "test-2", 1, "", "", 0, false, false, false, true, ocppTestConnectTimeout) + c2, err := NewOCPP(suite.T().Context(), "test-2", 1, "", "", 0, false, false, false, true, ocppTestConnectTimeout) suite.Require().NoError(err) { @@ -204,7 +203,7 @@ func (suite *ocppTestSuite) TestAutoStart() { suite.Require().True(cp1.IsConnected()) // 1st charge point- local - c1, err := NewOCPP(context.TODO(), "test-3", 1, "", "", 0, false, false, false, false, ocppTestConnectTimeout) + c1, err := NewOCPP(suite.T().Context(), "test-3", 1, "", "", 0, false, false, false, false, ocppTestConnectTimeout) suite.Require().NoError(err) // status and meter values @@ -251,7 +250,7 @@ func (suite *ocppTestSuite) TestTimeout() { }) // 1st charge point- local - _, err := NewOCPP(context.TODO(), "test-4", 1, "", "", 0, false, false, false, false, ocppTestConnectTimeout) + _, err := NewOCPP(suite.T().Context(), "test-4", 1, "", "", 0, false, false, false, false, ocppTestConnectTimeout) suite.Require().NoError(err) } diff --git a/charger/semp_test.go b/charger/semp_test.go index cb261ba47..bb70764d3 100644 --- a/charger/semp_test.go +++ b/charger/semp_test.go @@ -1,7 +1,6 @@ package charger import ( - "context" "net/http" "net/http/httptest" "strings" @@ -357,10 +356,8 @@ func TestSEMPChargerDeviceNotFound(t *testing.T) { server := httptest.NewServer(handler) defer server.Close() - ctx := context.Background() - // NewSEMP now calls Enabled() which will fail if device is not found - _, err := NewSEMP(ctx, server.URL+"/semp", "F-12345678-ABCDEF123456-00", time.Second) + _, err := NewSEMP(t.Context(), server.URL+"/semp", "F-12345678-ABCDEF123456-00", time.Second) require.Error(t, err) assert.Contains(t, err.Error(), "device F-12345678-ABCDEF123456-00 not found") } @@ -471,9 +468,7 @@ func TestSEMPChargerChargedEnergy(t *testing.T) { server2 := httptest.NewServer(handler2) defer server2.Close() - ctx2 := context.Background() - - wb2, err := NewSEMP(ctx2, server2.URL+"/semp", "F-12345678-ABCDEF123456-00", time.Second) + wb2, err := NewSEMP(t.Context(), server2.URL+"/semp", "F-12345678-ABCDEF123456-00", time.Second) require.NoError(t, err) // ChargeRater interface should NOT be available when parameters are not supported diff --git a/charger/template_test.go b/charger/template_test.go index 2d21aaf62..3114d9a90 100644 --- a/charger/template_test.go +++ b/charger/template_test.go @@ -1,7 +1,6 @@ package charger import ( - "context" "testing" "github.com/evcc-io/evcc/api" @@ -35,12 +34,13 @@ var acceptable = []string{ "timeout", // ocpp "must have uri and password", // Wattpilot "either identity or uuid are required", // Plugchoice + "unsupported platform", // OpenWB Native } func TestTemplates(t *testing.T) { templates.TestClass(t, templates.Charger, func(t *testing.T, values map[string]any) { t.Helper() - if _, err := NewFromConfig(context.TODO(), "template", values); err != nil && !test.Acceptable(err, acceptable) { + if _, err := NewFromConfig(t.Context(), "template", values); err != nil && !test.Acceptable(err, acceptable) { t.Log(values) t.Error(err) } diff --git a/meter/eebus_test.go b/meter/eebus_test.go index 59bab44b2..11972e8fc 100644 --- a/meter/eebus_test.go +++ b/meter/eebus_test.go @@ -1,7 +1,6 @@ package meter import ( - "context" "testing" "github.com/evcc-io/evcc/util/test" @@ -20,7 +19,7 @@ func TestEEBus(t *testing.T) { "timeout": "10s", } - if _, err := NewFromConfig(context.TODO(), "eebus", values); err != nil && !test.Acceptable(err, acceptable) { + if _, err := NewFromConfig(t.Context(), "eebus", values); err != nil && !test.Acceptable(err, acceptable) { t.Error(err) } @@ -31,7 +30,7 @@ func TestEEBus(t *testing.T) { "timeout": "10s", } - if _, err := NewFromConfig(context.TODO(), "eebus", valuesNoUsage); err != nil && !test.Acceptable(err, acceptable) { + if _, err := NewFromConfig(t.Context(), "eebus", valuesNoUsage); err != nil && !test.Acceptable(err, acceptable) { t.Error(err) } } diff --git a/meter/meter_test.go b/meter/meter_test.go index 9316d3c85..b40e25b51 100644 --- a/meter/meter_test.go +++ b/meter/meter_test.go @@ -1,7 +1,6 @@ package meter import ( - "context" "testing" "github.com/evcc-io/evcc/api" @@ -10,7 +9,7 @@ import ( ) func TestACPower(t *testing.T) { - m, err := NewConfigurableFromConfig(context.TODO(), map[string]any{ + m, err := NewConfigurableFromConfig(t.Context(), map[string]any{ "capacity": 23, "soc": map[string]any{ "source": "const", diff --git a/meter/template_test.go b/meter/template_test.go index f1f08be38..34b6db94b 100644 --- a/meter/template_test.go +++ b/meter/template_test.go @@ -1,7 +1,6 @@ package meter import ( - "context" "testing" "github.com/evcc-io/evcc/api" @@ -42,7 +41,7 @@ func TestTemplates(t *testing.T) { templates.TestClass(t, templates.Meter, func(t *testing.T, values map[string]any) { t.Helper() - if _, err := NewFromConfig(context.TODO(), "template", values); err != nil && !test.Acceptable(err, acceptable) { + if _, err := NewFromConfig(t.Context(), "template", values); err != nil && !test.Acceptable(err, acceptable) { t.Log(values) t.Error(err) } diff --git a/plugin/auth/oauth_test.go b/plugin/auth/oauth_test.go index 469f4bc34..401ea9e1a 100644 --- a/plugin/auth/oauth_test.go +++ b/plugin/auth/oauth_test.go @@ -1,7 +1,6 @@ package auth import ( - "context" "testing" "github.com/stretchr/testify/require" @@ -15,7 +14,7 @@ func TestOAuth(t *testing.T) { return t } - ts, err := NewOAuth(context.TODO(), "foo", "bar", &oauth2.Config{ + ts, err := NewOAuth(t.Context(), "foo", "bar", &oauth2.Config{ ClientID: "baz", }, WithTokenStorerOption(storer)) require.NoError(t, err) diff --git a/plugin/config_test.go b/plugin/config_test.go index dbbd686a7..96da08032 100644 --- a/plugin/config_test.go +++ b/plugin/config_test.go @@ -1,7 +1,6 @@ package plugin import ( - "context" "testing" "github.com/stretchr/testify/assert" @@ -10,10 +9,10 @@ import ( func TestRequiredConfig(t *testing.T) { var c Config - _, err := c.BoolGetter(context.TODO()) + _, err := c.BoolGetter(t.Context()) assert.Error(t, err) - _, err = c.IntSetter(context.TODO(), "foo") + _, err = c.IntSetter(t.Context(), "foo") assert.Error(t, err) c = Config{ @@ -21,28 +20,28 @@ func TestRequiredConfig(t *testing.T) { Other: map[string]any{"uri": "http://localhost"}, } - g, err := c.BoolGetter(context.TODO()) + g, err := c.BoolGetter(t.Context()) assert.NoError(t, err) assert.NotNil(t, g) - s, err := c.IntSetter(context.TODO(), "foo") + s, err := c.IntSetter(t.Context(), "foo") assert.NoError(t, err) assert.NotNil(t, s) c = Config{Source: "foo"} - _, err = c.BoolGetter(context.TODO()) + _, err = c.BoolGetter(t.Context()) assert.Error(t, err) } func TestOptionalConfig(t *testing.T) { var c *Config - g, err := c.BoolGetter(context.TODO()) + g, err := c.BoolGetter(t.Context()) assert.NoError(t, err) assert.Nil(t, g) - s, err := c.IntSetter(context.TODO(), "foo") + s, err := c.IntSetter(t.Context(), "foo") assert.NoError(t, err) assert.Nil(t, s) } diff --git a/plugin/const_test.go b/plugin/const_test.go index b0b1fff4a..e47c5c516 100644 --- a/plugin/const_test.go +++ b/plugin/const_test.go @@ -1,14 +1,13 @@ package plugin import ( - "context" "testing" "github.com/stretchr/testify/assert" ) func TestConst(t *testing.T) { - p, err := NewConstFromConfig(context.TODO(), map[string]any{"value": nil}) + p, err := NewConstFromConfig(t.Context(), map[string]any{"value": nil}) assert.NoError(t, err) { diff --git a/plugin/socket_test.go b/plugin/socket_test.go index 6375485e2..06d3b69b7 100644 --- a/plugin/socket_test.go +++ b/plugin/socket_test.go @@ -13,7 +13,7 @@ import ( ) func TestSockePlugin(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) + ctx, cancel := context.WithTimeout(t.Context(), time.Second*10) defer cancel() srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/server/modbus/proxy_test.go b/server/modbus/proxy_test.go index 313b75f1d..b1427c6e6 100644 --- a/server/modbus/proxy_test.go +++ b/server/modbus/proxy_test.go @@ -1,7 +1,6 @@ package modbus import ( - "context" "encoding/binary" "math/rand" "net" @@ -33,7 +32,7 @@ func TestConcurrentRead(t *testing.T) { for id := 1; id <= 10; id++ { wg.Go(func() { // client - conn, err := modbus.NewConnection(context.TODO(), l.Addr().String(), "", "", 0, modbus.Tcp, uint8(id)) + conn, err := modbus.NewConnection(t.Context(), l.Addr().String(), "", "", 0, modbus.Tcp, uint8(id)) require.NoError(t, err) for range 50 { @@ -75,7 +74,7 @@ func TestReadCoils(t *testing.T) { require.NoError(t, err) defer pl.Close() - downstreamConn, err := modbus.NewConnection(context.TODO(), l.Addr().String(), "", "", 0, modbus.Tcp, 1) + downstreamConn, err := modbus.NewConnection(t.Context(), l.Addr().String(), "", "", 0, modbus.Tcp, 1) require.NoError(t, err) proxy, _ := mbserver.New(&handler{ @@ -87,7 +86,7 @@ func TestReadCoils(t *testing.T) { // test client { - conn, err := modbus.NewConnection(context.TODO(), pl.Addr().String(), "", "", 0, modbus.Tcp, 1) + conn, err := modbus.NewConnection(t.Context(), pl.Addr().String(), "", "", 0, modbus.Tcp, 1) require.NoError(t, err) { // read diff --git a/tariff/template_test.go b/tariff/template_test.go index 189fcc6df..de0ff6d2e 100644 --- a/tariff/template_test.go +++ b/tariff/template_test.go @@ -1,7 +1,6 @@ package tariff import ( - "context" "testing" "github.com/evcc-io/evcc/api" @@ -23,7 +22,7 @@ func TestTemplates(t *testing.T) { templates.TestClass(t, templates.Tariff, func(t *testing.T, values map[string]any) { t.Helper() - if _, err := NewFromConfig(context.TODO(), "template", values); err != nil && !test.Acceptable(err, acceptable) { + if _, err := NewFromConfig(t.Context(), "template", values); err != nil && !test.Acceptable(err, acceptable) { t.Log(values) t.Error(err) } diff --git a/vehicle/template_test.go b/vehicle/template_test.go index 03c485ed4..1364ecfb8 100644 --- a/vehicle/template_test.go +++ b/vehicle/template_test.go @@ -1,7 +1,6 @@ package vehicle import ( - "context" "testing" "github.com/evcc-io/evcc/api" @@ -33,7 +32,7 @@ func TestTemplates(t *testing.T) { templates.TestClass(t, templates.Vehicle, func(t *testing.T, values map[string]any) { t.Helper() - if _, err := NewFromConfig(context.TODO(), "template", values); err != nil && !test.Acceptable(err, acceptable) { + if _, err := NewFromConfig(t.Context(), "template", values); err != nil && !test.Acceptable(err, acceptable) { t.Log(values) t.Error(err) } diff --git a/vehicle/tesla/api_test.go b/vehicle/tesla/api_test.go index f67746925..93924019e 100644 --- a/vehicle/tesla/api_test.go +++ b/vehicle/tesla/api_test.go @@ -1,7 +1,6 @@ package tesla import ( - "context" "fmt" "net/http" "net/http/httptest" @@ -33,7 +32,7 @@ func TestCommandResponse(t *testing.T) { defer srv.Close() ts := oauth2.StaticTokenSource(new(oauth2.Token)) - client, err := tesla.NewClient(context.Background(), tesla.WithTokenSource(ts)) + client, err := tesla.NewClient(t.Context(), tesla.WithTokenSource(ts)) require.NoError(t, err) client.SetBaseUrl(srv.URL)