Fixed tests

Author: TetyanaYahodska

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

@@ -44,15 +44,16 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-@Timeout(value = 25, unit = TimeUnit.MINUTES)
+@Timeout(value = 6, unit = TimeUnit.MINUTES)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CrudOperationsReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "us-east4-c";
-  private static String RESERVATION_NAME;
-  private static final int NUMBER_OF_VMS = 3;
+  private static final String ZONE = "us-central1-a";
   static String javaVersion = System.getProperty("java.version").substring(0, 2);
+  private static final String RESERVATION_NAME = "test-reservation-" + javaVersion + "-"
+      + UUID.randomUUID().toString().substring(0, 8);
+  private static final int NUMBER_OF_VMS = 3;
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -65,8 +66,6 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-    RESERVATION_NAME = "test-reservation-" + javaVersion + "-"
-        + UUID.randomUUID().toString().substring(0, 8);
 
     // Cleanup existing stale resources.
     Util.cleanUpExistingReservations("test-reservation-"  + javaVersion, PROJECT_ID, ZONE);

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

@@ -47,24 +47,28 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-@Timeout(value = 25, unit = TimeUnit.MINUTES)
-@TestMethodOrder(MethodOrderer. OrderAnnotation. 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 = "us-west1-a";
   private static final String REGION = ZONE.substring(0, ZONE.lastIndexOf('-'));
-  private static ReservationsClient reservationsClient;
-  private static String RESERVATION_NAME_GLOBAL;
-  private static String RESERVATION_NAME_REGIONAL;
-  private static String GLOBAL_INSTANCE_TEMPLATE_URI;
-  private static String REGIONAL_INSTANCE_TEMPLATE_URI;
   static String javaVersion = System.getProperty("java.version").substring(0, 2);
+  private static ReservationsClient reservationsClient;
+  private static final String RESERVATION_NAME_GLOBAL = "test-reservation-global-" + javaVersion
+      + "-" + UUID.randomUUID().toString().substring(0, 8);
+  private static final String  RESERVATION_NAME_REGIONAL = "test-reservation-regional-" + javaVersion
+      + "-" + UUID.randomUUID().toString().substring(0, 8);
   private static final String GLOBAL_INSTANCE_TEMPLATE_NAME =
       "test-global-inst-temp-" + javaVersion + "-" + UUID.randomUUID().toString().substring(0, 8);
   private static final String REGIONAL_INSTANCE_TEMPLATE_NAME =
-      "test-regional-inst-temp-" + javaVersion  + "-"
-          + UUID.randomUUID().toString().substring(0, 8);
+      "test-regional-inst-temp-" + javaVersion  + "-" + UUID.randomUUID().toString().substring(0, 8);
+  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 int NUMBER_OF_VMS = 3;
 
   // Check if the required environment variables are set.
@@ -93,16 +97,6 @@ public static void setUp()
     // Initialize the client once for all tests
     reservationsClient = ReservationsClient.create();
 
-    RESERVATION_NAME_GLOBAL = "test-reservation-global-" + javaVersion  + "-"
-        + UUID.randomUUID().toString().substring(0, 8);
-    RESERVATION_NAME_REGIONAL = "test-reservation-regional-" + javaVersion  + "-"
-        + UUID.randomUUID().toString().substring(0, 8);
-    GLOBAL_INSTANCE_TEMPLATE_URI = String.format("projects/%s/global/instanceTemplates/%s",
-        PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
-    REGIONAL_INSTANCE_TEMPLATE_URI =
-        String.format("projects/%s/regions/%s/instanceTemplates/%s",
-            PROJECT_ID, REGION, REGIONAL_INSTANCE_TEMPLATE_NAME);
-
     // Create instance template with GLOBAL location.
     CreateInstanceTemplate.createInstanceTemplate(PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
     assertThat(stdOut.toString())