Fixed test

Author: TetyanaYahodska

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

@@ -29,7 +29,6 @@
 import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationsClient;
 import com.google.cloud.compute.v1.Snapshot;
-import com.google.cloud.compute.v1.StoragePool;
 import compute.deleteprotection.SetDeleteProtection;
 import compute.reservation.DeleteReservation;
 import java.io.IOException;
@@ -50,7 +49,7 @@ public abstract class Util {
   // resources
   // and delete the listed resources based on the timestamp.
 
-  private static final int DELETION_THRESHOLD_TIME_HOURS = 1;
+  private static final int DELETION_THRESHOLD_TIME_MINUTES = 30;
   // 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";
@@ -119,7 +118,7 @@ && isCreatedBeforeThresholdTime(instance.getCreationTimestamp())) {
 
   public static boolean isCreatedBeforeThresholdTime(String timestamp) {
     return OffsetDateTime.parse(timestamp).toInstant()
-        .isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_HOURS, ChronoUnit.HOURS));
+        .isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_MINUTES, ChronoUnit.MINUTES));
   }
 
   public static String getBase64EncodedKey() {
@@ -180,7 +179,7 @@ public static String getEnvVar(String envVarName, String defaultValue) {
     return val;
   }
 
-  // Delete reservation which starts with the given prefixToDelete and
+  // Delete reservations which starts with the given prefixToDelete and
   // has creation timestamp >24 hours.
   public static void cleanUpExistingReservations(
       String prefixToDelete, String projectId, String zone)
@@ -216,12 +215,8 @@ public static boolean containPrefixToDeleteAndZone(
         containPrefixAndZone = ((Disk) resource).getName().contains(prefixToDelete)
             && ((Disk) resource).getZone().contains(zone);
       }
-      if (resource instanceof StoragePool) {
-        containPrefixAndZone = ((StoragePool) resource).getName().contains(prefixToDelete)
-            && ((StoragePool) resource).getZone().contains(zone);
-      }
     } catch (NullPointerException e) {
-      System.err.println("Resource not found, skipping deletion:");
+      System.out.println("Resource not found, skipping deletion:");
     }
     return containPrefixAndZone;
   }
@@ -237,7 +232,7 @@ public static boolean containPrefixToDelete(
         containPrefixToDelete = ((Snapshot) resource).getName().contains(prefixToDelete);
       }
     } catch (NullPointerException e) {
-      System.err.println("Resource not found, skipping deletion:");
+      System.out.println("Resource not found, skipping deletion:");
     }
     return containPrefixToDelete;
   }

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

@@ -39,19 +39,16 @@
 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 ReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
@@ -104,7 +101,6 @@ public static void setUp()
     Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-", PROJECT_ID);
     Util.cleanUpExistingRegionalInstanceTemplates("test-regional-inst-temp-", PROJECT_ID, ZONE);
     Util.cleanUpExistingReservations("test-reserv-", PROJECT_ID, ZONE);
-    TimeUnit.MINUTES.sleep(5);
 
     // Create instance template with GLOBAL location.
     CreateInstanceTemplate.createInstanceTemplate(PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
@@ -163,7 +159,7 @@ public static void cleanup()
   }
 
   @Test
-  public void firstCreateReservationWithGlobalInstanceTemplateTest()
+  public void testCreateReservationWithGlobalInstanceTemplate()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     CreateReservationForInstanceTemplate.createReservationForInstanceTemplate(
         PROJECT_ID, RESERVATION_NAME_GLOBAL,
@@ -176,7 +172,7 @@ public void firstCreateReservationWithGlobalInstanceTemplateTest()
   }
 
   @Test
-  public void firstCreateReservationWithRegionInstanceTemplateTest()
+  public void testCreateReservationWithRegionInstanceTemplate()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     CreateReservationForInstanceTemplate.createReservationForInstanceTemplate(
         PROJECT_ID, RESERVATION_NAME_REGIONAL, REGIONAL_INSTANCE_TEMPLATE_URI,
@@ -196,7 +192,7 @@ public void testCreateInstanceNotConsumeReservation()
     CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
         PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME, MACHINE_TYPE);
 
-    // Verify that the instance was created with the correct reservation and consumeReservationType
+    // Verify that the instance was created with the correct consumeReservationType
     Instance instance = instancesClient.get(
         PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);