diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java index 51ee499d..d9840cd0 100644 --- a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java @@ -27,6 +27,7 @@ import javax.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -56,7 +57,7 @@ import com.gemstone.gemfire.cache.SubscriptionAttributes; * @since 1.4.0 * @since 7.0.1 (GemFire) */ -@ContextConfiguration("complex-subregion.xml") +@ContextConfiguration(value = "complex-subregion.xml", initializers = GemfireTestApplicationContextInitializer.class) @RunWith(SpringJUnit4ClassRunner.class) @SuppressWarnings("unused") public class SubRegionIntegrationTest { diff --git a/src/test/java/org/springframework/data/gemfire/config/SubRegionSubElementNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/SubRegionSubElementNamespaceTest.java index 6da72f52..7f34570f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/SubRegionSubElementNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/SubRegionSubElementNamespaceTest.java @@ -39,16 +39,19 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; * * @author John Blum * @see org.junit.Test + * @see org.junit.runner.RunWith + * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner + * @see com.gemstone.gemfire.cache.Region * @link https://jira.springsource.org/browse/SGF-219 * @link https://jira.springsource.org/browse/SGF-220 * @link https://jira.springsource.org/browse/SGF-221 * @since 1.3.3 */ +@RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "subregionsubelement-ns.xml", initializers = GemfireTestApplicationContextInitializer.class) -@RunWith(SpringJUnit4ClassRunner.class) @SuppressWarnings("unused") public class SubRegionSubElementNamespaceTest { diff --git a/src/test/java/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests.java b/src/test/java/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests.java index 1d6d71f7..435793b5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests.java @@ -153,10 +153,10 @@ public class TemplateRegionsNamespaceTests { } protected void assertEvictionAttributes(final EvictionAttributes evictionAttributes, - final EvictionAction expectedAction, - final EvictionAlgorithm expectedAlgorithm, - final int expectedMaximum, - final ObjectSizer expectedObjectSizer) + final EvictionAction expectedAction, + final EvictionAlgorithm expectedAlgorithm, + final int expectedMaximum, + final ObjectSizer expectedObjectSizer) { assertNotNull("The 'EvictionAttributes' must not be null!", evictionAttributes); assertEquals(expectedAction, evictionAttributes.getAction()); @@ -172,8 +172,8 @@ public class TemplateRegionsNamespaceTests { } protected void assertExpirationAttributes(final ExpirationAttributes expirationAttributes, - final ExpirationAction expectedAction, - final int expectedTimeout) + final ExpirationAction expectedAction, + final int expectedTimeout) { assertNotNull("The 'ExpirationAttributes' must not be null!", expirationAttributes); assertEquals(expectedAction, expirationAttributes.getAction()); @@ -197,9 +197,9 @@ public class TemplateRegionsNamespaceTests { } protected void assertMembershipAttributes(final MembershipAttributes membershipAttributes, - final LossAction expectedLossAction, - final ResumptionAction expectedResumptionAction, - final String... expectedRequiredRoles) + final LossAction expectedLossAction, + final ResumptionAction expectedResumptionAction, + final String... expectedRequiredRoles) { assertNotNull("The 'MembershipAttributes' must not be null!", membershipAttributes); assertEquals(expectedLossAction, membershipAttributes.getLossAction()); @@ -257,7 +257,7 @@ public class TemplateRegionsNamespaceTests { } protected void assertSubscriptionAttributes(final SubscriptionAttributes subscriptionAttributes, - final InterestPolicy expectedInterestPolicy) + final InterestPolicy expectedInterestPolicy) { assertNotNull("The 'SubscriptionAttributes' must not be null!", subscriptionAttributes); assertEquals(expectedInterestPolicy, subscriptionAttributes.getInterestPolicy()); diff --git a/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml b/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml index a59a15fa..158f31c1 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml @@ -18,7 +18,7 @@ - + diff --git a/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml index f3795302..926cf659 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml @@ -38,7 +38,7 @@ -