wip

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) TestConnectorMeasurementsRunningTxnOutdated() {
+	// connected, running txn, no meter update since 1 hour
+	suite.clock.Add(time.Hour)
+	suite.conn.txnId = 1
+
+	_, err := suite.conn.CurrentPower()
+	suite.Equal(api.ErrTimeout, err, "CurrentPower")
+	_, err = suite.conn.TotalEnergy()
+	suite.Equal(api.ErrTimeout, err, "TotalEnergy")
+	_, err = suite.conn.GetMaxCurrent()
+	suite.Equal(api.ErrTimeout, err, "GetMaxCurrent")
+	_, _, _, err = suite.conn.Currents()
+	suite.Equal(api.ErrTimeout, err, "Currents")
+	_, _, _, err = suite.conn.Voltages()
+	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.Require().Equal(api.ErrTimeout, err)
+	suite.NoError(err, "CurrentPower")
 	_, err = suite.conn.TotalEnergy()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.NoError(err, "TotalEnergy")
 	_, err = suite.conn.GetMaxCurrent()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.NoError(err, "GetMaxCurrent")
 	_, _, _, err = suite.conn.Currents()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.NoError(err, "Currents")
 	_, _, _, err = suite.conn.Voltages()
-	suite.Require().Equal(api.ErrTimeout, err)
+	suite.NoError(err, "Voltages")
 }