chore: remove call to deprecated method (GoogleCloudPlatform#4119)

olavloite · web-flow · commit 0c46b6f0297f · 2020-11-02T12:18:27.000+01:00
MockitoAnnotations.initMocks(Object) is deprecated and should be
replaced with openMocks(Object) and a call to close() on the returned
AutoClosable.
diff --git a/functions/spanner/src/test/java/functions/HelloSpannerTest.java b/functions/spanner/src/test/java/functions/HelloSpannerTest.java
@@ -33,6 +33,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.logging.Logger;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -44,6 +45,7 @@
 
 @RunWith(JUnit4.class)
 public class HelloSpannerTest {
+  private AutoCloseable mocks;
   @Mock private HttpRequest request;
   @Mock private HttpResponse response;
   @Mock private DatabaseClient client;
@@ -70,7 +72,7 @@ public static void restoreLogging() {
 
   @Before
   public void beforeTest() throws IOException {
-    MockitoAnnotations.initMocks(this);
+    mocks = MockitoAnnotations.openMocks(this);
 
     responseOut = new StringWriter();
     writerOut = new BufferedWriter(responseOut);
@@ -79,6 +81,13 @@ public void beforeTest() throws IOException {
     logHandler.clear();
   }
 
+  @After
+  public void releaseMocks() throws Exception {
+    if (mocks != null) {
+      mocks.close();
+    }
+  }
+
   private void setupSuccessfulMockQuery() {
     ReadContext readContext = mock(ReadContext.class);
     ResultSet resultSet = mock(ResultSet.class);
