Skip to content

Commit 30bb587

Browse files
nramcnramc
authored
Merge pull request #475 from nramc/404-feature-remove-deprecated-mockbean-to-appropriate-mockito-bean
404-feature-remove-deprecated-mockbean-to-appropriate-mockito-bean
2 parents 7a7ab34 + 68b1095 commit 30bb587

18 files changed

+84
-93
lines changed

‎src/main/java/com/github/nramc/dev/journey/api/config/security/SecurityHeadersCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class SecurityHeadersCustomizer implements Customizer<HeadersConfigurer<H
1313

1414
@Override
1515
public void customize(HeadersConfigurer<HttpSecurity> headersConfigurer) {
16-
headersConfigurer.permissionsPolicy(permissions -> permissions.policy("accelerometer=(),ambient-light-sensor=(),autoplay=(),battery=(),camera=(),display-capture=(),document-domain=(),encrypted-media=(),fullscreen=(self),gamepad=(),geolocation=(),gyroscope=(),layout-animations=(self),legacy-image-formats=(self),magnetometer=(),microphone=(),midi=(),oversized-images=(self),payment=(),picture-in-picture=(),publickey-credentials-stats=(),speaker-selection=(),sync-xhr=(self),unoptimized-images=(self),unsized-media=(self),usb=(),screen-wake-lock=(),web-share=(),xr-spatial-tracking=()"));
16+
headersConfigurer.permissionsPolicyHeader(permissions -> permissions.policy("accelerometer=(),ambient-light-sensor=(),autoplay=(),battery=(),camera=(),display-capture=(),document-domain=(),encrypted-media=(),fullscreen=(self),gamepad=(),geolocation=(),gyroscope=(),layout-animations=(self),legacy-image-formats=(self),magnetometer=(),microphone=(),midi=(),oversized-images=(self),payment=(),picture-in-picture=(),publickey-credentials-stats=(),speaker-selection=(),sync-xhr=(self),unoptimized-images=(self),unsized-media=(self),usb=(),screen-wake-lock=(),web-share=(),xr-spatial-tracking=()"));
1717

1818
headersConfigurer.referrerPolicy(referrer -> referrer.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.NO_REFERRER));
1919

‎src/test/java/com/github/nramc/dev/journey/api/core/usecase/registration/RegistrationUseCaseTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import org.junit.jupiter.api.extension.ExtendWith;
1313
import org.springframework.beans.factory.annotation.Autowired;
1414
import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
15-
import org.springframework.boot.test.mock.mockito.MockBean;
1615
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
1716
import org.springframework.security.crypto.password.PasswordEncoder;
1817
import org.springframework.security.provisioning.UserDetailsManager;
1918
import org.springframework.test.context.ContextConfiguration;
19+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2020
import org.springframework.test.context.junit.jupiter.SpringExtension;
2121

