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

Fix test failures related to Spring Session auto-configuration.

Browse Source
This commit is contained in:
John Blum
2018-08-27 13:10:16 -07:00
parent ce5519f06c
commit 279c6ea83f
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,9 @@ import java.util.Properties;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
@@ -58,8 +59,10 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@DirtiesContext
@RunWith(SpringRunner.class)
@SpringBootTest(classes = AutoConfiguredCloudSecurityContextIntegrationTests.GemFireClientConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE)
@SpringBootTest(
classes = AutoConfiguredCloudSecurityContextIntegrationTests.GemFireClientConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE
)
@SuppressWarnings("unused")
public class AutoConfiguredCloudSecurityContextIntegrationTests
extends AbstractAutoConfiguredSecurityContextIntegrationTests {
@@ -102,7 +105,10 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests
static class GemFireServerConfiguration extends BaseGemFireServerConfiguration {
public static void main(String[] args) {
SpringApplication.run(GemFireServerConfiguration.class, args);
new SpringApplicationBuilder(GemFireServerConfiguration.class)
.web(WebApplicationType.NONE)
.build()
.run(args);
}
}
}

15
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
View File

@@ -20,8 +20,9 @@ import java.io.IOException;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
@@ -59,8 +60,10 @@ import org.springframework.test.context.junit4.SpringRunner;
@ActiveProfiles("security-local-client")
@DirtiesContext
@RunWith(SpringRunner.class)
@SpringBootTest(classes = AutoConfiguredLocalSecurityContextIntegrationTests.GemFireClientConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE)
@SpringBootTest(
classes = AutoConfiguredLocalSecurityContextIntegrationTests.GemFireClientConfiguration.class,
webEnvironment = SpringBootTest.WebEnvironment.NONE
)
@SuppressWarnings("unused")
public class AutoConfiguredLocalSecurityContextIntegrationTests
extends AbstractAutoConfiguredSecurityContextIntegrationTests {
@@ -86,7 +89,11 @@ public class AutoConfiguredLocalSecurityContextIntegrationTests
static class GemFireServerConfiguration extends BaseGemFireServerConfiguration {
public static void main(String[] args) {
SpringApplication.run(GemFireServerConfiguration.class, args);
new SpringApplicationBuilder(GemFireServerConfiguration.class)
.web(WebApplicationType.NONE)
.build()
.run(args);
}
}
}

14
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java
View File

@@ -27,8 +27,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.data.gemfire.GemfireTemplate;
@@ -63,8 +64,10 @@ import example.echo.config.EchoServerConfiguration;
*/
@ActiveProfiles("ssl")
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
classes = AutoConfiguredSslIntegrationTests.GemFireClientConfiguration.class)
@SpringBootTest(
webEnvironment = SpringBootTest.WebEnvironment.NONE,
classes = AutoConfiguredSslIntegrationTests.GemFireClientConfiguration.class
)
@SuppressWarnings("unused")
public class AutoConfiguredSslIntegrationTests extends ForkingClientServerIntegrationTestsSupport {
@@ -113,7 +116,10 @@ public class AutoConfiguredSslIntegrationTests extends ForkingClientServerIntegr
static class GemFireServerConfiguration {
public static void main(String[] args) {
SpringApplication.run(GemFireServerConfiguration.class, args);
new SpringApplicationBuilder(GemFireServerConfiguration.class)
.web(WebApplicationType.NONE)
.build()
.run(args);
}
}
}

5
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
View File

@@ -63,7 +63,10 @@ import org.springframework.test.context.junit4.SpringRunner;
* @since 1.0.0
*/
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
@SpringBootTest(
properties = "spring.session.data.gemfire.cache.client.region.shortcut=",
webEnvironment = SpringBootTest.WebEnvironment.NONE
)
@SuppressWarnings("unused")
public class AutoConfiguredSessionCachingIntegrationTests {