diff --git a/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatClientIT.java b/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatClientIT.java index 81d45865c..618ca25a6 100644 --- a/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatClientIT.java +++ b/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatClientIT.java @@ -100,7 +100,8 @@ class MistralAiChatClientIT { // @formatter:on logger.info("" + response); - assertThat(response.getResult().getOutput().getContent()).containsAnyOf("Blackbeard"); + assertThat(response.getResult().getOutput().getContent().toLowerCase()).containsAnyOf("blackbeard", + "bartholomew roberts"); } @Test diff --git a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java index 5bda58619..eecdfe4c9 100644 --- a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java +++ b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java @@ -12,8 +12,8 @@ public class BaseOllamaIT { } /** - * Change the value to false in order to run multiple Ollama IT tests locally reusing - * the same container image Also add the entry + * Change the return value to false in order to run multiple Ollama IT tests locally + * reusing the same container image Also add the entry * * testcontainers.reuse.enable=true * diff --git a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelObservationIT.java b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelObservationIT.java index d72c7067a..82c6031cf 100644 --- a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelObservationIT.java +++ b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelObservationIT.java @@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.testcontainers.junit.jupiter.Testcontainers; import reactor.core.publisher.Flux; import java.util.List; diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java index 7c8dba5fe..bb23600ad 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/transformer/MetadataTransformerIT.java @@ -84,7 +84,8 @@ public class MetadataTransformerIT { assertThat(keywords2).containsKeys("excerpt_keywords"); assertThat((String) keywords1.get("excerpt_keywords")).contains("Andes", "Aymara"); - assertThat((String) keywords2.get("excerpt_keywords")).contains("Spring MVC", "Dependency Injection"); + assertThat(((String) keywords2.get("excerpt_keywords")).toLowerCase()).containsAnyOf("spring mvc", + "dependency injection"); } @Test diff --git a/models/spring-ai-vertex-ai-gemini/src/test/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModelIT.java b/models/spring-ai-vertex-ai-gemini/src/test/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModelIT.java index e74859d5d..764609a84 100644 --- a/models/spring-ai-vertex-ai-gemini/src/test/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModelIT.java +++ b/models/spring-ai-vertex-ai-gemini/src/test/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatModelIT.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import java.util.stream.Stream; import com.google.cloud.vertexai.Transport; import com.google.cloud.vertexai.VertexAI; @@ -223,7 +224,10 @@ class VertexAiGeminiChatModelIT { // I see a bunch of bananas in a golden basket. The bananas are ripe and yellow. // There are also some red apples in the basket. The basket is sitting on a table. // The background is a blurred light blue color.' - assertThat(response.getResult().getOutput().getContent()).contains("bananas", "apple", "basket"); + assertThat(response.getResult().getOutput().getContent()).satisfies(content -> { + long count = Stream.of("bananas", "apple", "basket").filter(content::contains).count(); + assertThat(count).isGreaterThanOrEqualTo(2); + }); // Error with image from URL: // com.google.api.gax.rpc.InvalidArgumentException: