GH-795 - Using @MockitoBean and @MockitoSpyBean.
This commit is contained in:
committed by
Oliver Drotbohm
parent
5d57e2ce0f
commit
2b6a0bebf2
@@ -26,13 +26,13 @@ import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||
import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.boot.test.mock.mockito.SpyBean;
|
||||
import org.springframework.jdbc.core.JdbcOperations;
|
||||
import org.springframework.modulith.events.core.EventSerializer;
|
||||
import org.springframework.modulith.testapp.TestApplication;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
|
||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||
|
||||
/**
|
||||
@@ -48,7 +48,7 @@ class DatabaseSchemaInitializerIntegrationTests {
|
||||
@ContextConfiguration(classes = TestApplication.class)
|
||||
@Testcontainers(disabledWithoutDocker = true)
|
||||
static class TestBase {
|
||||
@MockBean EventSerializer serializer;
|
||||
@MockitoBean EventSerializer serializer;
|
||||
}
|
||||
|
||||
@Nested
|
||||
@@ -73,7 +73,7 @@ class DatabaseSchemaInitializerIntegrationTests {
|
||||
@JdbcTest(properties = "spring.modulith.events.jdbc.schema-initialization.enabled=false")
|
||||
class InitializationDisabledExplicitly extends TestBase {
|
||||
|
||||
@SpyBean JdbcOperations operations;
|
||||
@MockitoSpyBean JdbcOperations operations;
|
||||
@Autowired Optional<DatabaseSchemaInitializer> initializer;
|
||||
|
||||
@Test // GH-3
|
||||
@@ -91,7 +91,7 @@ class DatabaseSchemaInitializerIntegrationTests {
|
||||
@JdbcTest
|
||||
class InitializationDisabledByDefault extends TestBase {
|
||||
|
||||
@SpyBean JdbcOperations operations;
|
||||
@MockitoSpyBean JdbcOperations operations;
|
||||
@Autowired Optional<DatabaseSchemaInitializer> initializer;
|
||||
|
||||
@Test // GH-3
|
||||
|
||||
@@ -20,11 +20,11 @@ import static org.assertj.core.api.Assertions.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.modulith.events.core.EventPublicationRegistry;
|
||||
import org.springframework.modulith.events.core.EventSerializer;
|
||||
import org.springframework.modulith.testapp.TestApplication;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
|
||||
/**
|
||||
* @author Dmitry Belyaev
|
||||
@@ -38,7 +38,7 @@ class JdbcEventPublicationAutoConfigurationIntegrationTests {
|
||||
|
||||
@Autowired ApplicationContext context;
|
||||
|
||||
@MockBean EventSerializer serializer;
|
||||
@MockitoBean EventSerializer serializer;
|
||||
|
||||
@Test // GH-3
|
||||
void bootstrapsApplicationComponents() {
|
||||
|
||||
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Nested;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.jdbc.core.JdbcOperations;
|
||||
import org.springframework.modulith.events.core.EventSerializer;
|
||||
@@ -69,7 +69,7 @@ class JdbcEventPublicationRepositoryIntegrationTests {
|
||||
@Autowired JdbcEventPublicationRepository repository;
|
||||
@Autowired JdbcRepositorySettings properties;
|
||||
|
||||
@MockBean EventSerializer serializer;
|
||||
@MockitoBean EventSerializer serializer;
|
||||
|
||||
@BeforeEach
|
||||
void cleanUp() {
|
||||
|
||||
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
import org.springframework.modulith.events.core.EventSerializer;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.TestConstructor;
|
||||
@@ -41,7 +41,7 @@ class JpaEventPublicationAutoConfigurationIntegrationTests {
|
||||
|
||||
private final BeanFactory factory;
|
||||
|
||||
@MockBean EventSerializer serializer;
|
||||
@MockitoBean EventSerializer serializer;
|
||||
|
||||
@Test // GH-10
|
||||
void registersJpaEventPublicationPackageForAutoConfiguration() {
|
||||
|
||||
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.modulith.events.core.EventPublicationRegistry;
|
||||
import org.springframework.modulith.events.core.EventSerializer;
|
||||
@@ -41,7 +41,7 @@ class JpaEventPublicationConfigurationIntegrationTests {
|
||||
|
||||
private final ApplicationContext context;
|
||||
|
||||
@MockBean EventSerializer serializer;
|
||||
@MockitoBean EventSerializer serializer;
|
||||
|
||||
@Test
|
||||
void bootstrapsApplicationComponents() {
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.neo4j.driver.AuthTokens;
|
||||
import org.neo4j.driver.Driver;
|
||||
import org.neo4j.driver.GraphDatabase;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
@@ -69,7 +69,7 @@ class Neo4jEventPublicationRepositoryTest {
|
||||
@Autowired Driver driver;
|
||||
@Autowired Environment environment;
|
||||
|
||||
@MockBean EventSerializer eventSerializer;
|
||||
@MockitoBean EventSerializer eventSerializer;
|
||||
|
||||
CompletionMode completionMode;
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.neo4j.driver.GraphDatabase;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||
import org.springframework.boot.test.autoconfigure.data.neo4j.DataNeo4jTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.data.neo4j.core.Neo4jClient;
|
||||
@@ -52,7 +52,7 @@ class Neo4jIndexInitializerTest {
|
||||
@Container private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(DockerImageName.parse("neo4j:5"))
|
||||
.withRandomPassword();
|
||||
|
||||
@MockBean EventSerializer eventSerializer;
|
||||
@MockitoBean EventSerializer eventSerializer;
|
||||
|
||||
@Configuration
|
||||
static class Config {
|
||||
|
||||
Reference in New Issue
Block a user