Move TimeLeapClock from edge.common to common (#2395)

* Moved TimeLeapClock from edge.common to common UnitTests of Backend have no access to TimeLeapClock, this commit fixes the issue. Co-authored-by: Kai Jeschek <[email protected]> * Fix sorting of imports --------- Co-authored-by: Kai Jeschek <[email protected]> Co-authored-by: Stefan Feilmeier <[email protected]>
OpenEMS · Oct 25, 2023 · 7df7406 · 7df7406
1 parent 90e870f
commit 7df7406
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 40 deletions.
diff --git a/...enems/edge/common/test/TimeLeapClock.java → ...io/openems/common/test/TimeLeapClock.java b/...enems/edge/common/test/TimeLeapClock.java → ...io/openems/common/test/TimeLeapClock.java
@@ -1,4 +1,4 @@
-package io.openems.edge.common.test;
+package io.openems.common.test;
 
 import java.time.Clock;
 import java.time.Instant;

diff --git a/...enems.edge.battery.api/test/io/openems/edge/battery/protection/BatteryProtectionTest.java b/...enems.edge.battery.api/test/io/openems/edge/battery/protection/BatteryProtectionTest.java
@@ -7,6 +7,7 @@
 import org.junit.Test;
 
 import io.openems.common.channel.Unit;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.battery.protection.currenthandler.ChargeMaxCurrentHandler;
@@ -21,7 +22,6 @@
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class BatteryProtectionTest {
 

diff --git a/...ery.api/test/io/openems/edge/battery/protection/currenthandler/MaxCurrentHandlerTest.java b/...ery.api/test/io/openems/edge/battery/protection/currenthandler/MaxCurrentHandlerTest.java
@@ -8,10 +8,10 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.edge.battery.protection.BatteryProtectionTest;
 import io.openems.edge.common.linecharacteristic.PolyLine;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class MaxCurrentHandlerTest {
 

diff --git a/...ial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java b/...ial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
@@ -5,6 +5,7 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.battery.api.Battery;
 import io.openems.edge.battery.fenecon.commercial.statemachine.StateMachine;
@@ -15,7 +16,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.io.test.DummyInputOutput;
 
 public class BatteryFeneconCommercialImplTest {

diff --git a/...ry.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java b/...ry.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
@@ -10,6 +10,7 @@
 import org.junit.Test;
 
 import io.openems.common.function.ThrowingRunnable;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.battery.api.Battery;
 import io.openems.edge.battery.fenecon.home.statemachine.StateMachine;
@@ -21,7 +22,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.io.test.DummyInputOutput;
 
 public class BatteryFeneconHomeImplTest {

diff --git a/...con.home/test/io/openems/edge/battery/fenecon/home/statemachine/GoRunningHandlerTest.java b/...con.home/test/io/openems/edge/battery/fenecon/home/statemachine/GoRunningHandlerTest.java
@@ -14,8 +14,8 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.function.BooleanConsumer;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.edge.battery.fenecon.home.statemachine.GoRunningHandler.SubState;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class GoRunningHandlerTest {
 

diff --git a/...atteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java b/...atteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
@@ -8,6 +8,7 @@
 import org.junit.Test;
 
 import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.battery.api.Battery;
 import io.openems.edge.battery.test.DummyBattery;
@@ -23,7 +24,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class BatteryInverterKacoBlueplanetGridsaveImplTest {
 

diff --git a/...nexcel/test/io/openems/edge/batteryinverter/sinexcel/BatteryInverterSinexcelImplTest.java b/...nexcel/test/io/openems/edge/batteryinverter/sinexcel/BatteryInverterSinexcelImplTest.java
@@ -7,6 +7,7 @@
 import org.junit.Test;
 
 import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.battery.api.Battery;
 import io.openems.edge.battery.test.DummyBattery;
@@ -23,7 +24,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class BatteryInverterSinexcelImplTest {
 

diff --git a/...odbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java b/...odbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
@@ -8,7 +8,7 @@
 
 import org.junit.Test;
 
-import io.openems.edge.common.test.TimeLeapClock;
+import io.openems.common.test.TimeLeapClock;
 
 public class DefectiveComponentsTest {
 

diff --git a/....modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java b/....modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
@@ -10,11 +10,11 @@
 import org.junit.Test;
 
 import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.edge.bridge.modbus.DummyModbusComponent;
 import io.openems.edge.bridge.modbus.api.worker.DummyReadTask;
 import io.openems.edge.bridge.modbus.api.worker.DummyWriteTask;
 import io.openems.edge.common.taskmanager.Priority;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class TasksSupplierImplTest {
 

diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/ClockProvider.java b/io.openems.edge.common/src/io/openems/edge/common/component/ClockProvider.java
@@ -2,7 +2,7 @@
 
 import java.time.Clock;
 
-import io.openems.edge.common.test.TimeLeapClock;
+import io.openems.common.test.TimeLeapClock;
 
 /**
  * {@link ClockProvider} provides a Clock - real or mocked like

diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
@@ -29,6 +29,7 @@
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.function.ThrowingRunnable;
 import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.types.OpenemsType;
 import io.openems.common.types.OptionsEnum;

diff --git a/...api.backend/test/io/openems/edge/controller/api/backend/ControllerApiBackendImplTest.java b/...api.backend/test/io/openems/edge/controller/api/backend/ControllerApiBackendImplTest.java
@@ -7,12 +7,12 @@
 import org.junit.Test;
 
 import io.openems.common.channel.PersistencePriority;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.websocket.DummyWebsocketServer;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyCycle;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class ControllerApiBackendImplTest {
 

diff --git a/...ntroller.api.mqtt/test/io/openems/edge/controller/api/mqtt/ControllerApiMqttImplTest.java b/...ntroller.api.mqtt/test/io/openems/edge/controller/api/mqtt/ControllerApiMqttImplTest.java
@@ -6,10 +6,10 @@
 import org.junit.Test;
 
 import io.openems.common.channel.PersistencePriority;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 
 public class ControllerApiMqttImplTest {
 

diff --git a/.../openems/edge/controller/ess/activepowervoltagecharacteristic/CharacteristicImplTest.java b/.../openems/edge/controller/ess/activepowervoltagecharacteristic/CharacteristicImplTest.java
@@ -6,12 +6,12 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
 import io.openems.edge.meter.test.DummyElectricityMeter;

diff --git a/...oller.ess.cycle/test/io/openems/edge/controller/ess/cycle/ControllerEssCycleImplTest.java b/...oller.ess.cycle/test/io/openems/edge/controller/ess/cycle/ControllerEssCycleImplTest.java
@@ -6,11 +6,11 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.ess.cycle.statemachine.StateMachine.State;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;

diff --git a/...rge/test/io/openems/edge/controller/ess/delaycharge/ControllerEssDelayChargeImplTest.java b/...rge/test/io/openems/edge/controller/ess/delaycharge/ControllerEssDelayChargeImplTest.java
@@ -6,10 +6,10 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
 

diff --git a/...o/openems/edge/controller/ess/fixstateofcharge/ControllerEssFixStateOfChargeImplTest.java b/...o/openems/edge/controller/ess/fixstateofcharge/ControllerEssFixStateOfChargeImplTest.java
@@ -8,12 +8,12 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.ess.fixstateofcharge.api.AbstractFixStateOfCharge;
 import io.openems.edge.controller.ess.fixstateofcharge.api.EndCondition;
 import io.openems.edge.controller.ess.fixstateofcharge.statemachine.StateMachine;

diff --git a/...ems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImplTest.java b/...ems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImplTest.java
@@ -22,6 +22,7 @@
 
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.function.ThrowingRunnable;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
@@ -30,7 +31,6 @@
 import io.openems.edge.common.test.Plot;
 import io.openems.edge.common.test.Plot.AxisFormat;
 import io.openems.edge.common.test.Plot.Data;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyHybridEss;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;

diff --git a/...ems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java b/...ems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
@@ -4,10 +4,10 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
 

diff --git a/...vepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java b/...vepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
@@ -6,12 +6,12 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
 import io.openems.edge.meter.test.DummyElectricityMeter;

diff --git a/...ess.standby/test/io/openems/edge/controller/ess/standby/ControllerEssStandbyImplTest.java b/...ess.standby/test/io/openems/edge/controller/ess/standby/ControllerEssStandbyImplTest.java
@@ -8,13 +8,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.ess.standby.statemachine.StateMachine.State;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;

diff --git a/...ff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerTest.java b/...ff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerTest.java
@@ -18,12 +18,12 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
 import io.openems.edge.predictor.api.test.DummyPrediction24Hours;

diff --git a/...ems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java b/...ems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
@@ -7,12 +7,12 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.filter.DisabledRampFilter;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.evcs.api.ChargeMode;
 import io.openems.edge.evcs.api.Status;

diff --git a/...edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java b/...edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
@@ -6,11 +6,11 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.io.api.AnalogOutput.Range;
 import io.openems.edge.io.test.DummyAnalogVoltageOutput;

diff --git a/...edge/controller/io/channelsinglethreshold/ControllerIoChannelSingleThresholdImplTest.java b/...edge/controller/io/channelsinglethreshold/ControllerIoChannelSingleThresholdImplTest.java
@@ -2,10 +2,10 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.ess.test.DummyManagedSymmetricEss;
 import io.openems.edge.io.test.DummyInputOutput;

diff --git a/...test/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest.java b/...test/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest.java
@@ -6,11 +6,11 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.io.heatingelement.enums.Level;
 import io.openems.edge.controller.io.heatingelement.enums.Mode;
 import io.openems.edge.controller.io.heatingelement.enums.WorkMode;

diff --git a/...est/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest2.java b/...est/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest2.java
@@ -6,11 +6,11 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.io.heatingelement.enums.Level;
 import io.openems.edge.controller.io.heatingelement.enums.Mode;
 import io.openems.edge.controller.io.heatingelement.enums.Status;

diff --git a/...est/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest3.java b/...est/io/openems/edge/controller/io/heatingelement/ControllerIoHeatingElementImplTest3.java
@@ -6,11 +6,11 @@
 import org.junit.Test;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.io.heatingelement.enums.Level;
 import io.openems.edge.controller.io.heatingelement.enums.Mode;
 import io.openems.edge.controller.io.heatingelement.enums.WorkMode;

diff --git a/...t/io/openems/edge/controller/io/heatpump/sgready/ControllerIoHeatPumpSgReadyImplTest.java b/...t/io/openems/edge/controller/io/heatpump/sgready/ControllerIoHeatPumpSgReadyImplTest.java
@@ -6,11 +6,11 @@
 
 import org.junit.Test;
 
+import io.openems.common.test.TimeLeapClock;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.sum.DummySum;
 import io.openems.edge.common.test.AbstractComponentTest.TestCase;
 import io.openems.edge.common.test.DummyComponentManager;
-import io.openems.edge.common.test.TimeLeapClock;
 import io.openems.edge.controller.test.ControllerTest;
 import io.openems.edge.io.test.DummyInputOutput;