Merge pull request #7 from P8hJ/feature/JUnit5Migration

Migrate all Tests to JUnit5

Author: eblosug

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>eblocker-top</artifactId>
         <groupId>org.eblocker</groupId>
-        <version>2.4.13</version>
+        <version>2.4.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,8 +35,8 @@
 
         <!-- Test only -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -45,6 +45,7 @@
         <repository>
             <id>eblocker-registration-api</id>
             <name>GitHub Packages</name>
+            <!--suppress UnresolvedMavenProperty -->
             <url>https://maven.pkg.github.com/${githubRepository}</url>
         </repository>
     </distributionManagement>

src/test/java/org/eblocker/registration/DeviceRegistrationRequestTest.java

@@ -17,20 +17,20 @@
 package org.eblocker.registration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class DeviceRegistrationRequestTest {
+class DeviceRegistrationRequestTest {
 
     private static ObjectMapper mapper = new ObjectMapper();
 
     @Test
-    public void test() throws IOException {
+    void test() throws IOException {
         DeviceRegistrationRequest request = new DeviceRegistrationRequest(
                 "email@address",
                 "deviceName",
@@ -64,7 +64,7 @@ public void test() throws IOException {
     }
 
     @Test
-    public void test_noConfirmationInfo() throws IOException {
+    void test_noConfirmationInfo() throws IOException {
         DeviceRegistrationRequest request = new DeviceRegistrationRequest(
                 "email@address",
                 "deviceName",
@@ -103,7 +103,7 @@ public void test_noConfirmationInfo() throws IOException {
 
 
     @Test
-    public void test_toString() {
+    void test_toString() {
         DeviceRegistrationRequest request = new DeviceRegistrationRequest(
                 "email@address",
                 "deviceName",
@@ -122,7 +122,7 @@ public void test_toString() {
     }
 
     @Test
-    public void test_toStringNoConfirmationInfo() {
+    void test_toStringNoConfirmationInfo() {
         DeviceRegistrationRequest request = new DeviceRegistrationRequest(
                 "email@address",
                 "deviceName",

src/test/java/org/eblocker/registration/DeviceRegistrationResponseTest.java

@@ -17,20 +17,21 @@
 package org.eblocker.registration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class DeviceRegistrationResponseTest {
+class DeviceRegistrationResponseTest {
 
     private static ObjectMapper mapper = new ObjectMapper();
 
     @Test
-    public void test() throws IOException {
+    void test() throws IOException {
         DeviceRegistrationResponse response = new DeviceRegistrationResponse(
                 "email@address",
                 "deviceName",
@@ -65,7 +66,7 @@ public void test() throws IOException {
     }
 
     @Test
-    public void test_compatibility() throws IOException {
+    void test_compatibility() throws IOException {
         DeviceRegistrationResponse response = new DeviceRegistrationResponse(
                 "email@address",
                 "deviceName",

src/test/java/org/eblocker/registration/LicenseTypeTest.java

@@ -16,14 +16,14 @@
  */
 package org.eblocker.registration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class LicenseTypeTest {
+class LicenseTypeTest {
 
     @Test
-    public void test() {
+    void test() {
 
         assertFalse(LicenseType.COMMUNITY.isSubscription());
         assertTrue(LicenseType.SUBSCRIPTION.isSubscription());

src/test/java/org/eblocker/registration/MobileConnectionCheckTest.java

@@ -17,19 +17,20 @@
 package org.eblocker.registration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Date;
 import java.util.UUID;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class MobileConnectionCheckTest {
+class MobileConnectionCheckTest {
     private static ObjectMapper mapper = new ObjectMapper();
 
     @Test
-    public void test() throws IOException {
+    void test() throws IOException {
         MobileConnectionCheck mobileConnectionCheck = new MobileConnectionCheck(
                 UUID.randomUUID().toString(),
                 MobileConnectionCheck.State.NEW,

src/test/java/org/eblocker/registration/ProductFeatureTest.java

@@ -16,14 +16,14 @@
  */
 package org.eblocker.registration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ProductFeatureTest {
+class ProductFeatureTest {
 
     @Test
-    public void test() {
+    void test() {
 
         assertEquals(ProductFeature.WOL, ProductFeature.defaultProductFeature());
 

src/test/java/org/eblocker/registration/ProductInfoTest.java

@@ -17,24 +17,21 @@
 package org.eblocker.registration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import static org.junit.Assert.assertArrayEquals;
-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.*;
 
-public class ProductInfoTest {
+class ProductInfoTest {
     private static ObjectMapper mapper = new ObjectMapper();
     private ProductInfo entity;
 
-    @Before
+    @BeforeEach
     public void initFixtures() {
         entity = new ProductInfo(
                 "productId",
@@ -44,7 +41,7 @@ public void initFixtures() {
     }
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         entity = new ProductInfo(
                 "productId",
                 "productName",
@@ -53,7 +50,7 @@ public void testConstructor() {
     }
 
     @Test
-    public void test() throws IOException {
+    void test() throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         mapper.writerWithDefaultPrettyPrinter().writeValue(out, entity);
 
@@ -68,30 +65,30 @@ public void test() throws IOException {
     }
 
     @Test
-    public void testToString() {
-        assertTrue(entity.toString().contains("productId"));
+    void testToString() {
+        Assertions.assertTrue(entity.toString().contains("productId"));
     }
 
     @Test
-    public void testRemoveProductFeature() {
+    void testRemoveProductFeature() {
         entity.removeProductFeature("F01");
         entity.removeProductFeature("XYZ");
-        assertTrue(entity.getProductFeatures().length == 2);
+        assertEquals(2, entity.getProductFeatures().length);
     }
 
     @SuppressWarnings("unlikely-arg-type")
     @Test
-    public void testEquals() {
-        assertFalse(entity.equals(null));
-        assertFalse(entity.equals("test"));
-        assertTrue(entity.equals(entity));
+    void testEquals() {
+        assertNotEquals(null, entity);
+        assertNotEquals("test", entity);
+        assertEquals(entity, entity);
 
         ProductInfo entity2 = new ProductInfo(
                 "productId",
                 "productName",
                 new String[]{"F01", "F02", "F03"}
         );
-        assertTrue(entity2.equals(entity));
+        assertEquals(entity2, entity);
 
         entity2 = new ProductInfo(
                 null,
@@ -103,8 +100,8 @@ public void testEquals() {
                 "productName",
                 new String[]{"F01", "F02", "F03"}
         );
-        assertFalse(entity2.equals(entity));
-        assertTrue(entity3.equals(entity2));
+        assertNotEquals(entity2, entity);
+        assertEquals(entity3, entity2);
 
         entity2 = new ProductInfo(
                 "productId",
@@ -116,29 +113,29 @@ public void testEquals() {
                 null,
                 new String[]{"F01", "F02", "F03"}
         );
-        assertFalse(entity2.equals(entity));
-        assertTrue(entity3.equals(entity2));
+        assertNotEquals(entity2, entity);
+        assertEquals(entity3, entity2);
 
         entity2 = new ProductInfo(
                 "productId-XZ",
                 "productName",
                 new String[]{"F01", "F02", "F03"}
         );
-        assertFalse(entity2.equals(entity));
+        assertNotEquals(entity2, entity);
 
         entity2 = new ProductInfo(
                 "productId",
                 "productName-XZ",
                 new String[]{"F01", "F02", "F03"}
         );
-        assertFalse(entity2.equals(entity));
+        assertNotEquals(entity2, entity);
 
         entity.removeProductFeature("F01");
-        assertFalse(entity2.equals(entity));
+        assertNotEquals(entity2, entity);
     }
 
     @Test
-    public void testHashCode () {
+    void testHashCode() {
         assertEquals(1526013430, entity.hashCode());
 
         entity = new ProductInfo(

src/test/java/org/eblocker/registration/RegistrationStateTest.java

@@ -16,14 +16,15 @@
  */
 package org.eblocker.registration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class RegistrationStateTest {
+class RegistrationStateTest {
 
     @Test
-    public void test() {
+    void test() {
 
         assertTrue(RegistrationState.NEW.isUnregistered());
 

src/test/java/org/eblocker/registration/UpdateModeTest.java

@@ -16,14 +16,14 @@
  */
 package org.eblocker.registration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class UpdateModeTest {
+class UpdateModeTest {
 
     @Test
-    public void test() {
+    void test() {
 
         assertEquals(UpdateMode.AUTO, UpdateMode.getFailSafeValue(1));
 

src/test/java/org/eblocker/registration/UpgradeProductInfoTest.java

@@ -17,21 +17,20 @@
 package org.eblocker.registration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class UpgradeProductInfoTest {
+class UpgradeProductInfoTest {
 
     private static ObjectMapper mapper = new ObjectMapper();
 
     @Test
-    public void test() throws IOException {
+    void test() throws IOException {
         UpgradeProductInfo entity = new UpgradeProductInfo(
                 true,
                 null