Merged changes from main

Author: TetyanaYahodska

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

@@ -32,19 +32,20 @@
 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.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;
-import org.junit.runners.MethodSorters;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 25, unit = TimeUnit.MINUTES)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodOrderer. OrderAnnotation. class)
 public class CrudOperationsReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
@@ -84,7 +85,8 @@ public static void cleanup()
   }
 
   @Test
-  public void firstCreateReservationTest()
+  @Order(1)
+  public void testCreateReservation()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     final PrintStream out = System.out;
     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
@@ -99,7 +101,8 @@ public void firstCreateReservationTest()
   }
 
   @Test
-  public void secondGetReservationTest()
+  @Order(2)
+  public void testGetReservation()
       throws IOException {
     Reservation reservation = GetReservation.getReservation(
         PROJECT_ID, RESERVATION_NAME, ZONE);
@@ -109,7 +112,8 @@ public void secondGetReservationTest()
   }
 
   @Test
-  public void thirdListReservationTest() throws IOException {
+  @Order(3)
+  public void testListReservation() throws IOException {
     List<Reservation> reservations =
         ListReservations.listReservations(PROJECT_ID, ZONE);
 
@@ -118,6 +122,7 @@ public void thirdListReservationTest() throws IOException {
   }
 
   @Test
+  @Order(3)
   public void testUpdateVmsForReservation()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     int newNumberOfVms = 5;