Reverted changes

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 = 20;
+  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";

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

@@ -20,13 +20,13 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-//import com.google.api.gax.rpc.NotFoundException;
+import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.compute.v1.Instance;
 import com.google.cloud.compute.v1.InstancesClient;
 import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationsClient;
-//import compute.CreateInstance;
-//import compute.DeleteInstance;
+import compute.CreateInstance;
+import compute.DeleteInstance;
 import compute.Util;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,9 +39,8 @@
 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.Assertions;
 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;
@@ -54,7 +53,7 @@
 public class CrudOperationsReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "us-west1-a";
+  private static final String ZONE = "us-central1-a";
   private static ReservationsClient reservationsClient;
   private static InstancesClient instancesClient;
   private static String RESERVATION_NAME;
@@ -87,37 +86,32 @@ public static void setUp()
     // Cleanup existing stale resources.
     Util.cleanUpExistingInstances("test-instance-for-reserv-"  + javaVersion, PROJECT_ID, ZONE);
     Util.cleanUpExistingReservations("test-reservation-"  + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reservation-"  + javaVersion, PROJECT_ID, "us-central1-a");
-    Util.cleanUpExistingReservations("test-reservation-"  + javaVersion, PROJECT_ID, "asia-south1-a");
     Util.cleanUpExistingReservations("test-reservation-from-vm-"  + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reservation-from-vm-"  + javaVersion, PROJECT_ID, "us-central1-a");
-    Util.cleanUpExistingReservations("test-reservation-from-vm-"  + javaVersion, PROJECT_ID, "asia-south1-a");
 
-    //CreateInstance.createInstance(PROJECT_ID, ZONE, INSTANCE_FOR_RESERVATION);
+    CreateInstance.createInstance(PROJECT_ID, ZONE, INSTANCE_FOR_RESERVATION);
 
   }
 
   @AfterAll
   public static void cleanup()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     // Delete resources created for testing.
-    //DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_FOR_RESERVATION);
-    //DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME);
-    //DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_FROM_VM);
+    DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_FOR_RESERVATION);
+    DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME);
+    DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_FROM_VM);
 
     // Test that reservations are deleted
-    //Assertions.assertThrows(
-    //    NotFoundException.class,
-    //    () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
-    //Assertions.assertThrows(
-    //    NotFoundException.class,
-    //    () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_FROM_VM, ZONE));
-
-    //reservationsClient.close();
-    //instancesClient.close();
+    Assertions.assertThrows(
+        NotFoundException.class,
+        () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
+    Assertions.assertThrows(
+        NotFoundException.class,
+        () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_FROM_VM, ZONE));
+
+    reservationsClient.close();
+    instancesClient.close();
   }
 
-  @Disabled
   @Test
   public void firstCreateReservationTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
@@ -133,7 +127,6 @@ public void firstCreateReservationTest()
     System.setOut(out);
   }
 
-  @Disabled
   @Test
   public void secondGetReservationTest()
       throws IOException {
@@ -144,7 +137,6 @@ public void secondGetReservationTest()
     assertThat(reservation.getName()).isEqualTo(RESERVATION_NAME);
   }
 
-  @Disabled
   @Test
   public void thirdListReservationTest() throws IOException {
     List<Reservation> reservations =
@@ -155,7 +147,6 @@ public void thirdListReservationTest() throws IOException {
     Assert.assertTrue(reservations.get(1).getName().contains("test-"));
   }
 
-  @Disabled
   @Test
   public void testCreateComputeReservationFromVm()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {