Disabled HyperdiskIt tests

Author: TetyanaYahodska

compute/cloud-client/src/test/java/compute/Util.java

@@ -57,7 +57,7 @@ public abstract class Util {
   // resources
   // and delete the listed resources based on the timestamp.
 
-  private static final int DELETION_THRESHOLD_TIME_MINUTES = 45;
+  private static final int DELETION_THRESHOLD_TIME_MINUTES = 25;
   // comma separate list of zone names
   private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
   private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -32,6 +32,7 @@
 import org.junit.FixMethodOrder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
@@ -65,17 +66,16 @@ public static void setUp()
 
     Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
     Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, ZONE);
-    TimeUnit.MINUTES.sleep(2);
   }
 
   @AfterAll
   public static void cleanup()
        throws IOException, InterruptedException, ExecutionException, TimeoutException {
     // Delete all disks created for testing.
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_NAME);
-    DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
+    //DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
 
-    Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
+    //Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
   }
 
   @Test
@@ -96,6 +96,7 @@ public void stage1_CreateHyperdiskTest()
     Assert.assertTrue(hyperdisk.getZone().contains(ZONE));
   }
 
+  @Disabled
   @Test
   public void stage1_CreateHyperdiskStoragePoolTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
@@ -115,6 +116,7 @@ public void stage1_CreateHyperdiskStoragePoolTest()
     Assert.assertTrue(storagePool.getZone().contains(ZONE));
   }
 
+  @Disabled
   @Test
   public void stage2_CreateHyperdiskStoragePoolTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {

compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java

@@ -23,23 +23,28 @@
 import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.compute.v1.Reservation;
 import compute.Util;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
+import org.junit.FixMethodOrder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.junit.runners.MethodSorters;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 25, unit = TimeUnit.MINUTES)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class CrudOperationsReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
@@ -59,15 +64,11 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-    RESERVATION_NAME = "test-reserv" + javaVersion + "-"
+    RESERVATION_NAME = "test-reservation" + javaVersion + "-"
         + UUID.randomUUID().toString().substring(0, 8);
 
     // Cleanup existing stale resources.
-    Util.cleanUpExistingReservations("test-reserv"  + javaVersion, PROJECT_ID, ZONE);
-    TimeUnit.SECONDS.sleep(50);
-
-    CreateReservation.createReservation(
-        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
+    Util.cleanUpExistingReservations("test-reservation"  + javaVersion, PROJECT_ID, ZONE);
   }
 
   @AfterAll
@@ -83,7 +84,22 @@ public static void cleanup()
   }
 
   @Test
-  public void testGetReservation()
+  public void firstCreateReservationTest()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    final PrintStream out = System.out;
+    ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(stdOut));
+    CreateReservation.createReservation(
+        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
+
+    assertThat(stdOut.toString()).contains("Reservation created. Operation Status: DONE");
+
+    stdOut.close();
+    System.setOut(out);
+  }
+
+  @Test
+  public void secondGetReservationTest()
       throws IOException {
     Reservation reservation = GetReservation.getReservation(
         PROJECT_ID, RESERVATION_NAME, ZONE);
@@ -93,7 +109,7 @@ public void testGetReservation()
   }
 
   @Test
-  public void testListReservation() throws IOException {
+  public void thirdListReservationTest() throws IOException {
     List<Reservation> reservations =
         ListReservations.listReservations(PROJECT_ID, ZONE);