Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-198 - Upgrade to Spring Boot 3.1 snapshots.

Browse Source 
Switch verification of mock beans as Mockito 5.3.0 uses a different MockMaker by default that doesn't add the explicit interface we have previously checked for.

Remove obsolete init- and destroy method declarations from service bean definitions in examples.
This commit is contained in:
Oliver Drotbohm
2023-05-02 14:28:10 +02:00
parent 596e8828a2
commit d7ef7c9dea
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -46,7 +46,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.version>6.0.8</spring.version> <!-- For Javadoc links only --> <spring.version>6.0.8</spring.version> <!-- For Javadoc links only -->
<spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version> <spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
<spring-boot.version>3.0.6</spring-boot.version> <spring-boot.version>3.1.0-SNAPSHOT</spring-boot.version>
</properties> </properties>

2
spring-modulith-examples/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.0-RC1</version> <version>3.1.0-SNAPSHOT</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-modulith-examples/spring-modulith-examples-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java
View File

@@ -48,8 +48,8 @@ class ApplicationIntegrationTests {
@TestConfiguration @TestConfiguration
static class Infrastructure { static class Infrastructure {
@Bean
@ServiceConnection @ServiceConnection
@Bean(initMethod = "start", destroyMethod = "stop")
PostgreSQLContainer<?> database() { PostgreSQLContainer<?> database() {
return new PostgreSQLContainer<>("postgres:15.2"); return new PostgreSQLContainer<>("postgres:15.2");
} }

2
spring-modulith-examples/spring-modulith-examples-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java
View File

@@ -51,8 +51,8 @@ class ApplicationIntegrationTests {
@TestConfiguration @TestConfiguration
static class MongoDbInfrastructureConfiguration { static class MongoDbInfrastructureConfiguration {
@Bean
@ServiceConnection @ServiceConnection
@Bean(initMethod = "start", destroyMethod = "stop")
MongoDBContainer mongoDBContainer() { MongoDBContainer mongoDBContainer() {
return new MongoDBContainer("mongo:6.0.3"); return new MongoDBContainer("mongo:6.0.3");
} }

4
spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.internal.creation.bytebuddy.MockAccess; import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.MockBean;
@@ -62,7 +62,7 @@ class ModuleBTest {
context.getBean(ServiceComponentB.class); context.getBean(ServiceComponentB.class);
assertThat(context.getBean(ServiceComponentA.class)).isInstanceOf(MockAccess.class); assertThat(Mockito.mockingDetails(context.getBean(ServiceComponentA.class)).isMock()).isTrue();
} }
@Test @Test