From f20594706279fb66a33d6f17aac82c7e308cd411 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 17 Feb 2016 00:30:03 -0800 Subject: [PATCH] SGF-473 - Fix CI build test failures. (cherry picked from commit adaf6903d7a177dc63fff888121cd9060e949aba) Signed-off-by: John Blum --- .../gemfire/client/LocalOnlyClientCacheIntegrationTest.java | 4 ++-- .../function/config/FunctionsWithClientCacheTests.java | 5 ++--- .../config/FunctionsWithClientCacheTests-context.xml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java index 30dc7d81..7079f7f1 100644 --- a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java @@ -39,9 +39,9 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; /** @@ -111,7 +111,7 @@ public class LocalOnlyClientCacheIntegrationTest { } @Bean(name = "Example") - ClientRegionFactoryBean exampleRegion(ClientCache gemfireCache, + ClientRegionFactoryBean exampleRegion(GemFireCache gemfireCache, RegionAttributes exampleAttributes) { ClientRegionFactoryBean exampleRegion = new ClientRegionFactoryBean(); diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java index 6c2ebd2f..159bab7c 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java @@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author David Turanski - * + * @author John Blum */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(initializers = GemfireTestApplicationContextInitializer.class) @@ -28,8 +28,7 @@ public class FunctionsWithClientCacheTests { @Test public void doNothing() { - //Just make sure this comes up for SGF-186 + // Just make sure this comes up for SGF-186. } } - diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml b/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml index 26ab7e2b..170d487e 100644 --- a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd ">