SpringCloud/spring-cloud-cloudfoundry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source
This commit is contained in:
Spencer Gibb
2019-04-01 12:52:55 -04:00
parent 76ca08222e 77810fe480
commit 362cfe7ec1
8 changed files with 323 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-cloudfoundry-web/src/test/java/org/springframework/cloud/cloudfoundry/environment/VcapServiceCredentialsEnvironmentPostProcessorTests.java
View File

@@ -72,56 +72,56 @@ public class VcapServiceCredentialsEnvironmentPostProcessorTests {
@Test
public void addTokenUri() {
TestPropertyValues
.of("vcap.services.sso.credentials.accessTokenUri:http://example.com")
.of("vcap.services.sso.credentials.accessTokenUri:http://exampledomain")
.applyTo(this.environment);
this.listener.postProcessEnvironment(this.environment, new SpringApplication());
assertThat(this.environment
.resolvePlaceholders("${security.oauth2.client.access-token-uri}"))
.isEqualTo("http://example.com");
.isEqualTo("http://exampledomain");
}
@Test
public void addTokenUriAuthDomain() {
TestPropertyValues
.of("vcap.services.sso.credentials.auth-domain:http://example.com")
.of("vcap.services.sso.credentials.auth-domain:http://exampledomain")
.applyTo(this.environment);
this.listener.postProcessEnvironment(this.environment, new SpringApplication());
assertThat(this.environment
.resolvePlaceholders("${security.oauth2.client.access-token-uri}"))
.isEqualTo("http://example.com/oauth/token");
.isEqualTo("http://exampledomain/oauth/token");
}
@Test
public void addUserInfoUri() {
TestPropertyValues
.of("vcap.services.sso.credentials.userInfoUri:http://example.com")
.of("vcap.services.sso.credentials.userInfoUri:http://exampledomain")
.applyTo(this.environment);
this.listener.postProcessEnvironment(this.environment, new SpringApplication());
assertThat(this.environment
.resolvePlaceholders("${security.oauth2.resource.user-info-uri}"))
.isEqualTo("http://example.com");
.isEqualTo("http://exampledomain");
}
@Test
public void addServiceId() {
TestPropertyValues
.of("vcap.services.my.credentials.accessTokenUri:http://example.com",
.of("vcap.services.my.credentials.accessTokenUri:http://exampledomain",
"security.oauth2.sso.serviceId:my")
.applyTo(this.environment);
this.listener.postProcessEnvironment(this.environment, new SpringApplication());
assertThat(this.environment
.resolvePlaceholders("${security.oauth2.client.access-token-uri}"))
.isEqualTo("http://example.com");
.isEqualTo("http://exampledomain");
}
@Test
public void addJwtKeyUri() {
TestPropertyValues.of("vcap.services.sso.credentials.keyUri:http://example.com")
TestPropertyValues.of("vcap.services.sso.credentials.keyUri:http://exampledomain")
.applyTo(this.environment);
this.listener.postProcessEnvironment(this.environment, new SpringApplication());
assertThat(this.environment
.resolvePlaceholders("${security.oauth2.resource.jwt.key-uri}"))
.isEqualTo("http://example.com");
.isEqualTo("http://exampledomain");
}
}