Skip to content

Commit 42a8635

Browse files
committed
Remove @MockBean ClientRegistrationRepository
Fixes gh-8606
1 parent d5b8981 commit 42a8635

File tree

5 files changed

+0
-25
lines changed

5 files changed

+0
-25
lines changed

samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java

-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323

2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
26-
import org.springframework.boot.test.mock.mockito.MockBean;
2726
import org.springframework.security.oauth2.client.registration.ClientRegistration;
28-
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
2927
import org.springframework.security.oauth2.core.AuthorizationGrantType;
3028
import org.springframework.test.context.junit4.SpringRunner;
3129
import org.springframework.test.web.servlet.MockMvc;
@@ -46,9 +44,6 @@ public class OAuth2LoginControllerTests {
4644
@Autowired
4745
MockMvc mvc;
4846

49-
@MockBean
50-
ClientRegistrationRepository clientRegistrationRepository;
51-
5247
@Test
5348
public void rootWhenAuthenticatedReturnsUserAndClient() throws Exception {
5449
this.mvc.perform(get("/").with(oauth2Login()))

samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientControllerTests.java

-5
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
2828
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
2929
import org.springframework.boot.test.context.TestConfiguration;
30-
import org.springframework.boot.test.mock.mockito.MockBean;
3130
import org.springframework.context.annotation.Bean;
3231
import org.springframework.context.annotation.Import;
33-
import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
3432
import org.springframework.test.context.junit4.SpringRunner;
3533
import org.springframework.test.web.reactive.server.WebTestClient;
3634
import org.springframework.web.reactive.function.client.WebClient;
@@ -48,9 +46,6 @@ public class OAuth2WebClientControllerTests {
4846
@Autowired
4947
private WebTestClient client;
5048

51-
@MockBean
52-
ReactiveClientRegistrationRepository clientRegistrationRepository;
53-
5449
@AfterClass
5550
public static void shutdown() throws Exception {
5651
web.shutdown();

samples/boot/oauth2webclient-webflux/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java

-5
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
2828
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
2929
import org.springframework.boot.test.context.TestConfiguration;
30-
import org.springframework.boot.test.mock.mockito.MockBean;
3130
import org.springframework.context.annotation.Bean;
3231
import org.springframework.context.annotation.Import;
33-
import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
3432
import org.springframework.test.context.junit4.SpringRunner;
3533
import org.springframework.test.web.reactive.server.WebTestClient;
3634
import org.springframework.web.reactive.function.client.WebClient;
@@ -48,9 +46,6 @@ public class RegisteredOAuth2AuthorizedClientControllerTests {
4846
@Autowired
4947
private WebTestClient client;
5048

51-
@MockBean
52-
ReactiveClientRegistrationRepository clientRegistrationRepository;
53-
5449
@AfterClass
5550
public static void shutdown() throws Exception {
5651
web.shutdown();

samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientControllerTests.java

-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2727
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2828
import org.springframework.boot.test.context.TestConfiguration;
29-
import org.springframework.boot.test.mock.mockito.MockBean;
3029
import org.springframework.context.annotation.Bean;
31-
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
3230
import org.springframework.test.context.junit4.SpringRunner;
3331
import org.springframework.test.web.servlet.MockMvc;
3432
import org.springframework.web.reactive.function.client.WebClient;
@@ -47,9 +45,6 @@ public class OAuth2WebClientControllerTests {
4745
@Autowired
4846
private MockMvc mockMvc;
4947

50-
@MockBean
51-
ClientRegistrationRepository clientRegistrationRepository;
52-
5348
@AfterClass
5449
public static void shutdown() throws Exception {
5550
web.shutdown();

samples/boot/oauth2webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java

-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2727
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2828
import org.springframework.boot.test.context.TestConfiguration;
29-
import org.springframework.boot.test.mock.mockito.MockBean;
3029
import org.springframework.context.annotation.Bean;
31-
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
3230
import org.springframework.test.context.junit4.SpringRunner;
3331
import org.springframework.test.web.servlet.MockMvc;
3432
import org.springframework.web.reactive.function.client.WebClient;
@@ -47,9 +45,6 @@ public class RegisteredOAuth2AuthorizedClientControllerTests {
4745
@Autowired
4846
private MockMvc mockMvc;
4947

50-
@MockBean
51-
ClientRegistrationRepository clientRegistrationRepository;
52-
5348
@AfterClass
5449
public static void shutdown() throws Exception {
5550
web.shutdown();

0 commit comments

Comments
 (0)