Fixed test

Author: TetyanaYahodska

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

@@ -31,19 +31,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 CrudOperationReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
@@ -91,7 +88,7 @@ public static void cleanup()
   }
 
   @Test
-  public void firstGetReservationTest()
+  public void testGetReservation()
       throws IOException {
     Reservation reservation = GetReservation.getReservation(
         PROJECT_ID, RESERVATION_NAME, ZONE);
@@ -101,23 +98,11 @@ public void firstGetReservationTest()
   }
 
   @Test
-  public void secondListReservationTest() throws IOException {
+  public void testListReservation() throws IOException {
     List<Reservation> reservations =
         ListReservations.listReservations(PROJECT_ID, ZONE);
 
     assertThat(reservations).isNotNull();
     Assert.assertTrue(reservations.get(0).getName().contains("test-"));
   }
-
-  @Test
-  public void thirdUpdateVmsForReservationTest()
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    TimeUnit.MINUTES.sleep(3);
-    int newNumberOfVms = 5;
-    UpdateVmsForReservation.updateVmsForReservation(
-        PROJECT_ID, ZONE, RESERVATION_NAME, newNumberOfVms);
-    Reservation reservation = reservationsClient.get(PROJECT_ID, ZONE, RESERVATION_NAME);
-
-    Assert.assertEquals(newNumberOfVms, reservation.getSpecificReservation().getCount());
-  }
 }

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

@@ -35,16 +35,19 @@
 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");
@@ -145,7 +148,7 @@ public static void cleanup()
   }
 
   @Test
-  public void testCreateReservationWithGlobalInstanceTemplate()
+  public void firstCreateReservationWithGlobalInstanceTemplateTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     CreateReservationForInstanceTemplate.createReservationForInstanceTemplate(
         PROJECT_ID, RESERVATION_NAME_GLOBAL,
@@ -158,7 +161,7 @@ public void testCreateReservationWithGlobalInstanceTemplate()
   }
 
   @Test
-  public void testCreateReservationWithRegionInstanceTemplate()
+  public void firstCreateReservationWithRegionInstanceTemplateTest()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     CreateReservationForInstanceTemplate.createReservationForInstanceTemplate(
         PROJECT_ID, RESERVATION_NAME_REGIONAL, REGIONAL_INSTANCE_TEMPLATE_URI,
@@ -170,4 +173,15 @@ public void testCreateReservationWithRegionInstanceTemplate()
     Assert.assertTrue(reservation.getZone().contains(ZONE));
     Assert.assertEquals(RESERVATION_NAME_REGIONAL, reservation.getName());
   }
+
+  @Test
+  public void secondUpdateVmsForReservationTest()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    int newNumberOfVms = 5;
+    UpdateVmsForReservation.updateVmsForReservation(
+        PROJECT_ID, ZONE, RESERVATION_NAME_REGIONAL, newNumberOfVms);
+    Reservation reservation = reservationsClient.get(PROJECT_ID, ZONE, RESERVATION_NAME_REGIONAL);
+
+    Assert.assertEquals(newNumberOfVms, reservation.getSpecificReservation().getCount());
+  }
 }