Skip to content

Commit 460d102

Browse files
committed
1 parent 3fe5b99 commit 460d102

File tree

2 files changed

+43
-15
lines changed

2 files changed

+43
-15
lines changed

spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceIntegrationTests.java

+32-14
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,17 @@
2121
import org.junit.Test;
2222
import org.junit.runner.RunWith;
2323

24+
import org.apache.geode.cache.CacheListener;
25+
import org.apache.geode.cache.CacheLoader;
26+
import org.apache.geode.cache.CacheLoaderException;
2427
import org.apache.geode.cache.CustomExpiry;
2528
import org.apache.geode.cache.DataPolicy;
2629
import org.apache.geode.cache.ExpirationAction;
2730
import org.apache.geode.cache.ExpirationAttributes;
31+
import org.apache.geode.cache.LoaderHelper;
2832
import org.apache.geode.cache.Region;
33+
import org.apache.geode.cache.util.CacheListenerAdapter;
34+
import org.apache.geode.cache.util.CacheWriterAdapter;
2935

3036
import org.springframework.beans.factory.annotation.Autowired;
3137
import org.springframework.beans.factory.annotation.Qualifier;
@@ -69,23 +75,24 @@ public class RegionExpirationAttributesNamespaceIntegrationTests extends Integra
6975
@Qualifier("LocalExample")
7076
private Region<?, ?> localExample;
7177

