Migration to JUnit5 as default test runtime

hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java

@@ -19,9 +19,9 @@
 import org.apache.commons.io.IOUtils;
 import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,15 +42,15 @@ public class ArtifactFilesystemRepositoryTest {
 
     private static ArtifactFilesystemRepository artifactFilesystemRepository;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         artifactResourceProperties = new ArtifactFilesystemProperties();
         artifactResourceProperties.setPath(Files.createTempDir().getAbsolutePath());
 
         artifactFilesystemRepository = new ArtifactFilesystemRepository(artifactResourceProperties);
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (new File(artifactResourceProperties.getPath()).exists()) {
             try {

hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java

@@ -17,11 +17,12 @@
 import org.apache.commons.io.IOUtils;
 import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash;
-import org.junit.Test;
+
 
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
+import org.junit.jupiter.api.Test;
 
 @Feature("Unit Tests - Artifact File System Repository")
 @Story("Test storing artifact binaries in the file-system")

hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java

@@ -9,16 +9,18 @@
 package org.eclipse.hawkbit.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
@@ -29,7 +31,7 @@
 
 @Feature("Unit Tests - Cache")
 @Story("Download ID Cache")
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DefaultDownloadIdCacheTest {
 
     @Mock
@@ -51,11 +53,10 @@ public class DefaultDownloadIdCacheTest {
 
     private final String knownKey = "12345";
 
-    @Before
+    @BeforeEach
     public void before() {
         underTest = new DefaultDownloadIdCache(cacheManagerMock);
-        when(cacheManagerMock.getCache(DefaultDownloadIdCache.DOWNLOAD_ID_CACHE)).thenReturn(cacheMock);
-        when(tenancyCacheManagerMock.getDirectCache(DefaultDownloadIdCache.DOWNLOAD_ID_CACHE)).thenReturn(cacheMock);
+        lenient().when(cacheManagerMock.getCache(DefaultDownloadIdCache.DOWNLOAD_ID_CACHE)).thenReturn(cacheMock);
     }
 
     @Test
@@ -110,12 +111,14 @@ public void getValueReturnsNullIfNoKeyIsAssociated() {
     @Description("Verifies that TenancyCacheManager is using direct cache because download-ids are global unique and don't need to run as tenant aware")
     public void tenancyCacheManagerIsUsingDirectCache() {
 
+        when(tenancyCacheManagerMock.getDirectCache(DefaultDownloadIdCache.DOWNLOAD_ID_CACHE)).thenReturn(cacheMock);
         underTest = new DefaultDownloadIdCache(tenancyCacheManagerMock);
+
         final DownloadArtifactCache value = new DownloadArtifactCache(DownloadType.BY_SHA1, knownKey);
 
         underTest.put(knownKey, value);
 
-        verify(cacheMock).put(cacheManagerKeyCaptor.capture(), cacheManagerValueCaptor.capture());
+        verify(cacheMock).put(cacheManagerKeyCaptor.capture (), cacheManagerValueCaptor.capture());
 
         verify(tenancyCacheManagerMock).getDirectCache(DefaultDownloadIdCache.DOWNLOAD_ID_CACHE);
         assertThat(cacheManagerKeyCaptor.getValue()).isEqualTo(knownKey);

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java

@@ -9,9 +9,6 @@
 package org.eclipse.hawkbit.amqp;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -51,7 +48,8 @@
 import org.eclipse.hawkbit.repository.test.util.AbstractIntegrationTest;
 import org.eclipse.hawkbit.repository.test.util.TestdataFactory;
 import org.eclipse.hawkbit.util.IpUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.amqp.core.Message;
@@ -89,9 +87,9 @@ public class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {
 
     private Target testTarget;
 
-    @Override
-    public void before() throws Exception {
-        super.before();
+    @BeforeEach
+    public void beforeEach() throws Exception {
+
         testTarget = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)
                 .securityToken(TEST_TOKEN).address(AMQP_URI.toString()));
 
@@ -146,22 +144,19 @@ public void testSendDownloadRequestWithSoftwareModulesAndNoArtifacts() {
         assertThat(downloadAndUpdateRequest.getTargetSecurityToken()).isEqualTo(TEST_TOKEN);
         for (final org.eclipse.hawkbit.dmf.json.model.DmfSoftwareModule softwareModule : downloadAndUpdateRequest
                 .getSoftwareModules()) {
-            assertTrue("Artifact list for softwaremodule should be empty", softwareModule.getArtifacts().isEmpty());
+            assertThat(softwareModule.getArtifacts().isEmpty()).as("Artifact list for softwaremodule should be empty").isTrue();
 
             assertThat(softwareModule.getMetadata()).containsExactly(
                     new DmfMetadata(TestdataFactory.VISIBLE_SM_MD_KEY, TestdataFactory.VISIBLE_SM_MD_VALUE));
 
             for (final SoftwareModule softwareModule2 : action.getDistributionSet().getModules()) {
-                assertNotNull("Software module ID should be set", softwareModule.getModuleId());
                 if (!softwareModule.getModuleId().equals(softwareModule2.getId())) {
                     continue;
                 }
-                assertEquals(
-                        "Software module type in event should be the same as the softwaremodule in the distribution set",
-                        softwareModule.getModuleType(), softwareModule2.getType().getKey());
-                assertEquals(
-                        "Software module version in event should be the same as the softwaremodule in the distribution set",
-                        softwareModule.getModuleVersion(), softwareModule2.getVersion());
+                assertThat(softwareModule.getModuleType()).isEqualTo(softwareModule2.getType().getKey()).as(
+                        "Software module type in event should be the same as the softwaremodule in the distribution set");
+                assertThat(softwareModule.getModuleVersion()).isEqualTo(softwareModule2.getVersion()).as(
+                        "Software module version in event should be the same as the softwaremodule in the distribution set");
             }
         }
     }
@@ -190,8 +185,7 @@ public void testSendDownloadRequest() {
         final DmfDownloadAndUpdateRequest downloadAndUpdateRequest = assertDownloadAndInstallMessage(sendMessage,
                 action.getId());
 
-        assertEquals("DownloadAndUpdateRequest event should contains 3 software modules", 3,
-                downloadAndUpdateRequest.getSoftwareModules().size());
+        assertThat(downloadAndUpdateRequest.getSoftwareModules()).hasSize(3).as("DownloadAndUpdateRequest event should contains 3 software modules");
         assertThat(downloadAndUpdateRequest.getTargetSecurityToken()).isEqualTo(TEST_TOKEN);
 
         for (final DmfSoftwareModule softwareModule : downloadAndUpdateRequest.getSoftwareModules()) {
@@ -291,14 +285,14 @@ public void sendDeleteRequestWithNullAddress() {
     private void assertCancelMessage(final Message sendMessage) {
         assertEventMessage(sendMessage);
         final DmfActionRequest actionId = convertMessage(sendMessage, DmfActionRequest.class);
-        assertEquals("Action ID should be 1", actionId.getActionId(), Long.valueOf(1));
-        assertEquals("The topic in the message should be a CANCEL_DOWNLOAD value", EventTopic.CANCEL_DOWNLOAD,
-                sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TOPIC));
+        assertThat( actionId.getActionId()).isEqualTo(Long.valueOf(1)).as("Action ID should be 1");
+        assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TOPIC)).isEqualTo(EventTopic.CANCEL_DOWNLOAD)
+            .as("The topc in the message should be a CANCEL_DOWNLOAD value");
     }
 
     private void assertDeleteMessage(final Message sendMessage) {
 
-        assertNotNull(sendMessage);
+        assertThat(sendMessage).isNotNull();
         assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.THING_ID))
                 .isEqualTo(CONTROLLER_ID);
         assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TENANT)).isEqualTo(TENANT);
@@ -310,32 +304,30 @@ private DmfDownloadAndUpdateRequest assertDownloadAndInstallMessage(final Messag
         assertEventMessage(sendMessage);
         final DmfDownloadAndUpdateRequest downloadAndUpdateRequest = convertMessage(sendMessage,
                 DmfDownloadAndUpdateRequest.class);
-        assertEquals(downloadAndUpdateRequest.getActionId(), action);
-        assertEquals("The topic of the event should contain DOWNLOAD_AND_INSTALL", EventTopic.DOWNLOAD_AND_INSTALL,
-                sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TOPIC));
-        assertEquals("Security token of target", TEST_TOKEN, downloadAndUpdateRequest.getTargetSecurityToken());
+        assertThat(downloadAndUpdateRequest.getActionId()).isEqualTo(action);
+        assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TOPIC)).isEqualTo( EventTopic.DOWNLOAD_AND_INSTALL)
+                .as("The topic of the event should contain DOWNLOAD_AND_INSTALL");
+        assertThat(downloadAndUpdateRequest.getTargetSecurityToken()).isEqualTo(TEST_TOKEN).as("Security token of target");
 
         return downloadAndUpdateRequest;
-
     }
 
     private void assertUpdateAttributesMessage(final Message sendMessage) {
         assertEventMessage(sendMessage);
 
-        assertEquals("The topic of the event should contain REQUEST_ATTRIBUTES_UPDATE",
-                EventTopic.REQUEST_ATTRIBUTES_UPDATE,
-                sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TOPIC));
+        assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TOPIC)).isEqualTo(EventTopic.REQUEST_ATTRIBUTES_UPDATE)
+                .as("The topic of the event should contain REQUEST_ATTRIBUTES_UPDATE");
     }
 
     private void assertEventMessage(final Message sendMessage) {
-        assertNotNull("The message should not be null", sendMessage);
-
-        assertEquals("The value of the message header THING_ID should be " + CONTROLLER_ID, CONTROLLER_ID,
-                sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.THING_ID));
-        assertEquals("The value of the message header TYPE should be EVENT", MessageType.EVENT,
-                sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TYPE));
-        assertEquals("The content type message should be " + MessageProperties.CONTENT_TYPE_JSON,
-                MessageProperties.CONTENT_TYPE_JSON, sendMessage.getMessageProperties().getContentType());
+        assertThat(sendMessage).isNotNull().as("The message should not be null");
+
+        assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.THING_ID)).isEqualTo(CONTROLLER_ID)
+            .as("The value of the message header THING_ID should be " + CONTROLLER_ID);
+        assertThat(sendMessage.getMessageProperties().getHeaders().get(MessageHeaderKey.TYPE)).isEqualTo(MessageType.EVENT)
+                .as("The value of the message header TYPE should be EVENT");
+        assertThat(sendMessage.getMessageProperties().getContentType()).isEqualTo(MessageProperties.CONTENT_TYPE_JSON)
+                .as("The content type message should be " + MessageProperties.CONTENT_TYPE_JSON);
     }
 
     protected Message createArgumentCapture(final URI uri) {

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java

@@ -15,6 +15,7 @@
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -59,13 +60,13 @@
 import org.eclipse.hawkbit.security.SecurityTokenGenerator;
 import org.eclipse.hawkbit.security.SystemSecurityContext;
 import org.eclipse.hawkbit.tenancy.TenantAware;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
@@ -79,7 +80,7 @@
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 @Feature("Component Tests - Device Management Federation API")
 @Story("AmqpMessage Handler Service Test")
 public class AmqpMessageHandlerServiceTest {
@@ -144,15 +145,14 @@ public class AmqpMessageHandlerServiceTest {
     @Captor
     private ArgumentCaptor<UpdateMode> modeCaptor;
 
-    @Before
+    @BeforeEach
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public void before() throws Exception {
         messageConverter = new Jackson2JsonMessageConverter();
-        when(rabbitTemplate.getMessageConverter()).thenReturn(messageConverter);
-        when(artifactManagementMock.findFirstBySHA1(SHA1)).thenReturn(Optional.empty());
+        lenient().when(rabbitTemplate.getMessageConverter()).thenReturn(messageConverter);
         final TenantConfigurationValue multiAssignmentConfig = TenantConfigurationValue.builder().value(Boolean.FALSE)
                 .global(Boolean.FALSE).build();
-        when(tenantConfigurationManagement.getConfigurationValue(MULTI_ASSIGNMENTS_ENABLED, Boolean.class))
+        lenient().when(tenantConfigurationManagement.getConfigurationValue(MULTI_ASSIGNMENTS_ENABLED, Boolean.class))
                 .thenReturn(multiAssignmentConfig);
 
         final SecurityContextTenantAware tenantAware = new SecurityContextTenantAware();

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java

@@ -10,18 +10,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import org.eclipse.hawkbit.dmf.json.model.DmfActionStatus;
 import org.eclipse.hawkbit.dmf.json.model.DmfActionUpdateStatus;
 import org.eclipse.hawkbit.repository.event.remote.entity.TargetCreatedEvent;
 import org.eclipse.hawkbit.repository.test.matcher.Expect;
 import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -32,7 +34,7 @@
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 @Feature("Component Tests - Device Management Federation API")
 @Story("Base Amqp Service Test")
 public class BaseAmqpServiceTest {
@@ -42,11 +44,10 @@ public class BaseAmqpServiceTest {
 
     private BaseAmqpService baseAmqpService;
 
-    @Before
+    @BeforeEach
     public void setup() {
-        when(rabbitTemplate.getMessageConverter()).thenReturn(new Jackson2JsonMessageConverter());
+        lenient().when(rabbitTemplate.getMessageConverter()).thenReturn(new Jackson2JsonMessageConverter());
         baseAmqpService = new BaseAmqpService(rabbitTemplate);
-
     }
 
     @Test