Feature/remove junit5 leftovers

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

@@ -17,12 +17,11 @@
 import org.apache.commons.io.IOUtils;
 import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash;
-
+import org.junit.jupiter.api.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")
@@ -34,6 +33,7 @@ public void getInputStreamOfNonExistingFileThrowsException() {
         final File file = new File("fileWhichTotalDoesNotExists");
         final ArtifactFilesystem underTest = new ArtifactFilesystem(file, "fileWhichTotalDoesNotExists",
                 new DbArtifactHash("1", "2", "3"), 0L, null);
+
         try {
             underTest.getFileInputStream();
             Assertions.fail("Expected a FileNotFoundException because file does not exists");

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

@@ -9,8 +9,7 @@
 package org.eclipse.hawkbit.amqp;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.lenient;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.when;
 
 import org.eclipse.hawkbit.dmf.json.model.DmfActionStatus;
@@ -22,7 +21,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
@@ -46,67 +44,63 @@ public class BaseAmqpServiceTest {
 
     @BeforeEach
     public void setup() {
-        lenient().when(rabbitTemplate.getMessageConverter()).thenReturn(new Jackson2JsonMessageConverter());
         baseAmqpService = new BaseAmqpService(rabbitTemplate);
     }
 
     @Test
     @Description("Verify that the message conversion works")
     public void convertMessageTest() {
         final DmfActionUpdateStatus actionUpdateStatus = createActionStatus();
+        when(rabbitTemplate.getMessageConverter()).thenReturn(new Jackson2JsonMessageConverter());
 
         final Message message = rabbitTemplate.getMessageConverter().toMessage(actionUpdateStatus,
                 createJsonProperties());
         final DmfActionUpdateStatus convertedActionUpdateStatus = baseAmqpService.convertMessage(message,
                 DmfActionUpdateStatus.class);
 
         assertThat(convertedActionUpdateStatus).isEqualToComparingFieldByField(actionUpdateStatus);
-
     }
 
     @Test
     @Description("Tests invalid null message content")
     @ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 0) })
     public void convertMessageWithNullContent() {
-        try {
-            baseAmqpService.convertMessage(new Message(null, createJsonProperties()), DmfActionUpdateStatus.class);
-            fail("Expected MessageConversionException for inavlid JSON");
-        } catch (final MessageConversionException e) {
-            // expected
-        }
-
+        final Message message = createMessage(null);
+        assertThatExceptionOfType(MessageConversionException.class)
+                .as("Expected MessageConversionException for invalid JSON")
+                .isThrownBy(() -> baseAmqpService.convertMessage(message, DmfActionUpdateStatus.class));
     }
 
     @Test
     @Description("Tests invalid empty message content")
     @ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 0) })
     public void updateActionStatusWithEmptyContent() {
-        try {
-            baseAmqpService.convertMessage(new Message("".getBytes(), createJsonProperties()),
-                    DmfActionUpdateStatus.class);
-            fail("Expected MessageConversionException for inavlid JSON");
-        } catch (final MessageConversionException e) {
-            // expected
-        }
-    }
-
-    private MessageProperties createJsonProperties() {
-        final MessageProperties messageProperties = new MessageProperties();
-        messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON);
-        return messageProperties;
+        final Message message = createMessage("".getBytes());
+        assertThatExceptionOfType(MessageConversionException.class)
+                .as("Expected MessageConversionException for invalid JSON")
+                .isThrownBy(() -> baseAmqpService.convertMessage(message, DmfActionUpdateStatus.class));
     }
 
     @Test
     @Description("Tests invalid json message content")
     @ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 0) })
     public void updateActionStatusWithInvalidJsonContent() {
-        try {
-            baseAmqpService.convertMessage(new Message("Invalid Json".getBytes(), createJsonProperties()),
-                    DmfActionUpdateStatus.class);
-            fail("Expected MessageConversionException for inavlid JSON");
-        } catch (final MessageConversionException e) {
-            // expected
-        }
+        final Message message = createMessage("Invalid Json".getBytes());
+        when(rabbitTemplate.getMessageConverter()).thenReturn(new Jackson2JsonMessageConverter());
+
+        assertThatExceptionOfType(MessageConversionException.class)
+                .as("Expected MessageConversionException for invalid JSON")
+                .isThrownBy(() -> baseAmqpService.convertMessage(message, DmfActionUpdateStatus.class));
+    }
+
+    private Message createMessage(final byte[] body) {
+        return new Message(body, createJsonProperties());
+    }
+
+    private MessageProperties createJsonProperties() {
+        final MessageProperties messageProperties = new MessageProperties();
+        messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON);
+        return messageProperties;
     }
 
     private DmfActionUpdateStatus createActionStatus() {

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/ReplyToListener.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.integration.listener;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.Collections;

hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java

@@ -12,9 +12,8 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.when;
 
-import java.util.Arrays;
+import java.util.Collections;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -31,7 +30,6 @@
 @Feature("Unit Tests - Security")
 @Story("PreAuthToken Source TrustAuthentication Provider Test")
 @ExtendWith(MockitoExtension.class)
-// TODO: create description annotations
 public class PreAuthTokenSourceTrustAuthenticationProviderTest {
 
     private static final String REQUEST_SOURCE_IP = "127.0.0.1";
@@ -49,17 +47,11 @@ public void principalAndCredentialsNotTheSameThrowsAuthenticationException() {
         final String principal = "controllerIdURL";
         final String credentials = "controllerIdHeader";
         final PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal,
-                Arrays.asList(credentials));
+                Collections.singletonList(credentials));
         token.setDetails(webAuthenticationDetailsMock);
 
-        // test, should throw authentication exception
-        try {
-            underTestWithoutSourceIpCheck.authenticate(token);
-            Assertions.fail("Should not work with wrong credentials");
-        } catch (final BadCredentialsException e) {
-
-        }
-
+        assertThatExceptionOfType(BadCredentialsException.class).as("Should not work with wrong credentials")
+                .isThrownBy(() -> underTestWithoutSourceIpCheck.authenticate(token));
     }
 
     @Test
