Skip to content

Commit

Permalink
Extracted test configuration in its own class
Browse files Browse the repository at this point in the history
  • Loading branch information
simasch committed Dec 29, 2023
1 parent 1b14aa1 commit 56be2fd
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 17 deletions.
15 changes: 2 additions & 13 deletions src/test/java/ch/martinelli/vj/TestVjApplication.java
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
package ch.martinelli.vj;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
import org.springframework.context.annotation.Bean;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.utility.DockerImageName;
import org.springframework.context.annotation.Import;

@TestConfiguration(proxyBeanMethods = false)
@Import(TestVjConfiguration.class)
public class TestVjApplication {

@Bean
@ServiceConnection
PostgreSQLContainer<?> postgresContainer() {
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:latest"));
}

public static void main(String[] args) {
SpringApplication.from(VjApplication::main).with(TestVjApplication.class).run(args);
}

}
18 changes: 18 additions & 0 deletions src/test/java/ch/martinelli/vj/TestVjConfiguration.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package ch.martinelli.vj;

import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
import org.springframework.context.annotation.Bean;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.utility.DockerImageName;

@TestConfiguration(proxyBeanMethods = false)
public class TestVjConfiguration {

@Bean
@ServiceConnection
PostgreSQLContainer<?> postgresContainer() {
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:latest"));
}

}
4 changes: 2 additions & 2 deletions src/test/java/ch/martinelli/vj/ui/KaribuTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.martinelli.vj.ui;

import ch.martinelli.vj.TestVjApplication;
import ch.martinelli.vj.TestVjConfiguration;
import com.github.mvysny.kaributesting.mockhttp.MockRequest;
import com.github.mvysny.kaributesting.v10.MockVaadin;
import com.github.mvysny.kaributesting.v10.Routes;
Expand All @@ -23,7 +23,7 @@
import java.util.List;
import java.util.stream.Collectors;

@Import(TestVjApplication.class)
@Import(TestVjConfiguration.class)
@SpringBootTest
public abstract class KaribuTest {

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/ch/martinelli/vj/ui/PlaywrightIT.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.martinelli.vj.ui;

import ch.martinelli.vj.TestVjApplication;
import ch.martinelli.vj.TestVjConfiguration;
import com.microsoft.playwright.*;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
Expand All @@ -11,7 +11,7 @@
import org.springframework.context.annotation.Import;


@Import(TestVjApplication.class)
@Import(TestVjConfiguration.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public abstract class PlaywrightIT {

Expand Down

0 comments on commit 56be2fd

Please sign in to comment.