From 291178fe09dad6c7afc957b0e91dcd6523d5c85c Mon Sep 17 00:00:00 2001
From: costin <cleau@vmware.com>
Date: Fri, 27 Aug 2010 20:11:20 +0300
Subject: [PATCH] + add region name test SGF-10 SGF-12 SGF-13

---
 .../org/springframework/data/gemfire/RecreatingContextTest.java | 1 +
 .../data/gemfire/config/PartitionedRegionNamespaceTest.java     | 1 +
 .../data/gemfire/config/ReplicatedRegionNamespaceTest.java      | 2 +-
 .../org/springframework/data/gemfire/config/partitioned-ns.xml  | 2 +-
 .../org/springframework/data/gemfire/config/replicated-ns.xml   | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java b/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java
index 625ee0b9..c578a925 100644
--- a/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java
+++ b/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java
@@ -36,6 +36,7 @@ public abstract class RecreatingContextTest {
 	@Before
 	public void createCtx() {
 		ctx = new GenericXmlApplicationContext(location());
+		ctx.registerShutdownHook();
 	}
 
 	@After
diff --git a/src/test/java/org/springframework/data/gemfire/config/PartitionedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/PartitionedRegionNamespaceTest.java
index f4d904f7..d8059894 100644
--- a/src/test/java/org/springframework/data/gemfire/config/PartitionedRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/PartitionedRegionNamespaceTest.java
@@ -58,6 +58,7 @@ public class PartitionedRegionNamespaceTest {
 		RegionFactoryBean fb = context.getBean("&options", RegionFactoryBean.class);
 		assertEquals(DataPolicy.PARTITION, TestUtils.readField("dataPolicy", fb));
 		assertEquals(null, TestUtils.readField("scope", fb));
+		assertEquals("redundant", TestUtils.readField("name", fb));
 
 		RegionAttributes attrs = TestUtils.readField("attributes", fb);
 		PartitionAttributes pAttr = attrs.getPartitionAttributes();
diff --git a/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
index 657f2a7d..9ea5e456 100644
--- a/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
@@ -57,7 +57,7 @@ public class ReplicatedRegionNamespaceTest {
 		RegionFactoryBean fb = context.getBean("&pub", RegionFactoryBean.class);
 		assertEquals(DataPolicy.REPLICATE, TestUtils.readField("dataPolicy", fb));
 		assertEquals(Scope.DISTRIBUTED_ACK, TestUtils.readField("scope", fb));
-
+		assertEquals("publisher", TestUtils.readField("name", fb));
 		RegionAttributes attrs = TestUtils.readField("attributes", fb);
 		assertTrue(attrs.getPublisher());
 	}
diff --git a/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml
index 47f042b8..c5fde979 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml
@@ -12,7 +12,7 @@
 	
 	<gfe:partitioned-region id="simple" />
 	
-	<gfe:partitioned-region id="options" copies="1" total-buckets="4">
+	<gfe:partitioned-region id="options" copies="1" total-buckets="4" name="redundant">
 		<gfe:partition-resolver>
 			<bean class="org.springframework.data.gemfire.SimplePartitionResolver"/>
 		</gfe:partition-resolver>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
index 464c6ba2..c2c8081e 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
@@ -12,7 +12,7 @@
 	
 	<gfe:replicated-region id="simple" />
 	
-	<gfe:replicated-region id="pub" publisher="true"/>
+	<gfe:replicated-region id="pub" publisher="true" name="publisher"/>
 	
 	<gfe:replicated-region id="complex">
 		<gfe:cache-listener>