@@ -68,7 +60,7 @@ public void principalAndCredentialsAreTheSameWithNoSourceIpCheckIsSuccessful() {
         final String principal = "controllerId";
         final String credentials = "controllerId";
         final PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal,
-                Arrays.asList(credentials));
+                Collections.singletonList(credentials));
         token.setDetails(webAuthenticationDetailsMock);
 
         final Authentication authenticate = underTestWithoutSourceIpCheck.authenticate(token);
@@ -77,33 +69,27 @@ public void principalAndCredentialsAreTheSameWithNoSourceIpCheckIsSuccessful() {
 
     @Test
     @Description("Testing that the controllerId in the URI request match with the controllerId in the request header but the request are not coming from a trustful source.")
-    public void priniciapAndCredentialsAreTheSameButSourceIpRequestNotMatching() {
+    public void principalAndCredentialsAreTheSameButSourceIpRequestNotMatching2() {
         final String remoteAddress = "192.168.1.1";
         final String principal = "controllerId";
         final String credentials = "controllerId";
         final PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal,
-                Arrays.asList(credentials));
+                Collections.singletonList(credentials));
         token.setDetails(webAuthenticationDetailsMock);
 
         when(webAuthenticationDetailsMock.getRemoteAddress()).thenReturn(remoteAddress);
 
-        // test, should throw authentication exception
-
-        try {
-            underTestWithSourceIpCheck.authenticate(token);
-            Assertions.fail("as source is not trusted.");
-        } catch (final InsufficientAuthenticationException e) {
-
-        }
+        assertThatExceptionOfType(InsufficientAuthenticationException.class).as("as source is not trusted.")
+                .isThrownBy(() -> underTestWithSourceIpCheck.authenticate(token));
     }
 
     @Test
-    @Description("Testing that the controllerId in the URI request match with the controllerId in the request header and the source Ip is matching the allowed remote IP address.")
-    public void priniciapAndCredentialsAreTheSameAndSourceIpIsTrusted() {
+    @Description("Testing that the controllerId in the URI request match with the controllerId in the request header and the source IP is matching the allowed remote IP address.")
+    public void principalAndCredentialsAreTheSameAndSourceIpIsTrusted() {
         final String principal = "controllerId";
         final String credentials = "controllerId";
         final PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal,
-                Arrays.asList(credentials));
+                Collections.singletonList(credentials));
         token.setDetails(webAuthenticationDetailsMock);
 
         when(webAuthenticationDetailsMock.getRemoteAddress()).thenReturn(REQUEST_SOURCE_IP);
@@ -114,13 +100,14 @@ public void priniciapAndCredentialsAreTheSameAndSourceIpIsTrusted() {
     }
 
     @Test
-    public void priniciapAndCredentialsAreTheSameAndSourceIpIsWithinList() {
+    @Description("Testing that the controllerId in the URI request match with the controllerId in the request header and the source IP matches one of the allowed remote IP addresses.")
+    public void principalAndCredentialsAreTheSameAndSourceIpIsWithinList() {
         final String[] trustedIPAddresses = new String[] { "192.168.1.1", "192.168.1.2", REQUEST_SOURCE_IP,
                 "192.168.1.3" };
         final String principal = "controllerId";
         final String credentials = "controllerId";
         final PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal,
-                Arrays.asList(credentials));
+                Collections.singletonList(credentials));
         token.setDetails(webAuthenticationDetailsMock);
 
         when(webAuthenticationDetailsMock.getRemoteAddress()).thenReturn(REQUEST_SOURCE_IP);
