Fix Mockito initMocks deprecation warnings

This method is replaced by openMocks(testClass).close().
The close method should however only be called after completed usage
of testClass.
If using static-mocks or custom MockMakers, using this method might
cause misbehavior of mocks injected into the test class.

https://www.javadoc.io/doc/org.mockito/mockito-core/3.4.0/org/mockito/MockitoAnnotations.html

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic7090902319a172606383b5352d4275172de9219

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/RendererProviderTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/RendererProviderTest.java
index 09c27098e39e5d1fdc194fce1f606018d40c9456..cc9ad40bf53ba7dd76100b2e4f516fd84de93062 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/RendererProviderTest.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/RendererProviderTest.java
@@ -11,6 +11,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -35,11 +36,11 @@ public class RendererProviderTest extends AbstractTest {
     @Mock
     DeviceRendererRPCImpl deviceRendererRPC;
 
+    private AutoCloseable closeable;
 
     @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-
+    public void openMocks() {
+        closeable = MockitoAnnotations.openMocks(this);
     }
 
     @Test
@@ -55,5 +56,8 @@ public class RendererProviderTest extends AbstractTest {
                 .registerRpcImplementation(any(), any(DeviceRendererRPCImpl.class));
     }
 
+    @After public void releaseMocks() throws Exception {
+        closeable.close();
+    }
 
 }

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
index 5c78e67ee5cd0b7327bf202ed7d93f859d080840..e458df832683dc7bf58b06f801ff9785c30d36c5 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProviderTest.java
@@ -11,6 +11,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -42,10 +43,11 @@ public class ServicehandlerProviderTest  extends AbstractTest {
     @Mock
     ServicehandlerImpl servicehandler;
 
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
+    private AutoCloseable closeable;
 
+    @Before
+    public void openMocks() {
+        closeable = MockitoAnnotations.openMocks(this);
     }
 
     @Test
@@ -61,8 +63,8 @@ public class ServicehandlerProviderTest  extends AbstractTest {
                 .registerRpcImplementation(any(), any(ServicehandlerImpl.class));
     }
 
-
-
-
+    @After public void releaseMocks() throws Exception {
+        closeable.close();
+    }
 
 }

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java
index 30898a1bdcb21c58e765aa9200a5f6e96c02802f..8dab0884732a94b5227f0acdbb2cd30a055f450e 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java
@@ -11,6 +11,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,9 +47,11 @@ public class PCEServiceWrapperTest extends AbstractTest {
     @InjectMocks
     private PCEServiceWrapper pceServiceWrapperMock;
 
+    private AutoCloseable closeable;
+
     @Before
-    public void init() throws NoSuchMethodException {
-        MockitoAnnotations.initMocks(this);
+    public void openMocks() throws NoSuchMethodException {
+        closeable = MockitoAnnotations.openMocks(this);
     }
 
     @Test
@@ -160,4 +163,8 @@ public class PCEServiceWrapperTest extends AbstractTest {
                 pceResponse.getConfigurationResponseCommon().getResponseMessage());
         verify(this.pathComputationServiceMock).pathComputationRequest((any(PathComputationRequestInput.class)));
     }
+
+    @After public void releaseMocks() throws Exception {
+        closeable.close();
+    }
 }

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java
index f398c4d33c1c3b29fa8a5bed27ef2722004a37e1..55571eeb3bb9a3e766bd372b6f850ed2d687c6f7 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java
@@ -11,6 +11,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,9 +50,11 @@ public class RendererServiceWrapperTest extends AbstractTest {
     @InjectMocks
     private RendererServiceWrapper rendererServiceWrapperMock;
 
+    private AutoCloseable closeable;
+
     @Before
-    public void init() throws NoSuchMethodException {
-        MockitoAnnotations.initMocks(this);
+    public void openMocks() throws NoSuchMethodException {
+        closeable = MockitoAnnotations.openMocks(this);
     }
 
     @Test
@@ -154,4 +157,8 @@ public class RendererServiceWrapperTest extends AbstractTest {
                 org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceDeleteInput
                     .class), any());
     }
+
+    @After public void releaseMocks() throws Exception {
+        closeable.close();
+    }
 }