Fixed imports

Author: TetyanaYahodska

tpu/src/test/java/tpu/CreateTpuIT.java

@@ -18,6 +18,7 @@
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -32,7 +33,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.MockedStatic;
-import org.mockito.Mockito;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 3, unit = TimeUnit.MINUTES)
@@ -46,7 +46,7 @@ public class CreateTpuIT {
   @Test
   public void testCreateTpuVm() throws Exception {
     TpuClient mockTpuClient = mock(TpuClient.class);
-    try (MockedStatic<TpuClient> mockedTpuClient = Mockito.mockStatic(TpuClient.class)) {
+    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);
 
@@ -59,7 +59,6 @@ public void testCreateTpuVm() throws Exception {
 
       verify(mockTpuClient, times(1))
           .createNodeAsync(any(CreateNodeRequest.class));
-      verify(mockTpuClient, times(1)).close();
     }
   }
 }

tpu/src/test/java/tpu/QueuedResourceIT.java

@@ -19,6 +19,7 @@
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -37,7 +38,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.MockedStatic;
-import org.mockito.Mockito;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 3, unit = TimeUnit.MINUTES)
@@ -53,7 +53,7 @@ public class QueuedResourceIT {
   @Test
   public void testCreateQueuedResourceWithSpecifiedNetwork() throws Exception {
     TpuClient mockTpuClient = mock(TpuClient.class);
-    try (MockedStatic<TpuClient> mockedTpuClient = Mockito.mockStatic(TpuClient.class)) {
+    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);
 
@@ -73,14 +73,13 @@ public void testCreateQueuedResourceWithSpecifiedNetwork() throws Exception {
   public void testGetQueuedResource() throws IOException {
     GetQueuedResource mockGetQueuedResource = mock(GetQueuedResource.class);
     QueuedResource mockQueuedResource = mock(QueuedResource.class);
-    try (MockedStatic<TpuClient> mockedTpuClient = Mockito.mockStatic(TpuClient.class)) {
+    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
       mockedTpuClient.when(TpuClient::create).thenReturn(mock(TpuClient.class));
       when(mock(TpuClient.class)
           .getQueuedResource(any(QueuedResourceName.class))).thenReturn(mockQueuedResource);
 
       GetQueuedResource.getQueuedResource(PROJECT_ID, ZONE, NODE_NAME);
 
-      // Assertions
       verify(mockGetQueuedResource, times(1))
           .getQueuedResource(PROJECT_ID, ZONE, NODE_NAME);
     }
@@ -89,7 +88,7 @@ public void testGetQueuedResource() throws IOException {
   @Test
   public void testDeleteTpuVm() {
     TpuClient mockTpuClient = mock(TpuClient.class);
-    try (MockedStatic<TpuClient> mockedTpuClient = Mockito.mockStatic(TpuClient.class)) {
+    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);
 

tpu/src/test/java/tpu/TpuVmIT.java

@@ -18,6 +18,7 @@
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -35,7 +36,6 @@
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.mockito.MockedStatic;
-import org.mockito.Mockito;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
@@ -49,13 +49,12 @@ public class TpuVmIT {
   public void testGetTpuVm() throws IOException {
     GetTpuVm mockGetTpuVm = mock(GetTpuVm.class);
     Node mockNode = mock(Node.class);
-    try (MockedStatic<TpuClient> mockedTpuClient = Mockito.mockStatic(TpuClient.class)) {
+    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
       mockedTpuClient.when(TpuClient::create).thenReturn(mock(TpuClient.class));
       when(mock(TpuClient.class).getNode(any(NodeName.class))).thenReturn(mockNode);
 
       GetTpuVm.getTpuVm(PROJECT_ID, ZONE, NODE_NAME);
 
-      // Assertions
       verify(mockGetTpuVm, times(1))
           .getTpuVm(PROJECT_ID, ZONE, NODE_NAME);
     }
@@ -64,7 +63,7 @@ public void testGetTpuVm() throws IOException {
   @Test
   public void testDeleteTpuVm() throws IOException, ExecutionException, InterruptedException {
     TpuClient mockTpuClient = mock(TpuClient.class);
-    try (MockedStatic<TpuClient> mockedTpuClient = Mockito.mockStatic(TpuClient.class)) {
+    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);