diff --git a/pom.xml b/pom.xml index e879711..df510de 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,12 @@ com.googlecode.json-simple json-simple 1.1.1 + + + junit + junit + + @@ -143,6 +149,12 @@ org.springframework.security spring-security-web + + org.hamcrest + hamcrest-junit + 2.0.0.0 + test + org.springframework.security spring-security-config diff --git a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorDeterministicTest.java b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorDeterministicTest.java index 3d423b3..d9010b3 100644 --- a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorDeterministicTest.java +++ b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorDeterministicTest.java @@ -1,15 +1,14 @@ package com.sap.charging.dataGeneration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import org.junit.jupiter.api.Test; -import com.sap.charging.model.Car; - - - +import com.sap.charging.model.Car; + + public class DataGeneratorDeterministicTest { @Test diff --git a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorFuseTreeTest.java b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorFuseTreeTest.java index 25456cb..4277095 100644 --- a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorFuseTreeTest.java +++ b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorFuseTreeTest.java @@ -1,6 +1,6 @@ package com.sap.charging.dataGeneration; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; @@ -11,8 +11,8 @@ import com.sap.charging.model.Fuse; import com.sap.charging.model.FuseTree; import com.sap.charging.model.EnergyUtil.Phase; -import com.sap.charging.opt.CONSTANTS; - +import com.sap.charging.opt.CONSTANTS; + public class DataGeneratorFuseTreeTest { private static final int nChargingStationsPerBottomLevelFuseTree = 4; diff --git a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRandomTest.java b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRandomTest.java index 3cf79f6..c431f2c 100644 --- a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRandomTest.java +++ b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRandomTest.java @@ -1,7 +1,7 @@ package com.sap.charging.dataGeneration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Random; @@ -12,8 +12,8 @@ import com.sap.charging.dataGeneration.common.DefaultDataGenerator; import com.sap.charging.model.Car; import com.sap.charging.model.CarFactory.CarModel; -import com.sap.charging.sim.Simulation; - +import com.sap.charging.sim.Simulation; + public class DataGeneratorRandomTest { @BeforeEach diff --git a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRealTest.java b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRealTest.java index 66ab492..b4bedbb 100644 --- a/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRealTest.java +++ b/src/test/java/com/sap/charging/dataGeneration/DataGeneratorRealTest.java @@ -1,7 +1,7 @@ package com.sap.charging.dataGeneration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.List; @@ -16,8 +16,8 @@ import com.sap.charging.model.FuseTree; import com.sap.charging.model.FuseTreeNode; import com.sap.charging.opt.CONSTANTS; -import com.sap.charging.util.Callback; - +import com.sap.charging.util.Callback; + // Disable this class until a public/synthetic database is integrated @Disabled public class DataGeneratorRealTest { diff --git a/src/test/java/com/sap/charging/dataGeneration/DataRandomizerTest.java b/src/test/java/com/sap/charging/dataGeneration/DataRandomizerTest.java index 6787903..351b099 100644 --- a/src/test/java/com/sap/charging/dataGeneration/DataRandomizerTest.java +++ b/src/test/java/com/sap/charging/dataGeneration/DataRandomizerTest.java @@ -1,15 +1,15 @@ package com.sap.charging.dataGeneration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.charging.dataGeneration.common.DefaultDataGenerator; import com.sap.charging.model.Car; -import com.sap.charging.sim.Simulation; - - +import com.sap.charging.sim.Simulation; + + public class DataRandomizerTest { DataGenerator dataOriginal; diff --git a/src/test/java/com/sap/charging/model/CarFactoryTest.java b/src/test/java/com/sap/charging/model/CarFactoryTest.java index 7c73524..9d4d33c 100644 --- a/src/test/java/com/sap/charging/model/CarFactoryTest.java +++ b/src/test/java/com/sap/charging/model/CarFactoryTest.java @@ -1,6 +1,6 @@ package com.sap.charging.model; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.time.LocalTime; @@ -9,8 +9,8 @@ import com.sap.charging.model.CarFactory.CarModel; import com.sap.charging.model.CarFactory.CarType; -import com.sap.charging.sim.Simulation; - +import com.sap.charging.sim.Simulation; + public class CarFactoryTest { diff --git a/src/test/java/com/sap/charging/model/CarTest.java b/src/test/java/com/sap/charging/model/CarTest.java index ddfc29b..f7128d6 100644 --- a/src/test/java/com/sap/charging/model/CarTest.java +++ b/src/test/java/com/sap/charging/model/CarTest.java @@ -1,6 +1,6 @@ package com.sap.charging.model; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.LocalTime; @@ -12,8 +12,8 @@ import com.sap.charging.model.CarFactory.CarModel; import com.sap.charging.model.CarFactory.CarType; import com.sap.charging.util.JSONKeys; -import com.sap.charging.util.TimeUtil; - +import com.sap.charging.util.TimeUtil; + public class CarTest { private static final int nTimeslots = 20; diff --git a/src/test/java/com/sap/charging/model/ChargingStationFactoryTest.java b/src/test/java/com/sap/charging/model/ChargingStationFactoryTest.java index 46948eb..dc178fa 100644 --- a/src/test/java/com/sap/charging/model/ChargingStationFactoryTest.java +++ b/src/test/java/com/sap/charging/model/ChargingStationFactoryTest.java @@ -1,8 +1,6 @@ package com.sap.charging.model; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; @@ -10,8 +8,8 @@ import org.junit.jupiter.api.Test; import com.sap.charging.model.ChargingStationFactory.Standard; -import com.sap.charging.model.EnergyUtil.Phase; - +import com.sap.charging.model.EnergyUtil.Phase; + public class ChargingStationFactoryTest { @Test diff --git a/src/test/java/com/sap/charging/model/ChargingStationTest.java b/src/test/java/com/sap/charging/model/ChargingStationTest.java index 0a3ef1a..ce60166 100644 --- a/src/test/java/com/sap/charging/model/ChargingStationTest.java +++ b/src/test/java/com/sap/charging/model/ChargingStationTest.java @@ -1,7 +1,7 @@ package com.sap.charging.model; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; @@ -10,8 +10,8 @@ import com.sap.charging.model.CarFactory.CarModel; import com.sap.charging.model.EnergyUtil.Phase; -import com.sap.charging.sim.common.SimulationUnitTest; - +import com.sap.charging.sim.common.SimulationUnitTest; + public class ChargingStationTest extends SimulationUnitTest { Car onePhaseCar; diff --git a/src/test/java/com/sap/charging/model/EnergyPriceHistoryTest.java b/src/test/java/com/sap/charging/model/EnergyPriceHistoryTest.java index 8155dbf..df7a13e 100644 --- a/src/test/java/com/sap/charging/model/EnergyPriceHistoryTest.java +++ b/src/test/java/com/sap/charging/model/EnergyPriceHistoryTest.java @@ -1,6 +1,6 @@ package com.sap.charging.model; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -12,8 +12,8 @@ import com.sap.charging.dataGeneration.DataGeneratorRandom; import com.sap.charging.dataGeneration.common.DefaultDataGenerator; import com.sap.charging.model.EnergyPriceHistory; -import com.sap.charging.util.JSONKeys; - +import com.sap.charging.util.JSONKeys; + public class EnergyPriceHistoryTest { diff --git a/src/test/java/com/sap/charging/model/EnergyUtilTest.java b/src/test/java/com/sap/charging/model/EnergyUtilTest.java index 6327cc9..2d2cd6b 100644 --- a/src/test/java/com/sap/charging/model/EnergyUtilTest.java +++ b/src/test/java/com/sap/charging/model/EnergyUtilTest.java @@ -1,12 +1,12 @@ package com.sap.charging.model; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import com.sap.charging.model.EnergyUtil.Phase; - +import com.sap.charging.model.EnergyUtil.Phase; + public class EnergyUtilTest { diff --git a/src/test/java/com/sap/charging/model/FuseTreeTest.java b/src/test/java/com/sap/charging/model/FuseTreeTest.java index 156be37..38499ec 100644 --- a/src/test/java/com/sap/charging/model/FuseTreeTest.java +++ b/src/test/java/com/sap/charging/model/FuseTreeTest.java @@ -1,7 +1,7 @@ package com.sap.charging.model; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; @@ -9,7 +9,7 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -100,7 +100,7 @@ public void testAllParentsSet() { parentCounter.incrementAndGet(); } if(node.hasChildren()){ - node.getChildren().forEach(child -> Assert.assertEquals(node, child.getParent())); + node.getChildren().forEach(child -> Assertions.assertEquals(node, child.getParent())); } }); diff --git a/src/test/java/com/sap/charging/opt/heuristic/InstanceHeuristicRelSoCTest.java b/src/test/java/com/sap/charging/opt/heuristic/InstanceHeuristicRelSoCTest.java index c53ee33..cda4fc2 100644 --- a/src/test/java/com/sap/charging/opt/heuristic/InstanceHeuristicRelSoCTest.java +++ b/src/test/java/com/sap/charging/opt/heuristic/InstanceHeuristicRelSoCTest.java @@ -1,6 +1,6 @@ package com.sap.charging.opt.heuristic; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; diff --git a/src/test/java/com/sap/charging/opt/lp/EquationTest.java b/src/test/java/com/sap/charging/opt/lp/EquationTest.java index ea4361d..4adf096 100644 --- a/src/test/java/com/sap/charging/opt/lp/EquationTest.java +++ b/src/test/java/com/sap/charging/opt/lp/EquationTest.java @@ -1,13 +1,13 @@ package com.sap.charging.opt.lp; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; import com.sap.charging.opt.lp.Equation; import com.sap.charging.opt.lp.Variable; -import com.sap.charging.opt.lp.Equation.ConstraintType; - +import com.sap.charging.opt.lp.Equation.ConstraintType; + public class EquationTest { @Test diff --git a/src/test/java/com/sap/charging/opt/lp/InstanceLPMinPriceTest.java b/src/test/java/com/sap/charging/opt/lp/InstanceLPMinPriceTest.java index d15199d..775c8c7 100644 --- a/src/test/java/com/sap/charging/opt/lp/InstanceLPMinPriceTest.java +++ b/src/test/java/com/sap/charging/opt/lp/InstanceLPMinPriceTest.java @@ -2,11 +2,8 @@ import static com.sap.charging.util.JSONKeys.JSON_KEY_CARS; import static com.sap.charging.util.JSONKeys.JSON_KEY_PROBLEM_INSTANCE; -import static com.sap.charging.util.JSONKeys.JSON_KEY_SOLUTION; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static com.sap.charging.util.JSONKeys.JSON_KEY_SOLUTION; +import static org.junit.jupiter.api.Assertions.*; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -18,8 +15,8 @@ import com.sap.charging.dataGeneration.DataGeneratorReal; import com.sap.charging.dataGeneration.common.DefaultDataGenerator; import com.sap.charging.opt.lp.util.SolverSCIP; -import com.sap.charging.util.JSONKeys; - +import com.sap.charging.util.JSONKeys; + public class InstanceLPMinPriceTest { @BeforeEach diff --git a/src/test/java/com/sap/charging/opt/lp/VariableTest.java b/src/test/java/com/sap/charging/opt/lp/VariableTest.java index 4717257..7893e23 100644 --- a/src/test/java/com/sap/charging/opt/lp/VariableTest.java +++ b/src/test/java/com/sap/charging/opt/lp/VariableTest.java @@ -1,15 +1,13 @@ package com.sap.charging.opt.lp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.*; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.Test; + public class VariableTest { public static Variable getDefaultVariableX() { diff --git a/src/test/java/com/sap/charging/realTime/StateTest.java b/src/test/java/com/sap/charging/realTime/StateTest.java index 7dfbf92..60cb56e 100644 --- a/src/test/java/com/sap/charging/realTime/StateTest.java +++ b/src/test/java/com/sap/charging/realTime/StateTest.java @@ -1,6 +1,6 @@ package com.sap.charging.realTime; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.json.simple.JSONObject; import org.junit.jupiter.api.Test; @@ -10,8 +10,8 @@ import com.sap.charging.dataGeneration.DataGeneratorRandom; import com.sap.charging.opt.InstanceEmpty; import com.sap.charging.sim.Simulation; -import com.sap.charging.util.JSONKeys; - +import com.sap.charging.util.JSONKeys; + public class StateTest { diff --git a/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicChargeSchedulerTest.java b/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicChargeSchedulerTest.java index b37d82f..676598e 100644 --- a/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicChargeSchedulerTest.java +++ b/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicChargeSchedulerTest.java @@ -1,8 +1,6 @@ package com.sap.charging.realTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,8 +14,8 @@ import com.sap.charging.realTime.util.TimeslotSorter; import com.sap.charging.realTime.util.TimeslotSortingCriteria; import com.sap.charging.sim.Simulation; -import com.sap.charging.util.random.ConstantDistribution; - +import com.sap.charging.util.random.ConstantDistribution; + public class StrategyAlgorithmicChargeSchedulerTest { private StrategyAlgorithmic strategyLinear; diff --git a/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicTest.java b/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicTest.java index d48ec37..bee60b3 100644 --- a/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicTest.java +++ b/src/test/java/com/sap/charging/realTime/StrategyAlgorithmicTest.java @@ -1,11 +1,9 @@ package com.sap.charging.realTime; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.*; import java.time.LocalTime; import java.util.Arrays; @@ -33,8 +31,8 @@ import com.sap.charging.sim.common.SimulationUnitTest; import com.sap.charging.sim.eval.exception.FuseTreeException; import com.sap.charging.util.SortableElement; -import com.sap.charging.util.TimeUtil; - +import com.sap.charging.util.TimeUtil; + public class StrategyAlgorithmicTest extends SimulationUnitTest { private StrategyAlgorithmic strategy; diff --git a/src/test/java/com/sap/charging/realTime/StrategyAlgorithmic_NonlinearTest.java b/src/test/java/com/sap/charging/realTime/StrategyAlgorithmic_NonlinearTest.java index 032f3fa..1537300 100644 --- a/src/test/java/com/sap/charging/realTime/StrategyAlgorithmic_NonlinearTest.java +++ b/src/test/java/com/sap/charging/realTime/StrategyAlgorithmic_NonlinearTest.java @@ -1,7 +1,7 @@ package com.sap.charging.realTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; import java.util.Map; @@ -24,8 +24,8 @@ import com.sap.charging.sim.eval.exception.FuseTreeException; import com.sap.charging.sim.util.SimulationListenerCSV; import com.sap.charging.util.TimeUtil; -import com.sap.charging.util.random.ConstantDistribution; - +import com.sap.charging.util.random.ConstantDistribution; + public class StrategyAlgorithmic_NonlinearTest { private StrategyAlgorithmic strategyLinear; diff --git a/src/test/java/com/sap/charging/realTime/StrategyTest.java b/src/test/java/com/sap/charging/realTime/StrategyTest.java index 31f61b4..8e86e51 100644 --- a/src/test/java/com/sap/charging/realTime/StrategyTest.java +++ b/src/test/java/com/sap/charging/realTime/StrategyTest.java @@ -1,7 +1,7 @@ package com.sap.charging.realTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.atomic.AtomicBoolean; @@ -17,8 +17,8 @@ import com.sap.charging.sim.event.EventCarDeparture; import com.sap.charging.sim.event.EventCarFinished; import com.sap.charging.sim.event.EventEnergyPriceChange; -import com.sap.charging.sim.event.EventReoptimize; - +import com.sap.charging.sim.event.EventReoptimize; + public class StrategyTest extends SimulationUnitTest { State state; diff --git a/src/test/java/com/sap/charging/realTime/model/CarAssignmentTest.java b/src/test/java/com/sap/charging/realTime/model/CarAssignmentTest.java index 54920b3..eba583d 100644 --- a/src/test/java/com/sap/charging/realTime/model/CarAssignmentTest.java +++ b/src/test/java/com/sap/charging/realTime/model/CarAssignmentTest.java @@ -1,6 +1,6 @@ -package com.sap.charging.realTime.model; +package com.sap.charging.realTime.model; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; @@ -11,10 +11,9 @@ import com.sap.charging.model.EnergyUtil.Phase; import com.sap.charging.model.Fuse; import com.sap.charging.sim.common.SimulationUnitTest; -import com.sap.charging.util.TimeUtil; - - - +import com.sap.charging.util.TimeUtil; + + public class CarAssignmentTest extends SimulationUnitTest { diff --git a/src/test/java/com/sap/charging/realTime/model/PowerAssignmentTest.java b/src/test/java/com/sap/charging/realTime/model/PowerAssignmentTest.java index 06ae39e..ba33507 100644 --- a/src/test/java/com/sap/charging/realTime/model/PowerAssignmentTest.java +++ b/src/test/java/com/sap/charging/realTime/model/PowerAssignmentTest.java @@ -1,6 +1,6 @@ package com.sap.charging.realTime.model; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -10,8 +10,8 @@ import com.sap.charging.model.ChargingStation; import com.sap.charging.model.CarFactory.CarModel; import com.sap.charging.model.EnergyUtil.Phase; -import com.sap.charging.sim.common.SimulationUnitTest; - +import com.sap.charging.sim.common.SimulationUnitTest; + public class PowerAssignmentTest extends SimulationUnitTest { Car onePhaseCar; diff --git a/src/test/java/com/sap/charging/realTime/util/TimeslotSorterTest.java b/src/test/java/com/sap/charging/realTime/util/TimeslotSorterTest.java index 9428427..ae7f302 100644 --- a/src/test/java/com/sap/charging/realTime/util/TimeslotSorterTest.java +++ b/src/test/java/com/sap/charging/realTime/util/TimeslotSorterTest.java @@ -1,7 +1,7 @@ package com.sap.charging.realTime.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -12,8 +12,8 @@ import com.sap.charging.dataGeneration.DataGeneratorRandom; import com.sap.charging.realTime.StrategyAlgorithmic; import com.sap.charging.sim.Simulation; -import com.sap.charging.util.SortableElement; - +import com.sap.charging.util.SortableElement; + public class TimeslotSorterTest { DataGenerator data; diff --git a/src/test/java/com/sap/charging/server/EmobilitySmartChargingApplicationTests.java b/src/test/java/com/sap/charging/server/EmobilitySmartChargingApplicationTests.java index c34242e..c2354b0 100644 --- a/src/test/java/com/sap/charging/server/EmobilitySmartChargingApplicationTests.java +++ b/src/test/java/com/sap/charging/server/EmobilitySmartChargingApplicationTests.java @@ -1,8 +1,8 @@ package com.sap.charging.server; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/test/java/com/sap/charging/server/SerializationTest.java b/src/test/java/com/sap/charging/server/SerializationTest.java index 668d46e..1326bb8 100644 --- a/src/test/java/com/sap/charging/server/SerializationTest.java +++ b/src/test/java/com/sap/charging/server/SerializationTest.java @@ -1,6 +1,6 @@ package com.sap.charging.server; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.json.JSONException; import org.json.JSONObject; @@ -15,8 +15,8 @@ import com.sap.charging.model.Fuse; import com.sap.charging.model.FuseTree; import com.sap.charging.sim.Simulation; -import com.sap.charging.sim.common.SimulationUnitTest; - +import com.sap.charging.sim.common.SimulationUnitTest; + public class SerializationTest extends SimulationUnitTest { ObjectMapper mapper; diff --git a/src/test/java/com/sap/charging/server/api/v1/OptimizeChargingProfilesControllerTest.java b/src/test/java/com/sap/charging/server/api/v1/OptimizeChargingProfilesControllerTest.java index 34fa8b2..3f79913 100644 --- a/src/test/java/com/sap/charging/server/api/v1/OptimizeChargingProfilesControllerTest.java +++ b/src/test/java/com/sap/charging/server/api/v1/OptimizeChargingProfilesControllerTest.java @@ -1,6 +1,6 @@ package com.sap.charging.server.api.v1; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.params.provider.Arguments.arguments; import java.util.stream.Stream; diff --git a/src/test/java/com/sap/charging/server/api/v1/store/ChargingStationStoreTest.java b/src/test/java/com/sap/charging/server/api/v1/store/ChargingStationStoreTest.java index 3fd95b0..8e2e54e 100644 --- a/src/test/java/com/sap/charging/server/api/v1/store/ChargingStationStoreTest.java +++ b/src/test/java/com/sap/charging/server/api/v1/store/ChargingStationStoreTest.java @@ -1,6 +1,6 @@ package com.sap.charging.server.api.v1.store; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.List; @@ -13,8 +13,8 @@ import com.sap.charging.realTime.StrategyAlgorithmic; import com.sap.charging.realTime.model.CarAssignmentStore; import com.sap.charging.realTime.model.forecasting.departure.CarDepartureOracle; -import com.sap.charging.sim.common.SimulationUnitTest; - +import com.sap.charging.sim.common.SimulationUnitTest; + public class ChargingStationStoreTest extends SimulationUnitTest { List chargingStations; diff --git a/src/test/java/com/sap/charging/server/api/v1/store/StateStoreTest.java b/src/test/java/com/sap/charging/server/api/v1/store/StateStoreTest.java index 7093742..eaf8119 100644 --- a/src/test/java/com/sap/charging/server/api/v1/store/StateStoreTest.java +++ b/src/test/java/com/sap/charging/server/api/v1/store/StateStoreTest.java @@ -1,9 +1,6 @@ package com.sap.charging.server.api.v1.store; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.List; @@ -32,8 +29,8 @@ import com.sap.charging.server.api.v1.exception.UnknownChargingStationException; import com.sap.charging.sim.Simulation; import com.sap.charging.sim.common.SimulationUnitTest; -import com.sap.charging.util.FileIO; - +import com.sap.charging.util.FileIO; + public class StateStoreTest extends SimulationUnitTest { List chargingStations; diff --git a/src/test/java/com/sap/charging/sim/SimulationFromDayaheadTest.java b/src/test/java/com/sap/charging/sim/SimulationFromDayaheadTest.java index 8e40e74..a8d8a1a 100644 --- a/src/test/java/com/sap/charging/sim/SimulationFromDayaheadTest.java +++ b/src/test/java/com/sap/charging/sim/SimulationFromDayaheadTest.java @@ -1,6 +1,6 @@ package com.sap.charging.sim; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collection; import java.util.stream.Collectors; diff --git a/src/test/java/com/sap/charging/sim/SimulationNonlinearBatteryTest.java b/src/test/java/com/sap/charging/sim/SimulationNonlinearBatteryTest.java index 711109c..abd718a 100644 --- a/src/test/java/com/sap/charging/sim/SimulationNonlinearBatteryTest.java +++ b/src/test/java/com/sap/charging/sim/SimulationNonlinearBatteryTest.java @@ -1,7 +1,7 @@ package com.sap.charging.sim; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; @@ -16,8 +16,8 @@ import com.sap.charging.model.battery.BatteryData_Sample; import com.sap.charging.model.battery.BatterySim; import com.sap.charging.model.battery.BatterySimParameters; -import com.sap.charging.util.random.ConstantDistribution; - +import com.sap.charging.util.random.ConstantDistribution; + public class SimulationNonlinearBatteryTest { Car car; diff --git a/src/test/java/com/sap/charging/sim/SimulationTest.java b/src/test/java/com/sap/charging/sim/SimulationTest.java index 7864437..b197500 100644 --- a/src/test/java/com/sap/charging/sim/SimulationTest.java +++ b/src/test/java/com/sap/charging/sim/SimulationTest.java @@ -4,11 +4,8 @@ import static com.sap.charging.util.JSONKeys.JSON_KEY_SOLUTION; import static com.sap.charging.util.JSONKeys.JSON_KEY_VARIABLES; import static com.sap.charging.util.JSONKeys.JSON_KEY_VARIABLE_NAME; -import static com.sap.charging.util.JSONKeys.JSON_KEY_VARIABLE_VALUE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static com.sap.charging.util.JSONKeys.JSON_KEY_VARIABLE_VALUE; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.HashMap; @@ -16,8 +13,8 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.json.simple.parser.ParseException; -import org.junit.Assert; +import org.json.simple.parser.ParseException; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -43,8 +40,8 @@ import com.sap.charging.sim.event.EventCarArrival; import com.sap.charging.sim.event.EventCarDeparture; import com.sap.charging.sim.event.EventCarFinished; -import com.sap.charging.sim.util.SimulationListenerCSV; - +import com.sap.charging.sim.util.SimulationListenerCSV; + public class SimulationTest extends SimulationUnitTest { @BeforeEach @@ -137,7 +134,7 @@ public void testInitEvents() { this.sim.init(); // Check total length of events - Assert.assertEquals( + Assertions.assertEquals( dataSim.getCars().size()*2 + // arrival + departure per car dataSim.getEnergyPriceHistory().getNTimeslots(), // one per timeslot sim.getSimulationEvents().size() @@ -147,7 +144,7 @@ public void testInitEvents() { for (int i=0;i