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

SGF-353 - Prepare SDG 1.7 and upgrade to GemFire 8.1.0 GA.

Browse Source 
Fixed SDG test suite failures running on GemFire 8.1 when mocking is disabled.
This commit is contained in:
John Blum
2015-02-09 18:25:47 -08:00
parent 79f6025647
commit 4e3e8aa177
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java
View File

@@ -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 {

5
src/test/java/org/springframework/data/gemfire/config/SubRegionSubElementNamespaceTest.java
View File

@@ -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 {

20
src/test/java/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests.java
View File

@@ -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());