Add test support

core/loadpoint.go

@@ -80,11 +80,11 @@ type Loadpoint struct {
 	lpChan   chan<- *Loadpoint // update requests
 	log      *util.Logger
 
-	// exposed public configuration
+	rwMutex      int64        // count reentrant RWMutex
 	sync.RWMutex              // guard status
-
 	vmu          sync.RWMutex // guard vehicle
 
+	// exposed public configuration
 	CircuitRef string `mapstructure:"circuit"` // Circuit reference
 	ChargerRef string `mapstructure:"charger"` // Charger reference
 	VehicleRef string `mapstructure:"vehicle"` // Vehicle reference

core/loadpoint_mutex.go

@@ -0,0 +1,34 @@
+package core
+
+import (
+	"sync/atomic"
+	"testing"
+)
+
+func (lp *Loadpoint) RLock() {
+	if testing.Testing() && atomic.AddInt64(&lp.rwMutex, 1) > 1 {
+		panic("reentrant RLock")
+	}
+	lp.RWMutex.RLock()
+}
+
+func (lp *Loadpoint) RUnlock() {
+	if testing.Testing() {
+		atomic.AddInt64(&lp.rwMutex, -1)
+	}
+	lp.RWMutex.RUnlock()
+}
+
+func (lp *Loadpoint) Lock() {
+	if testing.Testing() && atomic.AddInt64(&lp.rwMutex, 1) > 1 {
+		panic("reentrant Lock")
+	}
+	lp.RWMutex.Lock()
+}
+
+func (lp *Loadpoint) Unlock() {
+	if testing.Testing() {
+		atomic.AddInt64(&lp.rwMutex, -1)
+	}
+	lp.RWMutex.Unlock()
+}