From 42872ee34bd1826a64e2dec07a81eb97bf89f838 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sat, 24 Aug 2024 11:45:57 +0200
Subject: [PATCH] wip

---
 charger/ocpp/connector_test.go | 38 +++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/charger/ocpp/connector_test.go b/charger/ocpp/connector_test.go
index 6e87372a7..dace9d711 100644
--- a/charger/ocpp/connector_test.go
+++ b/charger/ocpp/connector_test.go
@@ -33,8 +33,12 @@ func (suite *connTestSuite) SetupSuite() {
 	for _, m := range []types.Measurand{
 		types.MeasurandPowerActiveImport,
 		types.MeasurandEnergyActiveImportRegister,
-		types.MeasurandVoltage,
-		types.MeasurandCurrentImport,
+		types.MeasurandCurrentImport + ".L1",
+		types.MeasurandCurrentImport + ".L2",
+		types.MeasurandCurrentImport + ".L3",
+		types.MeasurandVoltage + ".L1-N",
+		types.MeasurandVoltage + ".L2-N",
+		types.MeasurandVoltage + ".L3-N",
 		types.MeasurandCurrentOffered,
 	} {
 		suite.conn.measurements[m] = types.SampledValue{Value: "1"}
@@ -60,19 +64,37 @@ func (suite *connTestSuite) TestConnectorMeasurementsNoTxn() {
 	suite.Equal(api.ErrTimeout, err, "Voltages")
 }
 
-func (suite *connTestSuite) TestConnectorMeasurementsRunningTxn() {
+func (suite *connTestSuite) TestConnectorMeasurementsRunningTxnOutdated() {
 	// connected, running txn, no meter update since 1 hour
 	suite.clock.Add(time.Hour)
 	suite.conn.txnId = 1
 
 	_, err := suite.conn.CurrentPower()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.Equal(api.ErrTimeout, err, "CurrentPower")
 	_, err = suite.conn.TotalEnergy()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.Equal(api.ErrTimeout, err, "TotalEnergy")
 	_, err = suite.conn.GetMaxCurrent()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.Equal(api.ErrTimeout, err, "GetMaxCurrent")
 	_, _, _, err = suite.conn.Currents()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.Equal(api.ErrTimeout, err, "Currents")
 	_, _, _, err = suite.conn.Voltages()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.Equal(api.ErrTimeout, err, "Voltages")
+}
+
+func (suite *connTestSuite) TestConnectorMeasurementsRunningTxn() {
+	// connected, running txn, no meter update since 1 hour
+	suite.clock.Add(time.Hour)
+	suite.conn.meterUpdated = suite.clock.Now()
+	suite.conn.txnId = 1
+
+	_, err := suite.conn.CurrentPower()
+	suite.NoError(err, "CurrentPower")
+	_, err = suite.conn.TotalEnergy()
+	suite.NoError(err, "TotalEnergy")
+	_, err = suite.conn.GetMaxCurrent()
+	suite.NoError(err, "GetMaxCurrent")
+	_, _, _, err = suite.conn.Currents()
+	suite.NoError(err, "Currents")
+	_, _, _, err = suite.conn.Voltages()
+	suite.NoError(err, "Voltages")
 }