Clean up tests

Author: ddobrin

models/spring-ai-google-genai/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModel.java

@@ -948,7 +948,7 @@ public enum ChatModel implements ChatModelDescription {
 		 * See: <a href=
 		 * "https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-0-flash">gemini-2.0-flash</a>
 		 */
-		GEMINI_2_0_FLASH("gemini-2.0-flash"),
+		GEMINI_2_0_FLASH("gemini-2.0-flash-001"),
 
 		/**
 		 * <b>gemini-2.0-flash-lite</b> is the fastest and most cost efficient Flash
@@ -965,7 +965,7 @@ public enum ChatModel implements ChatModelDescription {
 		 * See: <a href=
 		 * "https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-0-flash-lite">gemini-2.0-flash-lite</a>
 		 */
-		GEMINI_2_0_FLASH_LIGHT("gemini-2.0-flash-lite"),
+		GEMINI_2_0_FLASH_LIGHT("gemini-2.0-flash-lite-001"),
 
 		/**
 		 * <b>gemini-2.5-pro</b> is the most advanced reasoning Gemini model, capable of
@@ -997,7 +997,24 @@ public enum ChatModel implements ChatModelDescription {
 		 * See: <a href=
 		 * "https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-5-flash">gemini-2.5-flash</a>
 		 */
-		GEMINI_2_5_FLASH("gemini-2.5-flash");
+		GEMINI_2_5_FLASH("gemini-2.5-flash"),
+
+		/**
+		 * <b>gemini-2.5-flash-lite</b> is the fastest and most cost efficient Flash
+		 * model. It's an upgrade path for 2.0 Flash users who want better quality for the
+		 * same price and speed.
+		 * <p>
+		 * Inputs: Text, Code, Images, Audio, Video - 1,048,576 tokens | Outputs: Text -
+		 * 8,192 tokens
+		 * <p>
+		 * Knowledge cutoff: Jan 2025
+		 * <p>
+		 * Model ID: gemini-2.0-flash-lite
+		 * <p>
+		 * See: <a href=
+		 * "https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-5-flash-lite">gemini-2.5-flash-lite</a>
+		 */
+		GEMINI_2_5_FLASH_LIGHT("gemini-2.5-flash-lite");
 
 		public final String value;
 

models/spring-ai-google-genai/src/test/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModelIT.java

@@ -98,7 +98,7 @@ void googleSearchToolPro() {
 			.googleSearchRetrieval(true)
 			.build());
 		ChatResponse response = this.chatModel.call(prompt);
-		assertThat(response.getResult().getOutput().getText()).containsAnyOf("Blackbeard", "Bartholomew");
+		assertThat(response.getResult().getOutput().getText()).containsAnyOf("Blackbeard", "Bartholomew", "Calico Jack", "Anne Bonny");
 	}
 
 	@Test
@@ -129,7 +129,7 @@ void testSafetySettings() {
 
 	@NonNull
 	private Prompt createPrompt(VertexAiGeminiChatOptions chatOptions) {
-		String request = "Name 3 famous pirates from the Golden Age of Piracy and what they did.";
+		String request = "Name 3 famous pirates from the Golden Age of Piracy and tell me what they did.";
 		String name = "Bob";
 		String voice = "pirate";
 		UserMessage userMessage = new UserMessage(request);
@@ -368,7 +368,7 @@ void jsonTextToolCallingTest() {
 			.genAiClient(genAiClient())
 			.toolCallingManager(toolCallingManager)
 			.defaultOptions(VertexAiGeminiChatOptions.builder()
-				.model(VertexAiGeminiChatModel.ChatModel.GEMINI_2_0_FLASH)
+				.model(VertexAiGeminiChatModel.ChatModel.GEMINI_2_5_FLASH)
 				.temperature(0.1)
 				.build())
 			.build();
@@ -379,7 +379,7 @@ void jsonTextToolCallingTest() {
 		// should invoke the tool
 		String response = chatClient.prompt()
 			.tools(new CurrentTimeTools())
-			.user("Get the current time. Make sure to use the getCurrentDateTime tool to get this information.")
+			.user("Get the current time in the users timezone. Make sure to use the getCurrentDateTime tool to get this information.")
 			.call()
 			.content();