wip

charger/ocpp_test.go

@@ -2,8 +2,6 @@ package charger
 
 import (
 	"errors"
-	"fmt"
-	"sync/atomic"
 	"testing"
 	"time"
 
@@ -29,54 +27,26 @@ const (
 	ocppTestConnectTimeout = 10 * time.Second
 )
 
-type ocppLogger struct {
-	suite *ocppTestSuite
-}
-
-func (l *ocppLogger) print(s string) {
-	if !l.suite.done.Load() {
-		l.suite.T().Log((time.Now().Format(time.DateTime)), s)
-	}
-}
-
-func (l *ocppLogger) Debug(args ...interface{}) { l.print(fmt.Sprint(args...)) }
-func (l *ocppLogger) Debugf(format string, args ...interface{}) {
-	l.print(fmt.Sprintf(format, args...))
-}
-func (l *ocppLogger) Info(args ...interface{}) { l.print(fmt.Sprint(args...)) }
-func (l *ocppLogger) Infof(format string, args ...interface{}) {
-	l.print(fmt.Sprintf(format, args...))
-}
-func (l *ocppLogger) Error(args ...interface{}) { l.print(fmt.Sprint(args...)) }
-func (l *ocppLogger) Errorf(format string, args ...interface{}) {
-	l.print(fmt.Sprintf(format, args...))
-}
-
 func TestOcpp(t *testing.T) {
 	suite.Run(t, new(ocppTestSuite))
 }
 
 type ocppTestSuite struct {
 	suite.Suite
 	clock *clock.Mock
-	done  atomic.Bool
 }
 
 func (suite *ocppTestSuite) SetupTest() {
 	ocpp.Timeout = 5 * time.Second
+	ocppj.SetLogger(new(ocppLogger))
 
 	// setup cs so we can overwrite logger afterwards
 	_ = ocpp.Instance()
-	ocppj.SetLogger(&ocppLogger{suite})
 
 	suite.clock = clock.NewMock()
 	suite.NotNil(ocpp.Instance())
 }
 
-func (suite *ocppTestSuite) TeardownTest() {
-	suite.done.Store(true)
-}
-
 func (suite *ocppTestSuite) startChargePoint(id string, connectorId int) (ocpp16.ChargePoint, *ocppj.Client) {
 	// set a handler for all callback functions
 	handler := &ChargePointHandler{

charger/ocpp_test_logger.go

@@ -0,0 +1,25 @@
+package charger
+
+import (
+	"fmt"
+	"time"
+)
+
+type ocppLogger struct{}
+
+func (l *ocppLogger) print(s string) {
+	fmt.Println(time.Now().Format(time.DateTime), s)
+}
+
+func (l *ocppLogger) Debug(args ...interface{}) { l.print(fmt.Sprint(args...)) }
+func (l *ocppLogger) Debugf(format string, args ...interface{}) {
+	l.print(fmt.Sprintf(format, args...))
+}
+func (l *ocppLogger) Info(args ...interface{}) { l.print(fmt.Sprint(args...)) }
+func (l *ocppLogger) Infof(format string, args ...interface{}) {
+	l.print(fmt.Sprintf(format, args...))
+}
+func (l *ocppLogger) Error(args ...interface{}) { l.print(fmt.Sprint(args...)) }
+func (l *ocppLogger) Errorf(format string, args ...interface{}) {
+	l.print(fmt.Sprintf(format, args...))
+}