From 9dcf003790bee482c5dc938b25ed4eabf7e68ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Sat, 7 Dec 2024 22:25:18 -0600 Subject: [PATCH 1/2] Polish PostgresMlEmbeddingModelIT --- .../ai/postgresml/PostgresMlEmbeddingModelIT.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModelIT.java b/models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModelIT.java index 3a5ef2e4dcb..dd30608252d 100644 --- a/models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModelIT.java +++ b/models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModelIT.java @@ -16,8 +16,6 @@ package org.springframework.ai.postgresml; -import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Map; @@ -28,7 +26,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; +import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; @@ -51,6 +49,7 @@ /** * @author Toshiaki Maki + * @author Eddú Meléndez */ @JdbcTest(properties = "logging.level.sql=TRACE") @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @@ -63,12 +62,10 @@ class PostgresMlEmbeddingModelIT { static PostgreSQLContainer postgres = new PostgreSQLContainer<>( DockerImageName.parse("ghcr.io/postgresml/postgresml:2.8.1").asCompatibleSubstituteFor("postgres")) .withCommand("sleep", "infinity") - .withLabel("org.springframework.boot.service-connection", "postgres") .withUsername("postgresml") .withPassword("postgresml") .withDatabaseName("postgresml") - .waitingFor(new LogMessageWaitStrategy().withRegEx(".*Starting dashboard.*\\s") - .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))); + .waitingFor(Wait.forLogMessage(".*Starting dashboard.*\\s", 1)); @Autowired JdbcTemplate jdbcTemplate; From 6d471adf21b6cf7a98d3a8530bd26533e2ec5d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Sat, 7 Dec 2024 22:35:17 -0600 Subject: [PATCH 2/2] Polish postgresml autoconfiguration IT --- .../postgresml/PostgresMlAutoConfigurationIT.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/postgresml/PostgresMlAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/postgresml/PostgresMlAutoConfigurationIT.java index 096dea81607..b41b2fe5e67 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/postgresml/PostgresMlAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/postgresml/PostgresMlAutoConfigurationIT.java @@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; +import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; @@ -54,12 +55,10 @@ public class PostgresMlAutoConfigurationIT { static PostgreSQLContainer postgres = new PostgreSQLContainer<>( DockerImageName.parse("ghcr.io/postgresml/postgresml:2.8.1").asCompatibleSubstituteFor("postgres")) .withCommand("sleep", "infinity") - .withLabel("org.springframework.boot.service-connection", "postgres") .withUsername("postgresml") .withPassword("postgresml") .withDatabaseName("postgresml") - .waitingFor(new LogMessageWaitStrategy().withRegEx(".*Starting dashboard.*\\s") - .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))); + .waitingFor(Wait.forLogMessage(".*Starting dashboard.*\\s", 1)); @Autowired JdbcTemplate jdbcTemplate;