Skip to content

Commit 4339437

Browse files
committed
Polish usage of @SpringBootTest
1. Remove redundant `classes` if it's nested configuration class which will be auto picked 2. Use implicit `value` instead of explicit `properties` 3. Remove redundant `@ExtendWith(SpringExtension.class)` Signed-off-by: Yanming Zhou <[email protected]>
1 parent a7b837a commit 4339437

File tree

55 files changed

+63
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+63
-68
lines changed

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,17 @@
3535
import org.springframework.boot.test.context.SpringBootTest;
3636
import org.springframework.context.ApplicationContext;
3737
import org.springframework.jdbc.core.JdbcTemplate;
38-
import org.springframework.test.context.junit.jupiter.SpringExtension;
3938

4039
import static org.assertj.core.api.Assertions.assertThat;
4140
import static org.assertj.core.api.Assertions.fail;
4241

43-
@ExtendWith(SpringExtension.class)
44-
@SpringBootTest(classes = JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.TestConfig.class,
45-
properties = { "spring.datasource.url=jdbc:hsqldb:mem:chat_memory_auto_configuration_test;DB_CLOSE_DELAY=-1",
46-
"spring.datasource.username=sa", "spring.datasource.password=",
47-
"spring.datasource.driver-class-name=org.hsqldb.jdbcDriver",
48-
"spring.ai.chat.memory.repository.jdbc.initialize-schema=always", "spring.sql.init.mode=always",
49-
"spring.jpa.hibernate.ddl-auto=none", "spring.jpa.defer-datasource-initialization=true",
50-
"spring.sql.init.continue-on-error=true", "spring.sql.init.schema-locations=classpath:schema.sql",
51-
"logging.level.org.springframework.jdbc=DEBUG",
52-
"logging.level.org.springframework.boot.sql.init=DEBUG" })
42+
@SpringBootTest({ "spring.datasource.url=jdbc:hsqldb:mem:chat_memory_auto_configuration_test;DB_CLOSE_DELAY=-1",
43+
"spring.datasource.username=sa", "spring.datasource.password=",
44+
"spring.datasource.driver-class-name=org.hsqldb.jdbcDriver",
45+
"spring.ai.chat.memory.repository.jdbc.initialize-schema=always", "spring.sql.init.mode=always",
46+
"spring.jpa.hibernate.ddl-auto=none", "spring.jpa.defer-datasource-initialization=true",
47+
"spring.sql.init.continue-on-error=true", "spring.sql.init.schema-locations=classpath:schema.sql",
48+
"logging.level.org.springframework.jdbc=DEBUG", "logging.level.org.springframework.boot.sql.init=DEBUG" })
5349
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY)
5450
@ImportAutoConfiguration({ org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration.class,
5551
JdbcChatMemoryRepositoryAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,

auto-configurations/models/spring-ai-autoconfigure-model-postgresml-embedding/src/test/java/org/springframework/ai/model/postgresml/autoconfigure/PostgresMlEmbeddingPropertiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* @author Utkarsh Srivastava
3636
* @author Christian Tzolov
3737
*/
38-
@SpringBootTest(properties = { "spring.ai.postgresml.embedding.options.metadata-mode=all",
38+
@SpringBootTest({ "spring.ai.postgresml.embedding.options.metadata-mode=all",
3939
"spring.ai.postgresml.embedding.options.kwargs.key1=value1",
4040
"spring.ai.postgresml.embedding.options.kwargs.key2=value2",
4141
"spring.ai.postgresml.embedding.options.transformer=abc123" })

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositorySqlServerIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Yanming Zhou
2929
* @author Eddú Meléndez
3030
*/
31-
@SpringBootTest(properties = "spring.datasource.url=jdbc:tc:sqlserver:2022-latest:///")
31+
@SpringBootTest("spring.datasource.url=jdbc:tc:sqlserver:2022-latest:///")
3232
@Sql(scripts = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-sqlserver.sql",
3333
executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS)
3434
class JdbcChatMemoryRepositorySqlServerIT extends AbstractJdbcChatMemoryRepositoryIT {

memory/repository/spring-ai-model-chat-memory-repository-mongodb/src/test/java/org/springframework/ai/chat/memory/repository/mongo/MongoChatMemoryRepositoryIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
*
5050
* @author Łukasz Jernaś
5151
*/
52-
@SpringBootTest(classes = MongoChatMemoryRepositoryIT.TestConfiguration.class)
52+
@SpringBootTest
5353
public class MongoChatMemoryRepositoryIT {
5454

5555
@Autowired

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelAdditionalHttpHeadersIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/**
3737
* @author Christian Tzolov
3838
*/
39-
@SpringBootTest(classes = AnthropicChatModelAdditionalHttpHeadersIT.Config.class)
39+
@SpringBootTest
4040
@EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+")
4141
public class AnthropicChatModelAdditionalHttpHeadersIT {
4242

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
import static org.assertj.core.api.Assertions.assertThat;
6767

68-
@SpringBootTest(classes = AnthropicChatModelIT.Config.class, properties = "spring.ai.retry.on-http-codes=429")
68+
@SpringBootTest("spring.ai.retry.on-http-codes=429")
6969
@EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+")
7070
class AnthropicChatModelIT {
7171

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelObservationIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
* @author Thomas Vitale
5151
* @author Alexandros Pappas
5252
*/
53-
@SpringBootTest(classes = AnthropicChatModelObservationIT.Config.class,
54-
properties = "spring.ai.retry.on-http-codes=429")
53+
@SpringBootTest("spring.ai.retry.on-http-codes=429")
5554
@EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+")
5655
public class AnthropicChatModelObservationIT {
5756

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicCitationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* @author Soby Chacko
4444
* @since 1.1.0
4545
*/
46-
@SpringBootTest(classes = AnthropicCitationIT.Config.class)
46+
@SpringBootTest
4747
@EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+")
4848
class AnthropicCitationIT {
4949

models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiAudioTranscriptionModelIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*
4444
* @author Piotr Olaszewski
4545
*/
46-
@SpringBootTest(classes = AzureOpenAiAudioTranscriptionModelIT.TestConfiguration.class)
46+
@SpringBootTest
4747
@EnabledIfEnvironmentVariables({
4848
@EnabledIfEnvironmentVariable(named = "AZURE_OPENAI_TRANSCRIPTION_API_KEY", matches = ".+"),
4949
@EnabledIfEnvironmentVariable(named = "AZURE_OPENAI_TRANSCRIPTION_ENDPOINT", matches = ".+") })

models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
/**
4545
* @author Soby Chacko
4646
*/
47-
@SpringBootTest(classes = AzureOpenAiChatClientIT.TestConfiguration.class)
47+
@SpringBootTest
4848
@RequiresAzureCredentials
4949
public class AzureOpenAiChatClientIT {
5050

0 commit comments

Comments
 (0)