Merge branch '6.0.x'

Closes gh-12441
This commit is contained in:
Josh Cummings 2022-12-19 16:01:26 -07:00
commit e0e9455f78
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 0 additions and 7 deletions

View File

@ -25,7 +25,6 @@ import io.r2dbc.h2.H2ConnectionFactory;
import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactory;
import io.r2dbc.spi.Result; import io.r2dbc.spi.Result;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -115,14 +114,12 @@ public class R2dbcReactiveOAuth2AuthorizedClientServiceTests {
} }
@Test @Test
@Disabled // until https://github.com/reactor/reactor-core/issues/3307 is resolved
public void loadAuthorizedClientWhenDoesNotExistThenReturnNull() { public void loadAuthorizedClientWhenDoesNotExistThenReturnNull() {
this.authorizedClientService.loadAuthorizedClient("registration-not-found", "principalName") this.authorizedClientService.loadAuthorizedClient("registration-not-found", "principalName")
.as(StepVerifier::create).expectNextCount(0).verifyComplete(); .as(StepVerifier::create).expectNextCount(0).verifyComplete();
} }
@Test @Test
@Disabled // until https://github.com/reactor/reactor-core/issues/3307 is resolved
public void loadAuthorizedClientWhenExistsThenReturnAuthorizedClient() { public void loadAuthorizedClientWhenExistsThenReturnAuthorizedClient() {
Authentication principal = createPrincipal(); Authentication principal = createPrincipal();
OAuth2AuthorizedClient expected = createAuthorizedClient(principal, this.clientRegistration); OAuth2AuthorizedClient expected = createAuthorizedClient(principal, this.clientRegistration);
@ -153,7 +150,6 @@ public class R2dbcReactiveOAuth2AuthorizedClientServiceTests {
} }
@Test @Test
@Disabled // until https://github.com/reactor/reactor-core/issues/3307 is resolved
public void loadAuthorizedClientWhenExistsButNotFoundInClientRegistrationRepositoryThenThrowDataRetrievalFailureException() { public void loadAuthorizedClientWhenExistsButNotFoundInClientRegistrationRepositoryThenThrowDataRetrievalFailureException() {
given(this.clientRegistrationRepository.findByRegistrationId(any())).willReturn(Mono.empty()); given(this.clientRegistrationRepository.findByRegistrationId(any())).willReturn(Mono.empty());
Authentication principal = createPrincipal(); Authentication principal = createPrincipal();
@ -190,7 +186,6 @@ public class R2dbcReactiveOAuth2AuthorizedClientServiceTests {
} }
@Test @Test
@Disabled // until https://github.com/reactor/reactor-core/issues/3307 is resolved
public void saveAuthorizedClientWhenSaveThenLoadReturnsSaved() { public void saveAuthorizedClientWhenSaveThenLoadReturnsSaved() {
Authentication principal = createPrincipal(); Authentication principal = createPrincipal();
final OAuth2AuthorizedClient expected = createAuthorizedClient(principal, this.clientRegistration); final OAuth2AuthorizedClient expected = createAuthorizedClient(principal, this.clientRegistration);
@ -249,7 +244,6 @@ public class R2dbcReactiveOAuth2AuthorizedClientServiceTests {
} }
@Test @Test
@Disabled // until https://github.com/reactor/reactor-core/issues/3307 is resolved
public void saveAuthorizedClientWhenSaveClientWithExistingPrimaryKeyThenUpdate() { public void saveAuthorizedClientWhenSaveClientWithExistingPrimaryKeyThenUpdate() {
// Given a saved authorized client // Given a saved authorized client
Authentication principal = createPrincipal(); Authentication principal = createPrincipal();
@ -303,7 +297,6 @@ public class R2dbcReactiveOAuth2AuthorizedClientServiceTests {
} }
@Test @Test
@Disabled // until https://github.com/reactor/reactor-core/issues/3307 is resolved
public void removeAuthorizedClientWhenExistsThenRemoved() { public void removeAuthorizedClientWhenExistsThenRemoved() {
Authentication principal = createPrincipal(); Authentication principal = createPrincipal();
OAuth2AuthorizedClient authorizedClient = createAuthorizedClient(principal, this.clientRegistration); OAuth2AuthorizedClient authorizedClient = createAuthorizedClient(principal, this.clientRegistration);