Fixed tests

Author: TetyanaYahodska

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

@@ -65,8 +65,7 @@ public static void setUp()
     STORAGE_POOL_NAME = "test-storage-pool-enc-" + javaVersion  + "-"
         + UUID.randomUUID().toString().substring(0, 8);
 
-    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
-    Util.cleanUpExistingStoragePool("test-storage-pool-" + javaVersion, PROJECT_ID, ZONE);
+
   }
 
   @AfterAll
@@ -77,6 +76,8 @@ public static void cleanup()
     DeleteDisk.deleteDisk(PROJECT_ID, ZONE, HYPERDISK_IN_POOL_NAME);
 
     Util.deleteStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME);
+    Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingStoragePool("test-" , PROJECT_ID, ZONE);
   }
 
   @Test

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

@@ -78,8 +78,6 @@ public static void setUp()
     INSTANCE_FOR_RESERVATION = "test-instance-for-reserv-" + javaVersion + "-"
         + UUID.randomUUID().toString().substring(0, 8);
 
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingReservations("test-reservation-" + javaVersion, PROJECT_ID, ZONE);
 
     CreateInstance.createInstance(PROJECT_ID, ZONE, INSTANCE_FOR_RESERVATION);
     CreateReservation.createReservation(
@@ -102,6 +100,9 @@ public static void cleanup()
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_FROM_VM, ZONE));
 
+    // Cleanup existing stale resources.
+    Util.cleanUpExistingReservations("test-reservation-" + javaVersion, PROJECT_ID, ZONE);
+
     reservationsClient.close();
     instancesClient.close();
   }

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

@@ -78,13 +78,6 @@ public static void setUp()
     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
     System.setOut(new PrintStream(stdOut));
 
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
-    Util.cleanUpExistingRegionalInstanceTemplates(
-        "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations(
-        "test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
 
     // Initialize the client once for all tests
     reservationsClient = ReservationsClient.create();
@@ -144,6 +137,14 @@ public static void cleanup()
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_REGIONAL, ZONE));
 
+    // Cleanup existing stale resources.
+    Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
+    Util.cleanUpExistingRegionalInstanceTemplates(
+        "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations(
+        "test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
+
     // Close the client after all tests
     reservationsClient.close();