2222
import java.time.LocalDateTime;
@@ -39,15 +39,15 @@ class RegistrationUseCaseTest {
3939
.roles(Set.of(Role.AUTHENTICATED_USER))
4040
.build();
4141
@Autowired
42-
private UserDetailsManager userDetailsManager;
42+
UserDetailsManager userDetailsManager;
4343
@Autowired
44-
private Validator validator;
44+
Validator validator;
4545
@Autowired
46-
private PasswordEncoder passwordEncoder;
47-
@MockBean
48-
private AccountActivationUseCase accountActivationUseCase;
49-
@MockBean
50-
private EmailNotificationUseCase emailNotificationUseCase;
46+
PasswordEncoder passwordEncoder;
47+
@MockitoBean
48+
AccountActivationUseCase accountActivationUseCase;
49+
@MockitoBean
50+
EmailNotificationUseCase emailNotificationUseCase;
5151

5252
private RegistrationUseCase registrationUseCase;
5353

‎src/test/java/com/github/nramc/dev/journey/api/gateway/MailServiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
1414
import org.springframework.boot.test.context.SpringBootTest;
15-
import org.springframework.boot.test.mock.mockito.SpyBean;
1615
import org.springframework.mail.SimpleMailMessage;
1716
import org.springframework.mail.javamail.JavaMailSender;
1817
import org.springframework.test.context.ActiveProfiles;
1918
import org.springframework.test.context.DynamicPropertyRegistry;
2019
import org.springframework.test.context.DynamicPropertySource;
20+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
2121
import org.testcontainers.containers.GenericContainer;
2222
import org.testcontainers.containers.wait.strategy.Wait;
2323
import org.testcontainers.junit.jupiter.Container;
@@ -53,10 +53,10 @@ static void configureMail(DynamicPropertyRegistry registry) {
5353
}
5454

5555
@Autowired
56-
private MailService mailService;
56+
MailService mailService;
5757

58-
@SpyBean
59-
private JavaMailSender emailSender;
58+
@MockitoSpyBean
59+
JavaMailSender emailSender;
6060

6161
@Test
6262
void context() {

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/auth/login/LoginResourceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.github.nramc.dev.journey.api.web.resources.rest.auth.login;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
54
import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
5+
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
66
import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
77
import com.github.nramc.dev.journey.api.core.jwt.JwtGenerator;
88
import com.github.nramc.dev.journey.api.core.jwt.JwtProperties;
@@ -14,10 +14,10 @@
1414
import org.springframework.boot.context.properties.EnableConfigurationProperties;
1515
import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson;
1616
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
17-
import org.springframework.boot.test.mock.mockito.MockBean;
1817
import org.springframework.context.annotation.Import;
1918
import org.springframework.http.MediaType;
2019
import org.springframework.test.context.ActiveProfiles;
20+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2121
import org.springframework.test.web.servlet.MockMvc;
2222
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
2323

@@ -47,11 +47,11 @@
4747
@AutoConfigureJson
4848
class LoginResourceTest {
4949
@Autowired
50-
private MockMvc mockMvc;
50+
MockMvc mockMvc;
5151
@Autowired
52-
private ObjectMapper objectMapper;
53-
@MockBean
54-
private UserSecurityAttributeService attributeService;
52+
ObjectMapper objectMapper;
53+
@MockitoBean
54+
UserSecurityAttributeService attributeService;
5555

5656
@Test
5757
void test() {

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/auth/mfa/MultiFactorAuthenticationResourceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import org.springframework.boot.context.properties.EnableConfigurationProperties;
1313
import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson;
1414
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
15-
import org.springframework.boot.test.mock.mockito.MockBean;
1615
import org.springframework.context.annotation.Import;
1716
import org.springframework.http.MediaType;
1817
import org.springframework.test.context.ActiveProfiles;
18+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1919
import org.springframework.test.web.servlet.MockMvc;
2020
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
2121

@@ -49,9 +49,9 @@ class MultiFactorAuthenticationResourceTest {
4949
"value": "%s"
5050
}""";
5151
@Autowired
52-
private MockMvc mockMvc;
53-
@MockBean
54-
private ConfirmationCodeUseCase confirmationCodeUseCase;
52+
MockMvc mockMvc;
53+
@MockitoBean
54+
ConfirmationCodeUseCase confirmationCodeUseCase;
5555

5656
@Test
5757
void test() {

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/create/CreateJourneyResourceTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import org.junit.jupiter.params.provider.ValueSource;
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
14-
import org.springframework.boot.test.mock.mockito.MockBean;
1514
import org.springframework.context.annotation.Import;
1615
import org.springframework.http.MediaType;
1716
import org.springframework.security.test.context.support.WithAnonymousUser;
1817
import org.springframework.test.context.ActiveProfiles;
18+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1919
import org.springframework.test.web.servlet.MockMvc;
2020
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
2121

@@ -36,12 +36,11 @@
3636
@WebMvcTest(CreateJourneyResource.class)
3737
@Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
3838
@ActiveProfiles({"prod", "test"})
39-
@MockBean({JourneyRepository.class})
4039
class CreateJourneyResourceTest {
4140
@Autowired
4241
private MockMvc mockMvc;
43-
@Autowired
44-
private JourneyRepository journeyRepository;
42+
@MockitoBean
43+
JourneyRepository journeyRepository;
4544

4645
@BeforeEach
4746
void setup() {

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/find/FindJourneyByIdResourceTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import org.junit.jupiter.api.Test;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
13-
import org.springframework.boot.test.mock.mockito.MockBean;
1413
import org.springframework.context.annotation.Import;
1514
import org.springframework.http.MediaType;
1615
import org.springframework.security.test.context.support.WithAnonymousUser;
1716
import org.springframework.test.context.ActiveProfiles;
17+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1818
import org.springframework.test.web.servlet.MockMvc;
1919
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
2020

@@ -34,12 +34,11 @@
3434
@WebMvcTest(FindJourneyByIdResource.class)
3535
@Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
3636
@ActiveProfiles({"prod", "test"})
37-
@MockBean({JourneyRepository.class})
3837
class FindJourneyByIdResourceTest {
3938
@Autowired
40-
private MockMvc mockMvc;
41-
@Autowired
42-
private JourneyRepository journeyRepository;
39+
MockMvc mockMvc;
40+
@MockitoBean
41+
JourneyRepository journeyRepository;
4342

4443
@Test
4544
@WithMockAuthenticatedUser

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/basic/UpdateJourneyBasicDetailsResourceTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package com.github.nramc.dev.journey.api.web.resources.rest.journeys.update.basic;
22

3-
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
43
import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
4+
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
55
import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
66
import com.github.nramc.dev.journey.api.config.security.WithMockGuestUser;
77
import com.github.nramc.dev.journey.api.repository.journey.JourneyRepository;
88
import com.github.nramc.dev.journey.api.web.resources.Resources;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
12-
import org.springframework.boot.test.mock.mockito.MockBean;
1312
import org.springframework.context.annotation.Import;
1413
import org.springframework.http.HttpHeaders;
1514
import org.springframework.http.MediaType;
1615
import org.springframework.security.test.context.support.WithAnonymousUser;
1716
import org.springframework.test.context.ActiveProfiles;
17+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1818
import org.springframework.test.web.servlet.MockMvc;
1919
import org.springframework.test.web.servlet.ResultMatcher;
2020

@@ -36,7 +36,6 @@
3636
@WebMvcTest(UpdateJourneyBasicDetailsResource.class)
3737
@Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
3838
@ActiveProfiles({"prod", "test"})
39-
@MockBean({JourneyRepository.class})
4039
class UpdateJourneyBasicDetailsResourceTest {
4140
private static final String VALID_REQUEST = """
4241
{
@@ -52,9 +51,9 @@ class UpdateJourneyBasicDetailsResourceTest {
5251
content().contentType(MediaType.APPLICATION_JSON)
5352
};
5453
@Autowired
55-
private MockMvc mockMvc;
56-
@Autowired
57-
private JourneyRepository journeyRepository;
54+
MockMvc mockMvc;
55+
@MockitoBean
56+
JourneyRepository journeyRepository;
5857

5958
@Test
6059
@WithMockAuthenticatedUser

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/geo/UpdateJourneyGeoDetailsResourceTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
12-
import org.springframework.boot.test.mock.mockito.MockBean;
1312
import org.springframework.context.annotation.Import;
1413
import org.springframework.http.HttpHeaders;
1514
import org.springframework.http.MediaType;
1615
import org.springframework.security.test.context.support.WithAnonymousUser;
1716
import org.springframework.test.context.ActiveProfiles;
17+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1818
import org.springframework.test.web.servlet.MockMvc;
1919
import org.springframework.test.web.servlet.ResultMatcher;
2020

@@ -37,16 +37,15 @@
3737
@WebMvcTest(UpdateJourneyGeoDetailsResource.class)
3838
@Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
3939
@ActiveProfiles({"prod", "test"})
40-
@MockBean({JourneyRepository.class})
4140
class UpdateJourneyGeoDetailsResourceTest {
4241
private static final ResultMatcher[] STATUS_AND_CONTENT_TYPE_MATCH = new ResultMatcher[]{
4342
status().isOk(),
4443
content().contentType(MediaType.APPLICATION_JSON)
4544
};
4645
@Autowired
47-
private MockMvc mockMvc;
48-
@Autowired
49-
private JourneyRepository journeyRepository;
46+
MockMvc mockMvc;
47+
@MockitoBean
48+
JourneyRepository journeyRepository;
5049

5150
@Test
5251
@WithMockAuthenticatedUser

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/publish/PublishJourneyResourceTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import org.springframework.beans.factory.annotation.Autowired;
1818
import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
1919
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
20-
import org.springframework.boot.test.mock.mockito.MockBean;
2120
import org.springframework.context.annotation.Import;
2221
import org.springframework.http.HttpHeaders;
2322
import org.springframework.http.MediaType;
2423
import org.springframework.security.test.context.support.WithAnonymousUser;
2524
import org.springframework.test.context.ActiveProfiles;
25+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2626
import org.springframework.test.web.servlet.MockMvc;
2727
import org.springframework.test.web.servlet.ResultMatcher;
2828

@@ -45,7 +45,6 @@
4545
@WebMvcTest(PublishJourneyResource.class)
4646
@Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class, ValidationAutoConfiguration.class, JourneyValidator.class})
4747
@ActiveProfiles({"prod", "test"})
48-
@MockBean({JourneyRepository.class})
4948
class PublishJourneyResourceTest {
5049
private static final JourneyEntity JOURNEY_ENTITY = JourneyData.JOURNEY_ENTITY.toBuilder().build();
5150
private static final ResultMatcher[] STATUS_AND_CONTENT_TYPE_MATCH = new ResultMatcher[]{
@@ -64,11 +63,11 @@ class PublishJourneyResourceTest {
6463
};
6564
private static final Set<Visibility> DEFAULT_VISIBILITY = Set.of(MYSELF);
6665
@Autowired
67-
private MockMvc mockMvc;
66+
MockMvc mockMvc;
67+
@MockitoBean
68+
JourneyRepository journeyRepository;
6869
@Autowired
69-
private JourneyRepository journeyRepository;
70-
@Autowired
71-
private ObjectMapper objectMapper;
70+
ObjectMapper objectMapper;
7271

7372
static Stream<JourneyEntity> validJourneyDataProvider() {
7473

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/videos/UpdateJourneyVideosDetailsResourceTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package com.github.nramc.dev.journey.api.web.resources.rest.journeys.update.videos;
22

3-
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
43
import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
4+
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
55
import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
66
import com.github.nramc.dev.journey.api.config.security.WithMockGuestUser;
77
import com.github.nramc.dev.journey.api.repository.journey.JourneyRepository;
88
import com.github.nramc.dev.journey.api.web.resources.Resources;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
12-
import org.springframework.boot.test.mock.mockito.MockBean;
1312
import org.springframework.context.annotation.Import;
1413
import org.springframework.http.HttpHeaders;
1514
import org.springframework.http.MediaType;
1615
import org.springframework.security.test.context.support.WithAnonymousUser;
1716
import org.springframework.test.context.ActiveProfiles;
17+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1818
import org.springframework.test.web.servlet.MockMvc;
1919
import org.springframework.test.web.servlet.ResultMatcher;
2020

@@ -34,7 +34,6 @@
3434
@WebMvcTest(UpdateJourneyVideosDetailsResource.class)
3535
@Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
3636
@ActiveProfiles({"prod", "test"})
37-
@MockBean({JourneyRepository.class})
3837
class UpdateJourneyVideosDetailsResourceTest {
3938
private static final ResultMatcher[] STATUS_AND_CONTENT_TYPE_MATCH = new ResultMatcher[]{
4039
status().isOk(),
@@ -52,9 +51,9 @@ class UpdateJourneyVideosDetailsResourceTest {
5251
};
5352

5453
@Autowired
55-
private MockMvc mockMvc;
56-
@Autowired
57-
private JourneyRepository journeyRepository;
54+
MockMvc mockMvc;
55+
@MockitoBean
56+
JourneyRepository journeyRepository;
5857

5958
@Test
6059
@WithMockAuthenticatedUser

‎src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/users/delete/DeleteUserResourceTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.nramc.dev.journey.api.web.resources.rest.users.delete;
22

3-
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
43
import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
4+
import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
55
import com.github.nramc.dev.journey.api.config.security.WithMockAdministratorUser;
66
import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
77
import com.github.nramc.dev.journey.api.config.security.WithMockGuestUser;
@@ -10,12 +10,12 @@
1010
import org.junit.jupiter.api.Test;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
13-
import org.springframework.boot.test.mock.mockito.SpyBean;
1413
import org.springframework.context.annotation.Import;
1514
import org.springframework.security.provisioning.UserDetailsManager;
1615
import org.springframework.security.test.context.support.WithAnonymousUser;
1716
import org.springframework.security.test.context.support.WithMockUser;
1817
import org.springframework.test.context.ActiveProfiles;
18+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
1919
import org.springframework.test.web.servlet.MockMvc;
2020

2121
import static com.github.nramc.dev.journey.api.core.domain.user.Role.Constants.AUTHENTICATED_USER;
@@ -36,9 +36,9 @@
3636
@ActiveProfiles({"prod", "test"})
3737
class DeleteUserResourceTest {
3838
@Autowired
39-
private MockMvc mockMvc;
40-
@SpyBean
41-
private UserDetailsManager userDetailsManager;
39+
MockMvc mockMvc;
40+
@MockitoSpyBean
41+
UserDetailsManager userDetailsManager;
4242

4343
@Test
4444
void context() {

0 commit comments

Comments
 (0)