Fixed tests as requested in comments

Author: TetyanaYahodska

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

@@ -27,15 +27,14 @@
 import com.google.cloud.tpu.v2.CreateNodeRequest;
 import com.google.cloud.tpu.v2.TpuClient;
 import com.google.cloud.tpu.v2.TpuSettings;
-import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.MockedStatic;
 
 @RunWith(JUnit4.class)
-@Timeout(value = 3, unit = TimeUnit.MINUTES)
+@Timeout(value = 3)
 public class CreateTpuIT {
   private static final String PROJECT_ID = "project-id";
   private static final String ZONE = "asia-east1-c";
@@ -45,8 +44,8 @@ public class CreateTpuIT {
 
   @Test
   public void testCreateTpuVm() throws Exception {
-    TpuClient mockTpuClient = mock(TpuClient.class);
     try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
+      TpuClient mockTpuClient = mock(TpuClient.class);
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);
 

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

@@ -16,7 +16,7 @@
 
 package tpu;
 
-
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
@@ -31,16 +31,18 @@
 import com.google.cloud.tpu.v2alpha1.QueuedResourceName;
 import com.google.cloud.tpu.v2alpha1.TpuClient;
 import com.google.cloud.tpu.v2alpha1.TpuSettings;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
+import java.io.PrintStream;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.MockedStatic;
 
 @RunWith(JUnit4.class)
-@Timeout(value = 3, unit = TimeUnit.MINUTES)
+@Timeout(value = 3)
 public class QueuedResourceIT {
   private static final String PROJECT_ID = "project-id";
   private static final String ZONE = "europe-west4-a";
@@ -49,11 +51,18 @@ public class QueuedResourceIT {
   private static final String TPU_SOFTWARE_VERSION = "tpu-vm-tf-2.14.1";
   private static final String QUEUED_RESOURCE_NAME = "queued-resource";
   private static final String NETWORK_NAME = "default";
+  private ByteArrayOutputStream bout;
+
+  @Before
+  public void setUp() {
+    bout = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(bout));
+  }
 
   @Test
   public void testCreateQueuedResourceWithSpecifiedNetwork() throws Exception {
-    TpuClient mockTpuClient = mock(TpuClient.class);
     try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
+      TpuClient mockTpuClient = mock(TpuClient.class);
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);
 
@@ -71,12 +80,12 @@ public void testCreateQueuedResourceWithSpecifiedNetwork() throws Exception {
 
   @Test
   public void testGetQueuedResource() throws IOException {
-    GetQueuedResource mockGetQueuedResource = mock(GetQueuedResource.class);
-    QueuedResource mockQueuedResource = mock(QueuedResource.class);
     try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
+      QueuedResource mockQueuedResource = mock(QueuedResource.class);
       mockedTpuClient.when(TpuClient::create).thenReturn(mock(TpuClient.class));
       when(mock(TpuClient.class)
           .getQueuedResource(any(QueuedResourceName.class))).thenReturn(mockQueuedResource);
+      GetQueuedResource mockGetQueuedResource = mock(GetQueuedResource.class);
 
       GetQueuedResource.getQueuedResource(PROJECT_ID, ZONE, NODE_NAME);
 
@@ -87,16 +96,18 @@ public void testGetQueuedResource() throws IOException {
 
   @Test
   public void testDeleteTpuVm() {
-    TpuClient mockTpuClient = mock(TpuClient.class);
     try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
+      TpuClient mockTpuClient = mock(TpuClient.class);
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);
 
       OperationFuture mockFuture = mock(OperationFuture.class);
       when(mockTpuClient.deleteQueuedResourceAsync(any(DeleteQueuedResourceRequest.class)))
           .thenReturn(mockFuture);
       DeleteForceQueuedResource.deleteForceQueuedResource(PROJECT_ID, ZONE, QUEUED_RESOURCE_NAME);
+      String output = bout.toString();
 
+      assertThat(output).contains("Deleted Queued Resource:");
       verify(mockTpuClient, times(1))
           .deleteQueuedResourceAsync(any(DeleteQueuedResourceRequest.class));
     }

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

@@ -31,27 +31,26 @@
 import com.google.cloud.tpu.v2.TpuSettings;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.MockedStatic;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
-@Timeout(value = 3, unit = TimeUnit.MINUTES)
+@RunWith(JUnit4.class)
+@Timeout(value = 3)
 public class TpuVmIT {
   private static final String PROJECT_ID = "project-id";
   private static final String ZONE = "asia-east1-c";
   private static final String NODE_NAME = "test-tpu";
 
   @Test
   public void testGetTpuVm() throws IOException {
-    GetTpuVm mockGetTpuVm = mock(GetTpuVm.class);
-    Node mockNode = mock(Node.class);
     try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
+      Node mockNode = mock(Node.class);
       mockedTpuClient.when(TpuClient::create).thenReturn(mock(TpuClient.class));
       when(mock(TpuClient.class).getNode(any(NodeName.class))).thenReturn(mockNode);
+      GetTpuVm mockGetTpuVm = mock(GetTpuVm.class);
 
       GetTpuVm.getTpuVm(PROJECT_ID, ZONE, NODE_NAME);
 
@@ -62,8 +61,8 @@ public void testGetTpuVm() throws IOException {
 
   @Test
   public void testDeleteTpuVm() throws IOException, ExecutionException, InterruptedException {
-    TpuClient mockTpuClient = mock(TpuClient.class);
     try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
+      TpuClient mockTpuClient = mock(TpuClient.class);
       mockedTpuClient.when(() -> TpuClient.create(any(TpuSettings.class)))
           .thenReturn(mockTpuClient);