SGF-192 - ClientRegionParser now processes close and destroy attributes

src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java

@@ -22,10 +22,13 @@ import javax.annotation.Resource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.ClientCache;
 
@@ -35,17 +38,24 @@ import com.gemstone.gemfire.cache.client.ClientCache;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="client-cache.xml",
-	initializers=GemfireTestApplicationContextInitializer.class)
+@ContextConfiguration(locations = "client-cache.xml", initializers = GemfireTestApplicationContextInitializer.class)
 public class ClientCacheTest {
-	@Resource(name="challengeQuestionsRegion")
-	Region<?,?> region;
-	
+	@Resource(name = "challengeQuestionsRegion")
+	Region<?, ?> region;
+
 	@Autowired
 	ClientCache cache;
-	
-    @Test
-    public void test() {
-    	assertEquals("gemfirePool",region.getAttributes().getPoolName());
-    }
+
+	@Test
+	public void test() {
+		assertEquals("gemfirePool", region.getAttributes().getPoolName());
+	}
+
+	@Test
+	public void testNoClose() {
+		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("/org/springframework/data/gemfire/client/client-cache-no-close.xml");
+		Cache cache = ctx.getBean(Cache.class);
+		ctx.close();
+		assertFalse(cache.isClosed());
+	}
 }

src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.springframework.data.gemfire.client;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.data.gemfire.ForkUtil;
+import org.springframework.data.gemfire.fork.SpringCacheServerProcess;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.Pool;
+
+/**
+ * @author David Turanski
+ *
+ */
+
+public class MultipleClientCacheTest {
+	@BeforeClass
+	public static void startUp() throws Exception {
+		ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+				+ "/org/springframework/data/gemfire/client/datasource-server.xml");
+	}
+	@Test
+	public void testMultipleCaches() {
+		String resourcePath = "/org/springframework/data/gemfire/client/client-cache-no-close.xml";
+		
+		ConfigurableApplicationContext ctx1 = new ClassPathXmlApplicationContext(resourcePath);
+		ConfigurableApplicationContext ctx2 = new ClassPathXmlApplicationContext(resourcePath);
+		Region region1 = ctx1.getBean(Region.class);
+		Cache cache1 = ctx1.getBean(Cache.class);
+		Pool pool = ctx1.getBean(Pool.class);
+		Region region2 = ctx2.getBean(Region.class);
+		Cache cache2 = ctx2.getBean(Cache.class);
+		assertSame(region1,region2);
+		assertSame(cache1,cache2);
+		assertFalse(region1.isDestroyed());
+		ctx1.close();
+		assertFalse(cache1.isClosed());
+		assertFalse("region was destroyed" ,region1.isDestroyed());
+	}
+
+	@AfterClass
+	public static void cleanUp() throws InterruptedException {
+		Thread.sleep(3000);
+		ForkUtil.sendSignal();
+	}
+}

src/test/java/org/springframework/data/gemfire/config/MultipleCacheTest.java

@@ -12,6 +12,7 @@
  */
 package org.springframework.data.gemfire.config;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 
@@ -20,6 +21,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
 
 /**
  * @author David Turanski
@@ -33,11 +35,14 @@ public class MultipleCacheTest {
 		
 		ConfigurableApplicationContext ctx1 = new ClassPathXmlApplicationContext(resourcePath);
 		ConfigurableApplicationContext ctx2 = new ClassPathXmlApplicationContext(resourcePath);
+		Region region1 = ctx1.getBean(Region.class);
 		Cache cache1 = ctx1.getBean(Cache.class);
+		Region region2 = ctx2.getBean(Region.class);
 		Cache cache2 = ctx2.getBean(Cache.class);
+		assertSame(region1,region2);
 		assertSame(cache1,cache2);
 		ctx1.close();
-		ctx2.close();
 		assertFalse(cache1.isClosed());
+		assertFalse("region was destroyed" ,region1.isDestroyed());
 	}
 }

src/test/resources/org/springframework/data/gemfire/client/client-cache-no-close.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	
+	 <gfe:client-cache close="false" use-bean-factory-locator="false"/>
+	 <gfe:pool keep-alive="true">
+	 	<gfe:server host="localhost" port="40404"/>
+	 </gfe:pool>
+	 <gfe:client-region id="r1" data-policy="EMPTY"/>
+</beans>

src/test/resources/org/springframework/data/gemfire/client/client-cache.xml

@@ -9,5 +9,5 @@
 	 <gfe:client-region data-policy="NORMAL" name="ChallengeQuestions" id="challengeQuestionsRegion"/>
 	 <gfe:pool>
 	 	<gfe:locator host="localhost" port="1234"/>
-	 </gfe:pool>	 
+	 </gfe:pool>
 </beans>

src/test/resources/org/springframework/data/gemfire/config/MultipleCacheTest-context.xml

@@ -7,4 +7,5 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<gfe:cache use-bean-factory-locator="false" close="false"/>
+	<gfe:replicated-region id="region"/>
 </beans>