Fixed tests

Author: TetyanaYahodska

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

@@ -46,14 +46,13 @@
 @RunWith(JUnit4.class)
 @Timeout(value = 6, unit = TimeUnit.MINUTES)
 public class ConsumeReservationsIT {
-
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-central1-a";
-  private static final String  RESERVATION_NAME = "test-reservaton-" + UUID.randomUUID();
-  private static final String INSTANCE_FOR_SPR = "test-instance-for-spr-" + UUID.randomUUID();
-  private static final String INSTANCE_FOR_ANY_MATCHING = "test-instance-" + UUID.randomUUID();
-  private static final String SPECIFIC_SHARED_INSTANCE =
-      "test-instance-shared-" + UUID.randomUUID();
+  static String templateUUID = UUID.randomUUID().toString();
+  private static final String  RESERVATION_NAME = "test-reservaton-" + templateUUID;
+  private static final String INSTANCE_FOR_SPR = "test-instance-for-spr-" + templateUUID;
+  private static final String INSTANCE_FOR_ANY_MATCHING = "test-instance-" + templateUUID;
+  private static final String SPECIFIC_SHARED_INSTANCE = "test-instance-shared-" + templateUUID;
   private static final String MACHINE_TYPE = "n1-standard-4";
   private static final String SOURCE_IMAGE = "projects/debian-cloud/global/images/family/debian-11";
   private static final String NETWORK_NAME = "default";

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

@@ -40,7 +40,6 @@
 @RunWith(JUnit4.class)
 @Timeout(value = 6, unit = TimeUnit.MINUTES)
 public class CrudOperationsReservationIT {
-
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-central1-b";
   private static final String RESERVATION_NAME = "test-reservation-" + UUID.randomUUID();
@@ -90,4 +89,15 @@ public void testListReservation() throws IOException {
     assertThat(reservations).isNotNull();
     Assert.assertTrue(reservations.get(0).getName().contains("test-"));
   }
+
+  @Test
+  public void testUpdateVmsForReservation()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    int newNumberOfVms = 5;
+    Reservation reservation = UpdateVmsForReservation.updateVmsForReservation(
+        PROJECT_ID, ZONE, RESERVATION_NAME, newNumberOfVms);
+
+    Assert.assertNotNull(reservation);
+    Assert.assertEquals(newNumberOfVms, reservation.getSpecificReservation().getCount());
+  }
 }

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

@@ -47,41 +47,37 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 6, unit = TimeUnit.MINUTES)
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ReservationIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "asia-south1-a";
   private static final String REGION = ZONE.substring(0, ZONE.lastIndexOf('-'));
-  private static final String RESERVATION_NAME_GLOBAL =
-      "test-reservation-global-" + UUID.randomUUID();
+  static String templateUUID = UUID.randomUUID().toString();
+  private static final String RESERVATION_NAME_GLOBAL = "test-reservation-global-" + templateUUID;
   private static final String  RESERVATION_NAME_REGIONAL =
-      "test-reservation-regional-" + UUID.randomUUID();
+      "test-reservation-regional-" + templateUUID;
   private static final String GLOBAL_INSTANCE_TEMPLATE_NAME =
-      "test-global-inst-temp-" + UUID.randomUUID();
+      "test-global-inst-temp-" + templateUUID;
   private static final String REGIONAL_INSTANCE_TEMPLATE_NAME =
-      "test-regional-inst-temp-" + UUID.randomUUID();
+      "test-regional-inst-temp-" + templateUUID;
   private static final String GLOBAL_INSTANCE_TEMPLATE_URI = String.format(
       "projects/%s/global/instanceTemplates/%s", PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
   private static final String REGIONAL_INSTANCE_TEMPLATE_URI =
       String.format("projects/%s/regions/%s/instanceTemplates/%s",
           PROJECT_ID, REGION, REGIONAL_INSTANCE_TEMPLATE_NAME);
   private static final String SPECIFIC_SHARED_INSTANCE_TEMPLATE_NAME =
-      "test-shared-inst-temp-"  + UUID.randomUUID();
+      "test-shared-inst-temp-"  + templateUUID;
   private static final String  INSTANCE_TEMPLATE_SHARED_RESERV_URI =
       String.format("projects/%s/global/instanceTemplates/%s",
       PROJECT_ID, SPECIFIC_SHARED_INSTANCE_TEMPLATE_NAME);
-  private static final String RESERVATION_NAME_SHARED =
-      "test-reservation-shared-" + UUID.randomUUID();
+  private static final String RESERVATION_NAME_SHARED = "test-reservation-shared-" + templateUUID;
   private static final int NUMBER_OF_VMS = 3;
   private static ByteArrayOutputStream stdOut;
 
@@ -155,7 +151,6 @@ public static void cleanup()
   }
 
   @Test
-  @Order(1)
   public void testCreateReservationWithGlobalInstanceTemplate()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     Reservation reservation = CreateReservationForInstanceTemplate

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

@@ -39,13 +39,13 @@
 @RunWith(JUnit4.class)
 @Timeout(value = 3, unit = TimeUnit.MINUTES)
 public class WithoutConsumingReservationIT {
-
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-central1-a";
+  static String templateUUID = UUID.randomUUID().toString();
   private static final String INSTANCE_NOT_CONSUME_RESERVATION_NAME =
-      "test-instance-not-consume-" + UUID.randomUUID();
+      "test-instance-not-consume-" + templateUUID;
   private static final String TEMPLATE_NOT_CONSUME_RESERVATION_NAME =
-      "test-template-not-consume-"  + UUID.randomUUID();
+      "test-template-not-consume-"  + templateUUID;
   private static final String MACHINE_TYPE_NAME = "n1-standard-1";
   private static final String SOURCE_IMAGE = "projects/debian-cloud/global/images/family/debian-11";
   private static final String NETWORK_NAME = "default";