Fixed test

Author: TetyanaYahodska

tpu/src/main/java/tpu/ListTpuVms.java

@@ -19,7 +19,6 @@
 //[START tpu_vm_list]
 import com.google.cloud.tpu.v2.ListNodesRequest;
 import com.google.cloud.tpu.v2.TpuClient;
-import com.google.cloud.tpu.v2.TpuClient.ListNodesPagedResponse;
 import java.io.IOException;
 
 public class ListTpuVms {
@@ -37,15 +36,16 @@ public static void main(String[] args) throws IOException {
   }
 
   // Lists TPU VMs in the specified zone.
-  public static ListNodesPagedResponse listTpuVms(String projectId, String zone)
+  public static TpuClient.ListNodesPage listTpuVms(String projectId, String zone)
       throws IOException {
     // Initialize client that will be used to send requests. This client only needs to be created
     // once, and can be reused for multiple requests.
     try (TpuClient tpuClient = TpuClient.create()) {
       String parent = String.format("projects/%s/locations/%s", projectId, zone);
 
       ListNodesRequest request = ListNodesRequest.newBuilder().setParent(parent).build();
-      return tpuClient.listNodes(request);
+
+      return tpuClient.listNodes(request).getPage();
     }
   }
 }

tpu/src/test/java/tpu/GetTpuVmIT.java renamed to tpu/src/test/java/tpu/ListTpuVmsIT.java

@@ -16,41 +16,53 @@
 
 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;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.cloud.tpu.v2.ListNodesRequest;
 import com.google.cloud.tpu.v2.Node;
-import com.google.cloud.tpu.v2.NodeName;
 import com.google.cloud.tpu.v2.TpuClient;
 import java.io.IOException;
-import org.junit.jupiter.api.Test;
+import java.util.Arrays;
+import java.util.List;
+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 = 5)
-public class GetTpuVmIT {
+@Timeout(value = 3)
+public class ListTpuVmsIT {
   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 {
+  public void testListTpuVm() throws IOException {
     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);
+      Node mockNode1 = mock(Node.class);
+      Node mockNode2 = mock(Node.class);
+      List<Node> mockListNodes = Arrays.asList(mockNode1, mockNode2);
 
-      GetTpuVm.getTpuVm(PROJECT_ID, ZONE, NODE_NAME);
+      TpuClient mockTpuClient = mock(TpuClient.class);
+      mockedTpuClient.when(TpuClient::create).thenReturn(mockTpuClient);
+      TpuClient.ListNodesPagedResponse mockListNodesResponse =
+          mock(TpuClient.ListNodesPagedResponse.class);
+      when(mockTpuClient.listNodes(any(ListNodesRequest.class))).thenReturn(mockListNodesResponse);
+      TpuClient.ListNodesPage mockListNodesPage = mock(TpuClient.ListNodesPage.class);
+      when(mockListNodesResponse.getPage()).thenReturn(mockListNodesPage);
+      when(mockListNodesPage.getValues()).thenReturn(mockListNodes);
 
-      verify(mockGetTpuVm, times(1)).getTpuVm(PROJECT_ID, ZONE, NODE_NAME);
+      TpuClient.ListNodesPage returnedListNodes = ListTpuVms.listTpuVms(PROJECT_ID, ZONE);
+
+      assertThat(returnedListNodes.getValues()).isEqualTo(mockListNodes);
+      verify(mockTpuClient, times(1)).listNodes(any(ListNodesRequest.class));
     }
   }
-}
+}
+

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

@@ -27,7 +27,6 @@
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.tpu.v2.DeleteNodeRequest;
 import com.google.cloud.tpu.v2.GetNodeRequest;
-import com.google.cloud.tpu.v2.LocationName;
 import com.google.cloud.tpu.v2.Node;
 import com.google.cloud.tpu.v2.TpuClient;
 import com.google.cloud.tpu.v2.TpuSettings;
@@ -92,18 +91,4 @@ public void testDeleteTpuVm() throws IOException, ExecutionException, Interrupte
       verify(mockTpuClient, times(1)).deleteNodeAsync(any(DeleteNodeRequest.class));
     }
   }
-
-  @Test
-  public void testListTpuVm() throws IOException {
-    try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
-      TpuClient.ListNodesPagedResponse mockListNodes = mock(TpuClient.ListNodesPagedResponse.class);
-      mockedTpuClient.when(TpuClient::create).thenReturn(mock(TpuClient.class));
-      when(mock(TpuClient.class).listNodes(any(LocationName.class))).thenReturn(mockListNodes);
-      ListTpuVms mockListTpuVms = mock(ListTpuVms.class);
-
-      ListTpuVms.listTpuVms(PROJECT_ID, ZONE);
-
-      verify(mockListTpuVms, times(1)).listTpuVms(PROJECT_ID, ZONE);
-    }
-  }
 }