diff --git a/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.java b/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.java index 7eed5b474ac..9af172124a6 100644 --- a/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.java +++ b/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepository; import org.springframework.ai.chat.messages.AssistantMessage; @@ -35,21 +34,17 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -@ExtendWith(SpringExtension.class) -@SpringBootTest(classes = JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.TestConfig.class, - properties = { "spring.datasource.url=jdbc:hsqldb:mem:chat_memory_auto_configuration_test;DB_CLOSE_DELAY=-1", - "spring.datasource.username=sa", "spring.datasource.password=", - "spring.datasource.driver-class-name=org.hsqldb.jdbcDriver", - "spring.ai.chat.memory.repository.jdbc.initialize-schema=always", "spring.sql.init.mode=always", - "spring.jpa.hibernate.ddl-auto=none", "spring.jpa.defer-datasource-initialization=true", - "spring.sql.init.continue-on-error=true", "spring.sql.init.schema-locations=classpath:schema.sql", - "logging.level.org.springframework.jdbc=DEBUG", - "logging.level.org.springframework.boot.sql.init=DEBUG" }) +@SpringBootTest({ "spring.datasource.url=jdbc:hsqldb:mem:chat_memory_auto_configuration_test;DB_CLOSE_DELAY=-1", + "spring.datasource.username=sa", "spring.datasource.password=", + "spring.datasource.driver-class-name=org.hsqldb.jdbcDriver", + "spring.ai.chat.memory.repository.jdbc.initialize-schema=always", "spring.sql.init.mode=always", + "spring.jpa.hibernate.ddl-auto=none", "spring.jpa.defer-datasource-initialization=true", + "spring.sql.init.continue-on-error=true", "spring.sql.init.schema-locations=classpath:schema.sql", + "logging.level.org.springframework.jdbc=DEBUG", "logging.level.org.springframework.boot.sql.init=DEBUG" }) @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) @ImportAutoConfiguration({ org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration.class, JdbcChatMemoryRepositoryAutoConfiguration.class, JdbcTemplateAutoConfiguration.class, diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-postgresml-embedding/src/test/java/org/springframework/ai/model/postgresml/autoconfigure/PostgresMlEmbeddingPropertiesTests.java b/auto-configurations/models/spring-ai-autoconfigure-model-postgresml-embedding/src/test/java/org/springframework/ai/model/postgresml/autoconfigure/PostgresMlEmbeddingPropertiesTests.java index 9ac0dd86108..4abf97b6d20 100644 --- a/auto-configurations/models/spring-ai-autoconfigure-model-postgresml-embedding/src/test/java/org/springframework/ai/model/postgresml/autoconfigure/PostgresMlEmbeddingPropertiesTests.java +++ b/auto-configurations/models/spring-ai-autoconfigure-model-postgresml-embedding/src/test/java/org/springframework/ai/model/postgresml/autoconfigure/PostgresMlEmbeddingPropertiesTests.java @@ -35,7 +35,7 @@ * @author Utkarsh Srivastava * @author Christian Tzolov */ -@SpringBootTest(properties = { "spring.ai.postgresml.embedding.options.metadata-mode=all", +@SpringBootTest({ "spring.ai.postgresml.embedding.options.metadata-mode=all", "spring.ai.postgresml.embedding.options.kwargs.key1=value1", "spring.ai.postgresml.embedding.options.kwargs.key2=value2", "spring.ai.postgresml.embedding.options.transformer=abc123" }) diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositorySqlServerIT.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositorySqlServerIT.java index f36e38f305f..3f44eef972e 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositorySqlServerIT.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositorySqlServerIT.java @@ -28,7 +28,7 @@ * @author Yanming Zhou * @author Eddú Meléndez */ -@SpringBootTest(properties = "spring.datasource.url=jdbc:tc:sqlserver:2022-latest:///") +@SpringBootTest("spring.datasource.url=jdbc:tc:sqlserver:2022-latest:///") @Sql(scripts = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-sqlserver.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) class JdbcChatMemoryRepositorySqlServerIT extends AbstractJdbcChatMemoryRepositoryIT { diff --git a/memory/repository/spring-ai-model-chat-memory-repository-mongodb/src/test/java/org/springframework/ai/chat/memory/repository/mongo/MongoChatMemoryRepositoryIT.java b/memory/repository/spring-ai-model-chat-memory-repository-mongodb/src/test/java/org/springframework/ai/chat/memory/repository/mongo/MongoChatMemoryRepositoryIT.java index 1a8df0c2d3c..3f8b6060f12 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-mongodb/src/test/java/org/springframework/ai/chat/memory/repository/mongo/MongoChatMemoryRepositoryIT.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-mongodb/src/test/java/org/springframework/ai/chat/memory/repository/mongo/MongoChatMemoryRepositoryIT.java @@ -49,7 +49,7 @@ * * @author Łukasz Jernaś */ -@SpringBootTest(classes = MongoChatMemoryRepositoryIT.TestConfiguration.class) +@SpringBootTest public class MongoChatMemoryRepositoryIT { @Autowired diff --git a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelAdditionalHttpHeadersIT.java b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelAdditionalHttpHeadersIT.java index dc76d7646cc..9669645e569 100644 --- a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelAdditionalHttpHeadersIT.java +++ b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelAdditionalHttpHeadersIT.java @@ -36,7 +36,7 @@ /** * @author Christian Tzolov */ -@SpringBootTest(classes = AnthropicChatModelAdditionalHttpHeadersIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+") public class AnthropicChatModelAdditionalHttpHeadersIT { diff --git a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java index 67ccffb640c..ed9608cf529 100644 --- a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java +++ b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java @@ -65,7 +65,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = AnthropicChatModelIT.Config.class, properties = "spring.ai.retry.on-http-codes=429") +@SpringBootTest("spring.ai.retry.on-http-codes=429") @EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+") class AnthropicChatModelIT { diff --git a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelObservationIT.java b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelObservationIT.java index 382dbe6f64f..1bbe4ddd756 100644 --- a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelObservationIT.java +++ b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelObservationIT.java @@ -50,8 +50,7 @@ * @author Thomas Vitale * @author Alexandros Pappas */ -@SpringBootTest(classes = AnthropicChatModelObservationIT.Config.class, - properties = "spring.ai.retry.on-http-codes=429") +@SpringBootTest("spring.ai.retry.on-http-codes=429") @EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+") public class AnthropicChatModelObservationIT { diff --git a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicCitationIT.java b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicCitationIT.java index 092455733ed..852de0388a1 100644 --- a/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicCitationIT.java +++ b/models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicCitationIT.java @@ -43,7 +43,7 @@ * @author Soby Chacko * @since 1.1.0 */ -@SpringBootTest(classes = AnthropicCitationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+") class AnthropicCitationIT { diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiAudioTranscriptionModelIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiAudioTranscriptionModelIT.java index 97f71a57bde..42a3c49b6bc 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiAudioTranscriptionModelIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiAudioTranscriptionModelIT.java @@ -43,7 +43,7 @@ * * @author Piotr Olaszewski */ -@SpringBootTest(classes = AzureOpenAiAudioTranscriptionModelIT.TestConfiguration.class) +@SpringBootTest @EnabledIfEnvironmentVariables({ @EnabledIfEnvironmentVariable(named = "AZURE_OPENAI_TRANSCRIPTION_API_KEY", matches = ".+"), @EnabledIfEnvironmentVariable(named = "AZURE_OPENAI_TRANSCRIPTION_ENDPOINT", matches = ".+") }) diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java index 41098ee7c09..b640d4840f3 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java @@ -44,7 +44,7 @@ /** * @author Soby Chacko */ -@SpringBootTest(classes = AzureOpenAiChatClientIT.TestConfiguration.class) +@SpringBootTest @RequiresAzureCredentials public class AzureOpenAiChatClientIT { diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelIT.java index f637bae027e..0e2f25f79b9 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelIT.java @@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = AzureOpenAiChatModelIT.TestConfiguration.class) +@SpringBootTest @RequiresAzureCredentials class AzureOpenAiChatModelIT { diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelObservationIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelObservationIT.java index fbe010eb9ee..df1adf4db74 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelObservationIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelObservationIT.java @@ -46,7 +46,7 @@ /** * @author Soby Chacko */ -@SpringBootTest(classes = AzureOpenAiChatModelObservationIT.TestConfiguration.class) +@SpringBootTest @RequiresAzureCredentials class AzureOpenAiChatModelObservationIT { diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingModelObservationIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingModelObservationIT.java index 1ef348b256d..c229374e6e5 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingModelObservationIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingModelObservationIT.java @@ -46,7 +46,7 @@ * * @author Christian Tzolov */ -@SpringBootTest(classes = AzureOpenAiEmbeddingModelObservationIT.Config.class) +@SpringBootTest @RequiresAzureCredentials public class AzureOpenAiEmbeddingModelObservationIT { diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/AzureOpenAiChatModelFunctionCallIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/AzureOpenAiChatModelFunctionCallIT.java index 76f36b9dc3f..62970ab2765 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/AzureOpenAiChatModelFunctionCallIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/AzureOpenAiChatModelFunctionCallIT.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = AzureOpenAiChatModelFunctionCallIT.TestConfiguration.class) +@SpringBootTest @RequiresAzureCredentials class AzureOpenAiChatModelFunctionCallIT { diff --git a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/image/AzureOpenAiImageModelIT.java b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/image/AzureOpenAiImageModelIT.java index 06e2a74b876..d9a819d1c46 100644 --- a/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/image/AzureOpenAiImageModelIT.java +++ b/models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/image/AzureOpenAiImageModelIT.java @@ -43,7 +43,7 @@ /** * NOTE: use deployment ID dall-e-3 */ -@SpringBootTest(classes = AzureOpenAiImageModelIT.TestConfiguration.class) +@SpringBootTest @EnabledIfEnvironmentVariables({ @EnabledIfEnvironmentVariable(named = "AZURE_OPENAI_IMAGE_API_KEY", matches = ".+"), @EnabledIfEnvironmentVariable(named = "AZURE_OPENAI_IMAGE_ENDPOINT", matches = ".+") }) public class AzureOpenAiImageModelIT { diff --git a/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelObservationIT.java b/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelObservationIT.java index ccc0d7257e1..a0f33ded48f 100644 --- a/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelObservationIT.java +++ b/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelObservationIT.java @@ -48,8 +48,7 @@ * * @author Christian Tzolov */ -@SpringBootTest(classes = BedrockProxyChatModelObservationIT.Config.class, - properties = "spring.ai.retry.on-http-codes=429") +@SpringBootTest("spring.ai.retry.on-http-codes=429") @RequiresAwsCredentials public class BedrockProxyChatModelObservationIT { diff --git a/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/client/BedrockNovaChatClientIT.java b/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/client/BedrockNovaChatClientIT.java index fe91af13ac3..8193f0154df 100644 --- a/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/client/BedrockNovaChatClientIT.java +++ b/models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/client/BedrockNovaChatClientIT.java @@ -55,7 +55,7 @@ * @author Christian Tzolov */ // @Disabled -@SpringBootTest(classes = BedrockNovaChatClientIT.Config.class) +@SpringBootTest @RequiresAwsCredentials public class BedrockNovaChatClientIT { diff --git a/models/spring-ai-deepseek/src/test/java/org/springframework/ai/deepseek/chat/DeepSeekChatModelObservationIT.java b/models/spring-ai-deepseek/src/test/java/org/springframework/ai/deepseek/chat/DeepSeekChatModelObservationIT.java index b2900e479cb..d041f83f3a8 100644 --- a/models/spring-ai-deepseek/src/test/java/org/springframework/ai/deepseek/chat/DeepSeekChatModelObservationIT.java +++ b/models/spring-ai-deepseek/src/test/java/org/springframework/ai/deepseek/chat/DeepSeekChatModelObservationIT.java @@ -51,7 +51,7 @@ * * @author Geng Rong */ -@SpringBootTest(classes = DeepSeekChatModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "DEEPSEEK_API_KEY", matches = ".+") public class DeepSeekChatModelObservationIT { diff --git a/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelIT.java b/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelIT.java index 529cb1d5cdb..b2f9de02e75 100644 --- a/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelIT.java +++ b/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelIT.java @@ -43,7 +43,7 @@ * @author Christian Tzolov * @author Dan Dobrin */ -@SpringBootTest(classes = GoogleGenAiTextEmbeddingModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "GOOGLE_CLOUD_PROJECT", matches = ".*") @EnabledIfEnvironmentVariable(named = "GOOGLE_CLOUD_LOCATION", matches = ".*") class GoogleGenAiTextEmbeddingModelIT { diff --git a/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelObservationIT.java b/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelObservationIT.java index af18ad4427a..d40a9914cb4 100644 --- a/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelObservationIT.java +++ b/models/spring-ai-google-genai-embedding/src/test/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingModelObservationIT.java @@ -48,7 +48,7 @@ * @author Christian Tzolov * @author Dan Dobrin */ -@SpringBootTest(classes = GoogleGenAiTextEmbeddingModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "GOOGLE_CLOUD_PROJECT", matches = ".*") @EnabledIfEnvironmentVariable(named = "GOOGLE_CLOUD_LOCATION", matches = ".*") public class GoogleGenAiTextEmbeddingModelObservationIT { diff --git a/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/chat/MiniMaxChatModelObservationIT.java b/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/chat/MiniMaxChatModelObservationIT.java index f5d0821186d..e8258a29af1 100644 --- a/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/chat/MiniMaxChatModelObservationIT.java +++ b/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/chat/MiniMaxChatModelObservationIT.java @@ -52,7 +52,7 @@ * * @author Geng Rong */ -@SpringBootTest(classes = MiniMaxChatModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "MINIMAX_API_KEY", matches = ".+") public class MiniMaxChatModelObservationIT { diff --git a/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/embedding/MiniMaxEmbeddingModelObservationIT.java b/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/embedding/MiniMaxEmbeddingModelObservationIT.java index b502515ae15..5a38277c76c 100644 --- a/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/embedding/MiniMaxEmbeddingModelObservationIT.java +++ b/models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/embedding/MiniMaxEmbeddingModelObservationIT.java @@ -48,7 +48,7 @@ * * @author Geng Rong */ -@SpringBootTest(classes = MiniMaxEmbeddingModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "MINIMAX_API_KEY", matches = ".+") public class MiniMaxEmbeddingModelObservationIT { diff --git a/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatModelObservationIT.java b/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatModelObservationIT.java index 03ac09d993c..600d836dde5 100644 --- a/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatModelObservationIT.java +++ b/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatModelObservationIT.java @@ -52,7 +52,7 @@ * @author Alexandros Pappas * @author Jason Smith */ -@SpringBootTest(classes = MistralAiChatModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "MISTRAL_AI_API_KEY", matches = ".+") public class MistralAiChatModelObservationIT { diff --git a/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiEmbeddingModelObservationIT.java b/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiEmbeddingModelObservationIT.java index f3287c9fc3e..15d07d11486 100644 --- a/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiEmbeddingModelObservationIT.java +++ b/models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiEmbeddingModelObservationIT.java @@ -46,7 +46,7 @@ * @author Thomas Vitale * @author Jason Smith */ -@SpringBootTest(classes = MistralAiEmbeddingModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "MISTRAL_AI_API_KEY", matches = ".+") public class MistralAiEmbeddingModelObservationIT { diff --git a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelFunctionCallingIT.java b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelFunctionCallingIT.java index 4e3b072f509..53b9b1057d1 100644 --- a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelFunctionCallingIT.java +++ b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelFunctionCallingIT.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = OllamaChatModelFunctionCallingIT.Config.class) +@SpringBootTest class OllamaChatModelFunctionCallingIT extends BaseOllamaIT { private static final Logger logger = LoggerFactory.getLogger(OllamaChatModelFunctionCallingIT.class); diff --git a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelMetadataTests.java b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelMetadataTests.java index 0a168ae341c..1900d473531 100644 --- a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelMetadataTests.java +++ b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelMetadataTests.java @@ -38,7 +38,7 @@ * * @author Sun Yuhan */ -@SpringBootTest(classes = OllamaChatModelMetadataTests.Config.class) +@SpringBootTest class OllamaChatModelMetadataTests extends BaseOllamaIT { private static final String MODEL = OllamaModel.QWEN_3_06B.getName(); 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 827250eebb9..0e9eb54fa1c 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 @@ -50,7 +50,7 @@ * @author Thomas Vitale * @author Alexandros Pappas */ -@SpringBootTest(classes = OllamaChatModelObservationIT.Config.class) +@SpringBootTest public class OllamaChatModelObservationIT extends BaseOllamaIT { private static final String MODEL = OllamaModel.QWEN_2_5_3B.getName(); diff --git a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaEmbeddingModelObservationIT.java b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaEmbeddingModelObservationIT.java index 51d8566eb3c..11b58e9da3e 100644 --- a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaEmbeddingModelObservationIT.java +++ b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaEmbeddingModelObservationIT.java @@ -45,7 +45,7 @@ * * @author Thomas Vitale */ -@SpringBootTest(classes = OllamaEmbeddingModelObservationIT.Config.class) +@SpringBootTest public class OllamaEmbeddingModelObservationIT extends BaseOllamaIT { private static final String MODEL = OllamaModel.NOMIC_EMBED_TEXT.getName(); diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/api/OpenAiAudioModelNoOpApiKeysIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/api/OpenAiAudioModelNoOpApiKeysIT.java index dd1a1c3b9e5..788058f3c22 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/api/OpenAiAudioModelNoOpApiKeysIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/api/OpenAiAudioModelNoOpApiKeysIT.java @@ -33,7 +33,7 @@ * @author Ilayaperumal Gopinathan * @author Jonghoon Park */ -@SpringBootTest(classes = OpenAiAudioModelNoOpApiKeysIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiAudioModelNoOpApiKeysIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelAdditionalHttpHeadersIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelAdditionalHttpHeadersIT.java index b1acd969478..d2e96a77adc 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelAdditionalHttpHeadersIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelAdditionalHttpHeadersIT.java @@ -39,7 +39,7 @@ /** * @author Christian Tzolov */ -@SpringBootTest(classes = OpenAiChatModelAdditionalHttpHeadersIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiChatModelAdditionalHttpHeadersIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelFunctionCallingIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelFunctionCallingIT.java index 81213f2884e..03388f3069a 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelFunctionCallingIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelFunctionCallingIT.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = OpenAiChatModelFunctionCallingIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") class OpenAiChatModelFunctionCallingIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelNoOpApiKeysIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelNoOpApiKeysIT.java index 1b84b876e4f..337c2206faa 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelNoOpApiKeysIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelNoOpApiKeysIT.java @@ -33,7 +33,7 @@ /** * @author Ilayaperumal Gopinathan */ -@SpringBootTest(classes = OpenAiChatModelNoOpApiKeysIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiChatModelNoOpApiKeysIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelObservationIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelObservationIT.java index fa2daa3962f..4762e54c7c5 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelObservationIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelObservationIT.java @@ -52,7 +52,7 @@ * * @author Thomas Vitale */ -@SpringBootTest(classes = OpenAiChatModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiChatModelObservationIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelResponseFormatIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelResponseFormatIT.java index 02b8082a71b..719866bd29e 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelResponseFormatIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelResponseFormatIT.java @@ -47,7 +47,7 @@ * @author Christian Tzolov * @author Ilayaperumal Gopinathan */ -@SpringBootTest(classes = OpenAiChatModelResponseFormatIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiChatModelResponseFormatIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DeepSeekWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DeepSeekWithOpenAiChatModelIT.java index 8a84d4803d1..3a7cc7ca66f 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DeepSeekWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DeepSeekWithOpenAiChatModelIT.java @@ -68,7 +68,7 @@ * For more information on DeepSeek behavior, refer to its API documentation: * DeepSeek API */ -@SpringBootTest(classes = DeepSeekWithOpenAiChatModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "DEEPSEEK_API_KEY", matches = ".+") @Disabled("Requires DeepSeek credits") class DeepSeekWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DockerModelRunnerWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DockerModelRunnerWithOpenAiChatModelIT.java index f96ae7d6cac..1f64b613b89 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DockerModelRunnerWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DockerModelRunnerWithOpenAiChatModelIT.java @@ -68,7 +68,7 @@ * @since 1.0.0 */ @Testcontainers -@SpringBootTest(classes = DockerModelRunnerWithOpenAiChatModelIT.Config.class) +@SpringBootTest @Disabled("Requires Docker Model Runner enabled. See https://docs.docker.com/desktop/features/model-runner/") class DockerModelRunnerWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/GroqWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/GroqWithOpenAiChatModelIT.java index 3c6d4ac4179..a4e82b83d13 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/GroqWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/GroqWithOpenAiChatModelIT.java @@ -64,7 +64,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = GroqWithOpenAiChatModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "GROQ_API_KEY", matches = ".+") // @Disabled("Due to rate limiting it is hard to run it in one go") class GroqWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MistralWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MistralWithOpenAiChatModelIT.java index 95dc82ac3d2..a257b1ed685 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MistralWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MistralWithOpenAiChatModelIT.java @@ -66,7 +66,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = MistralWithOpenAiChatModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "MISTRAL_AI_API_KEY", matches = ".+") class MistralWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MultiOpenAiClientIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MultiOpenAiClientIT.java index e7437b037fb..a9ae87aeffe 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MultiOpenAiClientIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/MultiOpenAiClientIT.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = MultiOpenAiClientIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "GROQ_API_KEY", matches = ".+") @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") @ActiveProfiles("logging-test") diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/NvidiaWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/NvidiaWithOpenAiChatModelIT.java index a199c33a131..da6639bce42 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/NvidiaWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/NvidiaWithOpenAiChatModelIT.java @@ -61,7 +61,7 @@ * @author Christian Tzolov * @since 1.0.0 */ -@SpringBootTest(classes = NvidiaWithOpenAiChatModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "NVIDIA_API_KEY", matches = ".+") @Disabled("Requires NVIDIA credits") class NvidiaWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/OllamaWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/OllamaWithOpenAiChatModelIT.java index 375cb389ab0..5dc4d4251ed 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/OllamaWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/OllamaWithOpenAiChatModelIT.java @@ -69,7 +69,7 @@ @Disabled("For manual smoke testing only.") @Testcontainers -@SpringBootTest(classes = OllamaWithOpenAiChatModelIT.Config.class) +@SpringBootTest class OllamaWithOpenAiChatModelIT { private static final Logger logger = LoggerFactory.getLogger(OllamaWithOpenAiChatModelIT.class); diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/PerplexityWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/PerplexityWithOpenAiChatModelIT.java index a0c47d193bb..ddd997cd943 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/PerplexityWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/PerplexityWithOpenAiChatModelIT.java @@ -69,7 +69,7 @@ * For more information on Perplexity's behavior, refer to its API documentation: * perplexity-api */ -@SpringBootTest(classes = PerplexityWithOpenAiChatModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "PERPLEXITY_API_KEY", matches = ".+") @Disabled("Requires Perplexity credits") class PerplexityWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/VertexAIGeminiWithOpenAiChatModelIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/VertexAIGeminiWithOpenAiChatModelIT.java index d25c3190f9c..909d0b3b934 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/VertexAIGeminiWithOpenAiChatModelIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/VertexAIGeminiWithOpenAiChatModelIT.java @@ -48,7 +48,7 @@ /** * @author Jonghoon Park */ -@SpringBootTest(classes = VertexAIGeminiWithOpenAiChatModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "GEMINI_API_KEY", matches = ".+") class VertexAIGeminiWithOpenAiChatModelIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/embedding/OpenAiEmbeddingModelObservationIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/embedding/OpenAiEmbeddingModelObservationIT.java index 5d3cd477653..05de5a468db 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/embedding/OpenAiEmbeddingModelObservationIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/embedding/OpenAiEmbeddingModelObservationIT.java @@ -49,7 +49,7 @@ * * @author Thomas Vitale */ -@SpringBootTest(classes = OpenAiEmbeddingModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiEmbeddingModelObservationIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelNoOpApiKeysIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelNoOpApiKeysIT.java index bbd3373f826..c70e2973d88 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelNoOpApiKeysIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelNoOpApiKeysIT.java @@ -39,7 +39,7 @@ /** * @author Ilayaperumal Gopinathan */ -@SpringBootTest(classes = OpenAiImageModelNoOpApiKeysIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiImageModelNoOpApiKeysIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelObservationIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelObservationIT.java index 8a6fb12b13b..70f747ecd93 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelObservationIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageModelObservationIT.java @@ -46,7 +46,7 @@ * * @author Thomas Vitale */ -@SpringBootTest(classes = OpenAiImageModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiImageModelObservationIT { diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/moderation/OpenAiModerationModelNoOpApiKeysIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/moderation/OpenAiModerationModelNoOpApiKeysIT.java index 57bfcbb6046..faecbbbea3a 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/moderation/OpenAiModerationModelNoOpApiKeysIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/moderation/OpenAiModerationModelNoOpApiKeysIT.java @@ -34,7 +34,7 @@ /** * @author Ilayaperumal Gopinathan */ -@SpringBootTest(classes = OpenAiModerationModelNoOpApiKeysIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class OpenAiModerationModelNoOpApiKeysIT { diff --git a/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingModelObservationTests.java b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingModelObservationTests.java index db0fcc561f6..1996039ffb1 100644 --- a/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingModelObservationTests.java +++ b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingModelObservationTests.java @@ -44,7 +44,7 @@ * * @author Christian Tzolov */ -@SpringBootTest(classes = TransformersEmbeddingModelObservationTests.Config.class) +@SpringBootTest public class TransformersEmbeddingModelObservationTests { @Autowired diff --git a/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModelIT.java b/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModelIT.java index b38fbc9638f..24eacd94da8 100644 --- a/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModelIT.java +++ b/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModelIT.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = VertexAiMultimodalEmbeddingModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_PROJECT_ID", matches = ".*") @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_LOCATION", matches = ".*") class VertexAiMultimodalEmbeddingModelIT { diff --git a/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelIT.java b/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelIT.java index fc7105807af..2c30ce03774 100644 --- a/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelIT.java +++ b/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelIT.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(classes = VertexAiTextEmbeddingModelIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_PROJECT_ID", matches = ".*") @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_LOCATION", matches = ".*") class VertexAiTextEmbeddingModelIT { diff --git a/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelObservationIT.java b/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelObservationIT.java index f6e6bbbbe70..9648190ad02 100644 --- a/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelObservationIT.java +++ b/models/spring-ai-vertex-ai-embedding/src/test/java/org/springframework/ai/vertexai/embedding/text/VertexAiTextEmbeddingModelObservationIT.java @@ -46,7 +46,7 @@ * * @author Christian Tzolov */ -@SpringBootTest(classes = VertexAiTextEmbeddingModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_PROJECT_ID", matches = ".*") @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_LOCATION", matches = ".*") public class VertexAiTextEmbeddingModelObservationIT { diff --git a/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/chat/ZhiPuAiChatModelObservationIT.java b/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/chat/ZhiPuAiChatModelObservationIT.java index a01fc35ec0d..83a89d488d5 100644 --- a/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/chat/ZhiPuAiChatModelObservationIT.java +++ b/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/chat/ZhiPuAiChatModelObservationIT.java @@ -50,7 +50,7 @@ * * @author Geng Rong */ -@SpringBootTest(classes = ZhiPuAiChatModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "ZHIPU_AI_API_KEY", matches = ".+") public class ZhiPuAiChatModelObservationIT { diff --git a/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/embedding/ZhiPuAiEmbeddingModelObservationIT.java b/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/embedding/ZhiPuAiEmbeddingModelObservationIT.java index 11f3bc70f75..4ac0eab2331 100644 --- a/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/embedding/ZhiPuAiEmbeddingModelObservationIT.java +++ b/models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/embedding/ZhiPuAiEmbeddingModelObservationIT.java @@ -48,7 +48,7 @@ * * @author Geng Rong */ -@SpringBootTest(classes = ZhiPuAiEmbeddingModelObservationIT.Config.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "ZHIPU_AI_API_KEY", matches = ".+") public class ZhiPuAiEmbeddingModelObservationIT { diff --git a/spring-ai-model/src/test/java/org/springframework/ai/model/tool/DefaultToolCallingManagerIT.java b/spring-ai-model/src/test/java/org/springframework/ai/model/tool/DefaultToolCallingManagerIT.java index 0aa31889cdf..09bf5886149 100644 --- a/spring-ai-model/src/test/java/org/springframework/ai/model/tool/DefaultToolCallingManagerIT.java +++ b/spring-ai-model/src/test/java/org/springframework/ai/model/tool/DefaultToolCallingManagerIT.java @@ -50,7 +50,7 @@ * * @author Thomas Vitale */ -@SpringBootTest(classes = DefaultToolCallingManagerIT.Config.class) +@SpringBootTest class DefaultToolCallingManagerIT { @Autowired diff --git a/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreVectorStoreChatMemoryAdvisorIT.java b/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreVectorStoreChatMemoryAdvisorIT.java index 9a84f71b28d..b7b6ae8fa4f 100644 --- a/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreVectorStoreChatMemoryAdvisorIT.java +++ b/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreVectorStoreChatMemoryAdvisorIT.java @@ -38,12 +38,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; import static org.assertj.core.api.Assertions.assertThat; @Testcontainers -@SpringBootTest(classes = PgVectorStoreVectorStoreChatMemoryAdvisorIT.OpenAiTestConfiguration.class) +@SpringBootTest @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+") public class PgVectorStoreVectorStoreChatMemoryAdvisorIT { @@ -335,7 +336,7 @@ private static JdbcTemplate createJdbcTemplateWithConnectionToTestcontainer() { return new JdbcTemplate(ds); } - @org.springframework.context.annotation.Configuration + @Configuration public static class OpenAiTestConfiguration { @Bean