Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Security auto-configuration tests for enforcing Auth in a cloud context.

Browse Source
This commit is contained in:
John Blum
2019-05-14 19:34:52 -07:00
parent dd98cf7a6b
commit 0445d5f159
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
View File

@@ -30,7 +30,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
import org.springframework.data.gemfire.config.annotation.EnableLocator;
import org.springframework.data.gemfire.config.annotation.EnableLogging;
import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator;
import org.springframework.geode.boot.autoconfigure.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
@@ -57,12 +56,12 @@ import org.springframework.test.context.junit4.SpringRunner;
* @see org.springframework.test.context.junit4.SpringRunner
* @since 1.0.0
*/
@DirtiesContext
@RunWith(SpringRunner.class)
@SpringBootTest(
classes = AutoConfiguredCloudSecurityContextIntegrationTests.GemFireClientConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE
)
@DirtiesContext
@SuppressWarnings("unused")
public class AutoConfiguredCloudSecurityContextIntegrationTests
extends AbstractAutoConfiguredSecurityContextIntegrationTests {
@@ -76,11 +75,8 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests
public static void startGemFireServer() throws IOException {
startGemFireServer(GemFireServerConfiguration.class, "-Dspring.profiles.active=security-cloud");
loadVcapApplicationProperties();
unsetTestAutoConfiguredPoolServersPortSystemProperty();
GemfireBeanFactoryLocator.clear();
}
public static void loadVcapApplicationProperties() throws IOException {
@@ -110,6 +106,7 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests
static class GemFireServerConfiguration extends BaseGemFireServerConfiguration {
public static void main(String[] args) {
new SpringApplicationBuilder(GemFireServerConfiguration.class)
.web(WebApplicationType.NONE)
.build()

4
spring-geode-autoconfigure/src/test/resources/application-security-cloud.properties
View File

@@ -50,5 +50,5 @@ vcap.services.jblum-pcc.tags[2]=database
vcap.services.jblum-pcc.tags[3]=pivotal
vcap.services.jblum-pcc.volume_mounts=
security.context.username.property=${vcap.services.jblum-pcc.credentials.users[0].username}
security.context.password.property=${vcap.services.jblum-pcc.credentials.users[0].password}
test.security.context.username=${vcap.services.jblum-pcc.credentials.users[0].username}
test.security.context.password=${vcap.services.jblum-pcc.credentials.users[0].password}