Skip to content

Polish PostgresML integration tests #1890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Polish PostgresML integration tests #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dcf003
Polish PostgresMlEmbeddingModelIT
eddumelendez Dec 8, 2024
6d471ad
Polish postgresml autoconfiguration IT
eddumelendez Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...ostgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingModelIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -51,6 +49,7 @@

/**
* @author Toshiaki Maki
* @author Eddú Meléndez
*/
@JdbcTest(properties = "logging.level.sql=TRACE")
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
Expand All @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions ...t/java/org/springframework/ai/autoconfigure/postgresml/PostgresMlAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading