Fix bugs introduced by new code

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / externalapi / servlet / ExternalRefServletTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
index 22f5de6..52d8ce9 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
@@ -143,6 +143,8 @@ class ExternalRefServletTest extends JerseyTest {
     private static final User otherUser = new User("other", "other", "other", "other@email.com", Role.DESIGNER.name(),
         System.currentTimeMillis());
 
+    @Mock
+    private IdMapper idMapper;
     @Mock
     public WebAppContextWrapper webAppContextWrapper;
     @Mock
@@ -182,7 +184,6 @@ class ExternalRefServletTest extends JerseyTest {
 
     @BeforeAll
     public void setup() {
-        MockitoAnnotations.initMocks(this);
 
         //Needed for User Authorization
         //========================================================================================================================
@@ -238,6 +239,7 @@ class ExternalRefServletTest extends JerseyTest {
     @BeforeEach
     public void before() throws Exception {
         super.setUp();
+        MockitoAnnotations.openMocks(this);
 
         when(resourceComponentMock.getVersion()).thenReturn(VERSION);
         when(resourceComponentMock.getUniqueId()).thenReturn(resourceVertexUuid);
@@ -663,8 +665,6 @@ class ExternalRefServletTest extends JerseyTest {
         private GraphVertex resourceVertex;
         private ExternalReferencesOperation externalReferenceOperation;
         private HealingJanusGraphDao janusGraphDao;
-        @Mock
-        private IdMapper idMapper;
 
         @Bean
         ExternalRefsServlet externalRefsServlet() {