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

SGF-383 - Refactor and make RegionFactoryBean and RegionLookupFactoryBean abstract.

Browse Source
This commit is contained in:
John Blum
2015-03-13 11:58:14 -07:00
parent 17c9358547
commit 42eefab61c
11 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/java/org/springframework/data/gemfire/RegionFactoryBeanTest.java
View File

@@ -72,7 +72,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@SuppressWarnings("unchecked")
public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
private final RegionFactoryBean factoryBean = new RegionFactoryBean();
private final RegionFactoryBean factoryBean = new TestRegionFactoryBean();
@After
public void tearDown() {
@@ -82,7 +82,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@SuppressWarnings("rawtypes")
private RegionFactoryBeanConfig defaultConfig() {
return new RegionFactoryBeanConfig(new RegionFactoryBean(), "default") {
return new RegionFactoryBeanConfig(new TestRegionFactoryBean(), "default") {
@Override
public void configureRegionFactoryBean() {
}
@@ -97,7 +97,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@SuppressWarnings("rawtypes")
private RegionFactoryBeanConfig persistentConfig() {
return new RegionFactoryBeanConfig(new RegionFactoryBean(), "persistent") {
return new RegionFactoryBeanConfig(new TestRegionFactoryBean(), "persistent") {
@Override
public void configureRegionFactoryBean() {
regionFactoryBean.setPersistent(true);
@@ -113,7 +113,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@SuppressWarnings({ "deprecation", "rawtypes" })
private RegionFactoryBeanConfig invalidPersistentConfig() {
return new RegionFactoryBeanConfig(new RegionFactoryBean(), "invalid-persistence") {
return new RegionFactoryBeanConfig(new TestRegionFactoryBean(), "invalid-persistence") {
@Override
public void configureRegionFactoryBean() {
regionFactoryBean.setDataPolicy("persistent_replicate");
@@ -169,7 +169,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
}
@Test
public void testAssertDataPolicyAndPersistentAttributesAreCompatible() {
RegionFactoryBean<?, ?> factoryBean = new RegionFactoryBean<Object, Object>();
RegionFactoryBean<?, ?> factoryBean = new TestRegionFactoryBean<Object, Object>();
factoryBean.setPersistent(null);
factoryBean.assertDataPolicyAndPersistentAttributesAreCompatible(DataPolicy.PARTITION);
@@ -187,7 +187,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@Test(expected = IllegalArgumentException.class)
public void testAssertNonPersistentDataPolicyWithPersistentAttribute() {
try {
RegionFactoryBean<?, ?> factoryBean = new RegionFactoryBean<Object, Object>();
RegionFactoryBean<?, ?> factoryBean = new TestRegionFactoryBean<Object, Object>();
factoryBean.setPersistent(true);
factoryBean.assertDataPolicyAndPersistentAttributesAreCompatible(DataPolicy.REPLICATE);
}
@@ -200,7 +200,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@Test(expected = IllegalArgumentException.class)
public void testAssertPersistentDataPolicyWithNonPersistentAttribute() {
try {
RegionFactoryBean<?, ?> factoryBean = new RegionFactoryBean<Object, Object>();
RegionFactoryBean<?, ?> factoryBean = new TestRegionFactoryBean<Object, Object>();
factoryBean.setPersistent(false);
factoryBean.assertDataPolicyAndPersistentAttributesAreCompatible(DataPolicy.PERSISTENT_PARTITION);
}
@@ -213,7 +213,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@Test
public void testIsPersistent() {
RegionFactoryBean<?, ?> factoryBean = new RegionFactoryBean<Object, Object>();
RegionFactoryBean<?, ?> factoryBean = new TestRegionFactoryBean<Object, Object>();
assertFalse(factoryBean.isPersistent());
@@ -228,7 +228,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@Test
public void testIsPersistentUnspecified() {
RegionFactoryBean<?, ?> factoryBean = new RegionFactoryBean<Object, Object>();
RegionFactoryBean<?, ?> factoryBean = new TestRegionFactoryBean<Object, Object>();
assertTrue(factoryBean.isPersistentUnspecified());
@@ -247,7 +247,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@Test
public void testIsNotPersistent() {
RegionFactoryBean<?, ?> factoryBean = new RegionFactoryBean<Object, Object>();
RegionFactoryBean<?, ?> factoryBean = new TestRegionFactoryBean<Object, Object>();
assertFalse(factoryBean.isNotPersistent());
@@ -306,12 +306,11 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
Cache mockCache = mock(Cache.class);
RegionAttributes mockRegionAttributes = mock(RegionAttributes.class);
final RegionFactory mockRegionFactory = createMockRegionFactory();
RegionFactory mockRegionFactory = createMockRegionFactory();
when(mockCache.createRegionFactory(eq(mockRegionAttributes))).thenReturn(mockRegionFactory);
RegionFactoryBean factoryBean = new RegionFactoryBean();
RegionFactoryBean factoryBean = new TestRegionFactoryBean();
factoryBean.setAttributes(mockRegionAttributes);
factoryBean.setShortcut(null);
@@ -324,12 +323,11 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
@Test
public void testCreateRegionFactory() {
Cache mockCache = mock(Cache.class);
final RegionFactory mockRegionFactory = createMockRegionFactory();
RegionFactory mockRegionFactory = createMockRegionFactory();
when(mockCache.createRegionFactory()).thenReturn(mockRegionFactory);
RegionFactoryBean factoryBean = new RegionFactoryBean();
RegionFactoryBean factoryBean = new TestRegionFactoryBean();
factoryBean.setAttributes(null);
factoryBean.setShortcut(null);
@@ -1054,4 +1052,7 @@ public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest {
}
}
protected static class TestRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
}
}

2
src/test/java/org/springframework/data/gemfire/SubRegionTest.java
View File

@@ -66,7 +66,7 @@ public class SubRegionTest extends RecreatingContextTest {
assertEquals("/Outer", outer.getFullPath());
assertSame(outer, cache.getRegion("/Outer"));
RegionFactoryBean subRegionFactory = new RegionFactoryBean();
RegionFactoryBean subRegionFactory = new RegionFactoryBean() { };
subRegionFactory.setCache(cache);
subRegionFactory.setParent(outer);

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

@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.data.gemfire.RegionFactoryBean;
/**
* The InvalidRegionDefinitionUsingBeansNamespaceTest class is a test suite of test cases testing the definition of
@@ -48,4 +49,8 @@ public class InvalidRegionDefinitionUsingBeansNamespaceTest {
}
}
@SuppressWarnings("unused")
public static final class TestRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
}
}

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

@@ -113,4 +113,7 @@ public class RegionDefinitionUsingBeansNamespaceTest {
assertEquals(2, anotherExample.getAttributes().getPartitionAttributes().getRedundantCopies());
}
public static final class TestRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
}
}