1 files changed, 39 insertions, 33 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/impl/ServletUtilsTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/impl/ServletUtilsTest.java
index c9983183a7..4334b491e0 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/impl/ServletUtilsTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/impl/ServletUtilsTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,45 +21,51 @@
 package org.openecomp.sdc.be.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.google.gson.Gson;
-
-import mockit.Deencapsulation;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.google.gson.GsonBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:application-context-test.xml"})
 public class ServletUtilsTest {
-	@Autowired
-	ServletUtils servletUtils;
 
-	@Test
-	public void testCtrServletUtils() {
-		// default test
-		assertThat(servletUtils)
-				.isNotNull()
-				.isInstanceOf(ServletUtils.class);
+    private ServletUtils servletUtils;
+    private ComponentsUtils componentsUtils;
+    private UserBusinessLogic userBusinessLogic;
+    private Gson gson;
 
-		ComponentsUtils componentsUtils = Deencapsulation.getField(servletUtils, "componentsUtils");
-		UserBusinessLogic userBusinessLogic = Deencapsulation.getField(servletUtils, "userAdmin");
-		Gson gson = Deencapsulation.getField(servletUtils, "gson");
+    @BeforeEach
+    public void setup() {
+        servletUtils = mock(ServletUtils.class);
+        userBusinessLogic = mock(UserBusinessLogic.class);
+        componentsUtils = mock(ComponentsUtils.class);
+        gson = new GsonBuilder().setPrettyPrinting().create();
+        when(servletUtils.getComponentsUtils()).thenReturn(componentsUtils);
+        when(servletUtils.getGson()).thenReturn(gson);
+        when(servletUtils.getUserAdmin()).thenReturn(userBusinessLogic);
+    }
 
-		assertThat(gson)
-				.isNotNull()
-				.isInstanceOf(Gson.class)
-				.isEqualTo(servletUtils.getGson());
-		assertThat(componentsUtils)
-				.isNotNull()
-				.isInstanceOf(ComponentsUtils.class)
-				.isEqualTo(servletUtils.getComponentsUtils());
-		assertThat(userBusinessLogic)
-				.isNotNull()
-				.isInstanceOf(UserBusinessLogic.class)
-				.isEqualTo(servletUtils.getUserAdmin());
-	}
+    @Test
+    public void testCtrServletUtils() {
+        assertThat(servletUtils)
+            .isNotNull()
+            .isInstanceOf(ServletUtils.class);
+        assertThat(gson)
+            .isNotNull()
+            .isInstanceOf(Gson.class)
+            .isEqualTo(servletUtils.getGson());
+        assertThat(componentsUtils)
+            .isNotNull()
+            .isInstanceOf(ComponentsUtils.class)
+            .isEqualTo(servletUtils.getComponentsUtils());
+        assertThat(userBusinessLogic)
+            .isNotNull()
+            .isInstanceOf(UserBusinessLogic.class)
+            .isEqualTo(servletUtils.getUserAdmin());
+    }
 }