refactor: JUnit Jupiter migration from JUnit 4.x

pom.xml

@@ -74,6 +74,12 @@
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Utils for multikey hashmaps -->
@@ -143,6 +149,12 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-junit</artifactId>
+			<version>2.0.0.0</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>

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

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;

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

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 {

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; 

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 {
 
 

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;

src/test/java/com/sap/charging/model/ChargingStationFactoryTest.java

@@ -1,17 +1,15 @@
 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;
 import org.json.simple.parser.ParseException;
 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

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; 

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 {
 
 

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 {
 
 

src/test/java/com/sap/charging/model/FuseTreeTest.java

@@ -1,15 +1,15 @@
 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;
 
 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()));
 	    }
 	  });
 

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;
 

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

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

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() {

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 {
 
 

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;