@@ -134,19 +121,21 @@ public void priniciapAndCredentialsAreTheSameAndSourceIpIsWithinList() {
     }
 
     @Test
+    @Description("Testing that the controllerId in the URI request match with the controllerId in the request header and the source IP does not match any of the allowed remote IP addresses.")
     public void principalAndCredentialsAreTheSameSourceIpListNotMatches() {
         final String[] trustedIPAddresses = new String[] { "192.168.1.1", "192.168.1.2", "192.168.1.3" };
         final String principal = "controllerId";
         final String credentials = "controllerId";
         final PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal,
-                Arrays.asList(credentials));
+                Collections.singletonList(credentials));
         token.setDetails(webAuthenticationDetailsMock);
 
         when(webAuthenticationDetailsMock.getRemoteAddress()).thenReturn(REQUEST_SOURCE_IP);
 
         final PreAuthTokenSourceTrustAuthenticationProvider underTestWithList = new PreAuthTokenSourceTrustAuthenticationProvider(
                 trustedIPAddresses);
 
-        assertThatExceptionOfType(InsufficientAuthenticationException.class).isThrownBy(()-> underTestWithList.authenticate(token));
+        assertThatExceptionOfType(InsufficientAuthenticationException.class)
+                .isThrownBy(() -> underTestWithList.authenticate(token));
     }
 }

hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java

@@ -9,11 +9,11 @@
 package org.eclipse.hawkbit.event;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.repository.event.remote.entity.RemoteEntityEvent;
 import org.eclipse.hawkbit.repository.event.remote.entity.TargetCreatedEvent;
 import org.eclipse.hawkbit.repository.model.Target;
@@ -65,12 +65,11 @@ public void successfullySerializeAndDeserializeEvent() {
     @Description("Verifies that a MessageConversationException is thrown on missing event-type information encoding")
     public void missingEventTypeMappingThrowsMessageConversationException() {
         final DummyRemoteEntityEvent dummyEvent = new DummyRemoteEntityEvent(targetMock, "applicationId");
-        try {
-            underTest.convertToInternal(dummyEvent, new MessageHeaders(new HashMap<>()), null);
-            Assertions.fail("Missing MessageConversationException for un-defined event-type");
-        } catch (final MessageConversionException e) {
-            // expected exception
-        }
+        final MessageHeaders messageHeaders = new MessageHeaders(new HashMap<>());
+
+        assertThatExceptionOfType(MessageConversionException.class)
+                .as("Missing MessageConversationException for un-defined event-type")
+                .isThrownBy(() -> underTest.convertToInternal(dummyEvent, messageHeaders, null));
     }
 
     /**

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEventTest.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.repository.event.remote;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Map;
 

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java

@@ -17,6 +17,8 @@
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
+
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java

@@ -9,7 +9,7 @@
 package org.eclipse.hawkbit.repository.event.remote.entity;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.Constructor;
 import java.util.Arrays;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java

@@ -10,8 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -259,8 +258,7 @@ public void hardDeleteSoftwareModule() throws IOException {
 
     /**
      * Test method for
-     * {@link org.eclipse.hawkbit.repository.ArtifactManagement#delete(long)}
-     * .
+     * {@link org.eclipse.hawkbit.repository.ArtifactManagement#delete(long)} .
      * 
      * @throws IOException
      */
@@ -452,12 +450,9 @@ public void loadStreamOfArtifact() throws IOException {
     @WithUser(allSpPermissions = true, removeFromAllPermission = { SpPermission.DOWNLOAD_REPOSITORY_ARTIFACT })
     @Description("Trys and fails to load an artifact without required permission. Checks if expected InsufficientPermissionException is thrown.")
     public void loadArtifactBinaryWithoutDownloadArtifactThrowsPermissionDenied() {
-        try {
-            artifactManagement.loadArtifactBinary("123");
-            fail("Should not have worked with missing permission.");
-        } catch (final InsufficientPermissionException e) {
-
-        }
+        assertThatExceptionOfType(InsufficientPermissionException.class)
+                .as("Should not have worked with missing permission.")
+                .isThrownBy(() -> artifactManagement.loadArtifactBinary("123"));
     }
 
     @Test
@@ -527,8 +522,8 @@ private void assertEqualFileContents(final Optional<AbstractDbArtifact> artifact
             throws IOException {
         try (final InputStream inputStream = artifactManagement.loadArtifactBinary(artifact.get().getHashes().getSha1())
                 .get().getFileInputStream()) {
-            assertTrue("The stored binary matches the given binary",
-                    IOUtils.contentEquals(new ByteArrayInputStream(randomBytes), inputStream));
+            assertTrue(IOUtils.contentEquals(new ByteArrayInputStream(randomBytes), inputStream),
+                    "The stored binary matches the given binary");
         }
     }