From b68074c85c2d1043bdd668a83a7e4263e3ecd4fd Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Fri, 29 Aug 2014 12:56:09 -0700
Subject: [PATCH] Added additional test case to test Client Region attribute
 configuration settings, including the new attributes for concurrency
 (concurrency-checks-enabled and concurrency-level) for SGF-310 and SGF-311.

---
 .../config/ClientRegionNamespaceTest.java     | 22 +++++++++++++++++++
 .../data/gemfire/config/client-ns.xml         | 15 +++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java
index 412e9a7b..875ef73f 100644
--- a/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/ClientRegionNamespaceTest.java
@@ -223,6 +223,28 @@ public class ClientRegionNamespaceTest {
 		assertEquals("STD", compressed.getAttributes().getCompressor().toString());
 	}
 
+	@Test
+	public void testClientRegionWithAttributes() {
+		assertTrue(context.containsBean("client-with-attributes"));
+
+		Region<Long, String> clientRegion = context.getBean("client-with-attributes", Region.class);
+
+		assertNotNull("The 'client-with-attributes' Client Region was not properly configured and initialized!", clientRegion);
+		assertEquals("client-with-attributes", clientRegion.getName());
+		assertEquals(Region.SEPARATOR + "client-with-attributes", clientRegion.getFullPath());
+		assertNotNull(clientRegion.getAttributes());
+		assertFalse(clientRegion.getAttributes().getCloningEnabled());
+		assertTrue(clientRegion.getAttributes().getConcurrencyChecksEnabled());
+		assertEquals(8, clientRegion.getAttributes().getConcurrencyLevel());
+		assertEquals(DataPolicy.NORMAL, clientRegion.getAttributes().getDataPolicy());
+		assertFalse(clientRegion.getAttributes().getDataPolicy().withPersistence());
+		assertEquals(64, clientRegion.getAttributes().getInitialCapacity());
+		assertEquals(Long.class, clientRegion.getAttributes().getKeyConstraint());
+		assertEquals("0.85", String.valueOf(clientRegion.getAttributes().getLoadFactor()));
+		assertEquals("gemfire-pool", clientRegion.getAttributes().getPoolName());
+		assertEquals(String.class, clientRegion.getAttributes().getValueConstraint());
+	}
+
 	public static final class TestCacheLoader implements CacheLoader<Object, Object> {
 
 		@Override
diff --git a/src/test/resources/org/springframework/data/gemfire/config/client-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/client-ns.xml
index 12be30f5..5cef3fb6 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/client-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/client-ns.xml
@@ -27,8 +27,6 @@
 		<gfe:eviction threshold="5"/>
 	</gfe:client-region>
 
-	<bean id="c-listener" class="org.springframework.data.gemfire.SimpleCacheListener"/>
-
 	<gfe:client-region id="persistent" name="PersistentRegion" pool-name="gemfire-pool" persistent="true" disk-store-ref="diskStore" disk-synchronous="true"/>
 
 	<gfe:disk-store id="diskStore" auto-compact="true" max-oplog-size="5" queue-size="50" time-interval="9999">
@@ -56,6 +54,19 @@
 		<gfe:compressor ref="testCompressor"/>
 	</gfe:client-region>
 
+	<gfe:client-region id="client-with-attributes"
+					   cloning-enabled="false"
+					   concurrency-checks-enabled="true"
+					   concurrency-level="8"
+					   initial-capacity="64"
+					   key-constraint="java.lang.Long"
+					   load-factor="0.85"
+					   persistent="false"
+					   pool-name="gemfire-pool"
+					   shortcut="CACHING_PROXY"
+					   value-constraint="java.lang.String"/>
+
+	<bean id="c-listener" class="org.springframework.data.gemfire.SimpleCacheListener"/>
 	<bean id="testCompressor" class="org.springframework.data.gemfire.config.ClientRegionNamespaceTest$TestCompressor" p:name="STD"/>
 
 </beans>