4949public class CrudOperationsReservationIT {
5050
5151 private static final String PROJECT_ID = System .getenv ("GOOGLE_CLOUD_PROJECT" );
52- private static String zone ;
52+ private static final String ZONE = "us-west1-a" ;
5353 private static String RESERVATION_NAME ;
5454 private static final int NUMBER_OF_VMS = 3 ;
5555 static String javaVersion = System .getProperty ("java.version" ).substring (0 , 2 );
@@ -65,25 +65,23 @@ public static void setUp()
6565 throws IOException , ExecutionException , InterruptedException , TimeoutException {
6666 requireEnvVar ("GOOGLE_APPLICATION_CREDENTIALS" );
6767 requireEnvVar ("GOOGLE_CLOUD_PROJECT" );
68- zone = javaVersion .equals ("17" ) ? "us-central1-a" : "us-central1-b" ;
69-
7068 RESERVATION_NAME = "test-reservation-" + javaVersion + "-"
7169 + UUID .randomUUID ().toString ().substring (0 , 8 );
7270
7371 // Cleanup existing stale resources.
74- Util .cleanUpExistingReservations ("test-reservation-" + javaVersion , PROJECT_ID , zone );
72+ Util .cleanUpExistingReservations ("test-reservation-" + javaVersion , PROJECT_ID , ZONE );
7573 }
7674
7775 @ AfterAll
7876 public static void cleanup ()
7977 throws IOException , ExecutionException , InterruptedException , TimeoutException {
8078 // Delete all reservations created for testing.
81- DeleteReservation .deleteReservation (PROJECT_ID , zone , RESERVATION_NAME );
79+ DeleteReservation .deleteReservation (PROJECT_ID , ZONE , RESERVATION_NAME );
8280
8381 // Test that reservations are deleted
8482 Assertions .assertThrows (
8583 NotFoundException .class ,
86- () -> GetReservation .getReservation (PROJECT_ID , RESERVATION_NAME , zone ));
84+ () -> GetReservation .getReservation (PROJECT_ID , RESERVATION_NAME , ZONE ));
8785 }
8886
8987 @ Test
@@ -94,7 +92,7 @@ public void testCreateReservation()
9492 ByteArrayOutputStream stdOut = new ByteArrayOutputStream ();
9593 System .setOut (new PrintStream (stdOut ));
9694 CreateReservation .createReservation (
97- PROJECT_ID , RESERVATION_NAME , NUMBER_OF_VMS , zone );
95+ PROJECT_ID , RESERVATION_NAME , NUMBER_OF_VMS , ZONE );
9896
9997 assertThat (stdOut .toString ()).contains ("Reservation created. Operation Status: DONE" );
10098
@@ -107,7 +105,7 @@ public void testCreateReservation()
107105 public void testGetReservation ()
108106 throws IOException {
109107 Reservation reservation = GetReservation .getReservation (
110- PROJECT_ID , RESERVATION_NAME , zone );
108+ PROJECT_ID , RESERVATION_NAME , ZONE );
111109
112110 assertNotNull (reservation );
113111 assertThat (reservation .getName ()).isEqualTo (RESERVATION_NAME );
@@ -117,7 +115,7 @@ public void testGetReservation()
117115 @ Order (4 )
118116 public void testListReservation () throws IOException {
119117 List <Reservation > reservations =
120- ListReservations .listReservations (PROJECT_ID , zone );
118+ ListReservations .listReservations (PROJECT_ID , ZONE );
121119
122120 assertThat (reservations ).isNotNull ();
123121 Assert .assertTrue (reservations .get (0 ).getName ().contains ("test-" ));
@@ -129,9 +127,9 @@ public void testUpdateVmsForReservation()
129127 throws IOException , ExecutionException , InterruptedException , TimeoutException {
130128 int newNumberOfVms = 5 ;
131129 UpdateVmsForReservation .updateVmsForReservation (
132- PROJECT_ID , zone , RESERVATION_NAME , newNumberOfVms );
130+ PROJECT_ID , ZONE , RESERVATION_NAME , newNumberOfVms );
133131 Reservation reservation = GetReservation .getReservation (
134- PROJECT_ID , RESERVATION_NAME , zone );
132+ PROJECT_ID , RESERVATION_NAME , ZONE );
135133
136134 Assert .assertEquals (newNumberOfVms , reservation .getSpecificReservation ().getCount ());
137135 }
0 commit comments