72-
private void assertRegionMetaData(final Region<?, ?> region, final String regionName, final DataPolicy dataPolicy) {
78+
private void assertRegionMetaData(Region<?, ?> region, String regionName, DataPolicy dataPolicy) {
7379
assertRegionMetaData(region, regionName, Region.SEPARATOR + regionName, dataPolicy);
7480
}
7581

76-
private void assertRegionMetaData(Region<?, ?> region, String regionName, String regionFullPath,
77-
DataPolicy dataPolicy) {
82+
private void assertRegionMetaData(Region<?, ?> region,
83+
String regionName, String regionFullPath, DataPolicy dataPolicy) {
7884

7985
assertThat(region)
80-
.as(String.format("The '%1$s' Region was not properly configured and initialized", regionName))
86+
.describedAs("The '%s' Region was not properly configured and initialized", regionName)
8187
.isNotNull();
88+
8289
assertThat(region.getName()).isEqualTo(regionName);
8390
assertThat(region.getFullPath()).isEqualTo(regionFullPath);
8491
assertThat(region.getAttributes()).isNotNull();
8592
assertThat(region.getAttributes().getDataPolicy()).isEqualTo(dataPolicy);
8693
}
8794

88-
private void assertNoExpiration(final ExpirationAttributes expirationAttributes) {
95+
private void assertNoExpiration(ExpirationAttributes expirationAttributes) {
8996

9097
if (expirationAttributes != null) {
9198
//assertEquals(ExpirationAction.INVALIDATE, expirationAttributes.getAction());
@@ -111,7 +118,7 @@ private void assertCustomExpiry(CustomExpiry<?, ?> customExpiry, String name, in
111118
}
112119

113120
@Test
114-
public void testReplicateExampleExpirationAttributes() {
121+
public void exampleReplicateRegionExpirationAttributesAreCorrect() {
115122

116123
assertRegionMetaData(replicateExample, "ReplicateExample", DataPolicy.REPLICATE);
117124
assertExpirationAttributes(replicateExample.getAttributes().getEntryTimeToLive(),
@@ -123,7 +130,7 @@ public void testReplicateExampleExpirationAttributes() {
123130
}
124131

125132
@Test
126-
public void testPreloadedExampleExpirationAttributes() {
133+
public void examplePreloadedRegionExpirationAttributesAreCorrect() {
127134

128135
assertRegionMetaData(preloadedExample, "PreloadedExample", DataPolicy.PRELOADED);
129136
assertExpirationAttributes(preloadedExample.getAttributes().getEntryTimeToLive(),
@@ -134,7 +141,7 @@ public void testPreloadedExampleExpirationAttributes() {
134141
}
135142

136143
@Test
137-
public void testPartitionExampleExpirationAttributes() {
144+
public void examplePartitionRegionExpirationAttributesAreCorrect() {
138145

139146
assertRegionMetaData(partitionExample, "PartitionExample", DataPolicy.PARTITION);
140147
assertExpirationAttributes(partitionExample.getAttributes().getEntryTimeToLive(),
@@ -146,7 +153,7 @@ public void testPartitionExampleExpirationAttributes() {
146153
}
147154

148155
@Test
149-
public void testLocalExampleExpirationAttributes() {
156+
public void exampleLocalRegionExpirationAttributesAreCorrect() {
150157

151158
assertRegionMetaData(localExample, "LocalExample", DataPolicy.NORMAL);
152159
assertNoExpiration(localExample.getAttributes().getEntryTimeToLive());
@@ -157,6 +164,18 @@ public void testLocalExampleExpirationAttributes() {
157164
60, ExpirationAction.LOCAL_INVALIDATE);
158165
}
159166

167+
public static class TestCacheListener<K, V> extends CacheListenerAdapter<K, V> { }
168+
169+
public static class TestCacheLoader<K, V> implements CacheLoader<K, V> {
170+
171+
@Override
172+
public V load(LoaderHelper<K, V> loaderHelper) throws CacheLoaderException {
173+
return null;
174+
}
175+
}
176+
177+
public static class TestCacheWriter<K, V> extends CacheWriterAdapter<K, V> { }
178+
160179
public static class TestCustomExpiry<K, V> implements CustomExpiry<K, V> {
161180

162181
private ExpirationAction action;
@@ -172,21 +191,20 @@ public ExpirationAttributes getExpiry(final Region.Entry<K, V> kvEntry) {
172191
return new ExpirationAttributes(timeout, action);
173192
}
174193

175-
public void setAction(final ExpirationAction action) {
194+
public void setAction(ExpirationAction action) {
176195
this.action = action;
177196
}
178197

179-
public void setName(final String name) {
198+
public void setName(String name) {
180199
this.name = name;
181200
}
182201

183-
public void setTimeout(final Integer timeout) {
202+
public void setTimeout(Integer timeout) {
184203
this.timeout = timeout;
185204
}
186205

187206
@Override
188-
public void close() {
189-
}
207+
public void close() { }
190208

191209
@Override
192210
public String toString() {

spring-data-geode/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceIntegrationTests-context.xml

+11-1
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,22 @@
1919
<context:property-placeholder properties-ref="expirationProperties"/>
2020

2121
<util:properties id="gemfireProperties">
22-
<prop key="name">RegionExpirationAttributesNamespaceTest</prop>
22+
<prop key="name">RegionExpirationAttributesNamespaceIntegrationTests</prop>
2323
<prop key="log-level">error</prop>
2424
</util:properties>
2525

2626
<gfe:cache properties-ref="gemfireProperties"/>
2727

28+
<bean name="testListener" class="org.springframework.data.gemfire.config.xml.RegionExpirationAttributesNamespaceIntegrationTests$TestCacheListener"/>
29+
<bean name="testLoader" class="org.springframework.data.gemfire.config.xml.RegionExpirationAttributesNamespaceIntegrationTests$TestCacheLoader"/>
30+
<bean name="testWriter" class="org.springframework.data.gemfire.config.xml.RegionExpirationAttributesNamespaceIntegrationTests$TestCacheWriter"/>
31+
2832
<gfe:replicated-region id="ReplicateExample" persistent="false">
33+
<gfe:cache-listener ref="testListener"/>
2934
<gfe:entry-ttl timeout="600" action="${expiration.action}"/>
3035
<gfe:entry-tti timeout="300" action="INVALIDATE"/>
36+
<gfe:cache-loader ref="testLoader"/>
37+
<gfe:cache-writer ref="testWriter"/>
3138
</gfe:replicated-region>
3239

3340
<!--
@@ -39,11 +46,14 @@
3946
</gfe:local-region>
4047

4148
<gfe:partitioned-region id="PartitionExample" persistent="false">
49+
<gfe:cache-listener ref="testListener"/>
4250
<gfe:entry-ttl timeout="300" action="${expiration.action}"/>
4351
<gfe:custom-entry-tti>
4452
<bean class="org.springframework.data.gemfire.config.xml.RegionExpirationAttributesNamespaceIntegrationTests$TestCustomExpiry"
4553
p:name="PartitionCustomExpiry" p:timeout="120" p:action="#{T(org.apache.geode.cache.ExpirationAction).INVALIDATE}"/>
4654
</gfe:custom-entry-tti>
55+
<gfe:cache-loader ref="testLoader"/>
56+
<gfe:cache-writer ref="testWriter"/>
4757
</gfe:partitioned-region>
4858

4959
<gfe:local-region id="LocalExample" persistent="false">

0 commit comments

Comments
 (0)