Migrate to Junit5

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I00d5d08f0ad3ceeec94286f6500c4592585e7e34
Issue-ID: SDC-4148

1 files changed, 16 insertions, 17 deletions

diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpRequestFactoryTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpRequestFactoryTest.java
index ba42703..c9eb4b3 100644
--- a/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpRequestFactoryTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpRequestFactoryTest.java
@@ -20,20 +20,19 @@
 package org.onap.sdc.http;
 
 
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class HttpRequestFactoryTest {
+class HttpRequestFactoryTest {
 
     private static final String URL = "https://127.0.0.1:8080/target";
     private static final String EXPECTED_AUTHORIZATION_VALUE = "Basic dXNlcjpwYXNzd29yZA==";
@@ -41,7 +40,7 @@ public class HttpRequestFactoryTest {
     private static final String HEADER_KEY_2 = "key2";
     private static final String HEADER_VALUE_1 = "value1";
     private static final String HEADER_VALUE_2 = "value2";
-    private static final Map<String, String> HEADERS = new HashMap<String, String>(){
+    private static final Map<String, String> HEADERS = new HashMap<String, String>() {
         {
             put(HEADER_KEY_1, HEADER_VALUE_1);
             put(HEADER_KEY_2, HEADER_VALUE_2);
@@ -51,22 +50,22 @@ public class HttpRequestFactoryTest {
     private HttpRequestFactory testObj = new HttpRequestFactory("user", "password");
 
     @Test
-    public void shouldCreateValidGetHttpRequest() throws URISyntaxException {
+    void shouldCreateValidGetHttpRequest() throws URISyntaxException {
         // when
         final HttpGet httpGetRequest = testObj.createHttpGetRequest(URL, HEADERS);
 
         // then
         assertThat(httpGetRequest.getURI()).isEqualTo(new URI(URL));
         assertThat(httpGetRequest.getFirstHeader(HEADER_KEY_1).getValue())
-                .isEqualTo(HEADER_VALUE_1);
+            .isEqualTo(HEADER_VALUE_1);
         assertThat(httpGetRequest.getFirstHeader(HEADER_KEY_2).getValue())
-                .isEqualTo(HEADER_VALUE_2);
+            .isEqualTo(HEADER_VALUE_2);
         assertThat(httpGetRequest.getFirstHeader(HttpRequestFactory.AUTHORIZATION).getValue())
-                .isEqualTo(EXPECTED_AUTHORIZATION_VALUE);
+            .isEqualTo(EXPECTED_AUTHORIZATION_VALUE);
     }
 
     @Test
-    public void shouldCreateValidPostHttpRequest() throws URISyntaxException {
+    void shouldCreateValidPostHttpRequest() throws URISyntaxException {
         // given
         final HttpEntity httpEntity = mock(HttpEntity.class);
 
@@ -77,10 +76,10 @@ public class HttpRequestFactoryTest {
         assertThat(httpPostRequest.getURI()).isEqualTo(new URI(URL));
         assertThat(httpPostRequest.getEntity()).isEqualTo(httpEntity);
         assertThat(httpPostRequest.getFirstHeader(HEADER_KEY_1).getValue())
-                .isEqualTo(HEADER_VALUE_1);
+            .isEqualTo(HEADER_VALUE_1);
         assertThat(httpPostRequest.getFirstHeader(HEADER_KEY_2).getValue())
-                .isEqualTo(HEADER_VALUE_2);
+            .isEqualTo(HEADER_VALUE_2);
         assertThat(httpPostRequest.getFirstHeader(HttpRequestFactory.AUTHORIZATION).getValue())
-                .isEqualTo(EXPECTED_AUTHORIZATION_VALUE);
+            .isEqualTo(EXPECTED_AUTHORIZATION_VALUE);
     }
 }