Skip to content

Commit d7ef7c9

Browse files
committed
GH-198 - Upgrade to Spring Boot 3.1 snapshots.
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.
1 parent 596e882 commit d7ef7c9

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4747
<spring.version>6.0.8</spring.version> <!-- For Javadoc links only -->
4848
<spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
49-
<spring-boot.version>3.0.6</spring-boot.version>
49+
<spring-boot.version>3.1.0-SNAPSHOT</spring-boot.version>
5050

5151
</properties>
5252

spring-modulith-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.1.0-RC1</version>
7+
<version>3.1.0-SNAPSHOT</version>
88
<relativePath />
99
</parent>
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class ApplicationIntegrationTests {
4848
@TestConfiguration
4949
static class Infrastructure {
5050

51+
@Bean
5152
@ServiceConnection
52-
@Bean(initMethod = "start", destroyMethod = "stop")
5353
PostgreSQLContainer<?> database() {
5454
return new PostgreSQLContainer<>("postgres:15.2");
5555
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class ApplicationIntegrationTests {
5151
@TestConfiguration
5252
static class MongoDbInfrastructureConfiguration {
5353

54+
@Bean
5455
@ServiceConnection
55-
@Bean(initMethod = "start", destroyMethod = "stop")
5656
MongoDBContainer mongoDBContainer() {
5757
return new MongoDBContainer("mongo:6.0.3");
5858
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.junit.jupiter.api.Nested;
2121
import org.junit.jupiter.api.Test;
22-
import org.mockito.internal.creation.bytebuddy.MockAccess;
22+
import org.mockito.Mockito;
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
2525
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -62,7 +62,7 @@ void bootstrapsModuleB() {
6262

6363
context.getBean(ServiceComponentB.class);
6464

65-
assertThat(context.getBean(ServiceComponentA.class)).isInstanceOf(MockAccess.class);
65+
assertThat(Mockito.mockingDetails(context.getBean(ServiceComponentA.class)).isMock()).isTrue();
6666
}
6767

6868
@Test

0 commit comments

Comments
 (0)