geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [01/15] incubator-geode git commit: Refactor dunit
Date Wed, 03 Feb 2016 02:32:37 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-773-2 76e324b52 -> c0552f267


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
index 3e3e5b9..7b5942b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
@@ -55,29 +55,29 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
         false, 100, 10, false, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] {
-        testName + "_RR", 120 });
+        getTestMethodName() + "_RR", 120 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 120 });
+        getTestMethodName() + "_RR", 120 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 120 });
+        getTestMethodName() + "_RR", 120 });
   }
 
   public void testSerialReplicatedWanWithPersistence() {
@@ -101,29 +101,29 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
         false, 100, 10, false, true, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
 
   }
 
@@ -148,29 +148,29 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
         false, 100, 1000, true, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
   }
   
   public void testReplicatedSerialPropagationWithParallelThreads()
@@ -195,29 +195,29 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
         false, 100, 10, false, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "doMultiThreadedPuts", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
   }
   
   public void testSerialPropogationWithFilter() throws Exception {
@@ -243,26 +243,26 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
         new MyGatewayEventFilter(), true });
 
     vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap()  });
+        getTestMethodName(), null, 1, 100, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap()  });
+        getTestMethodName(), null, 1, 100, isOffHeap()  });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 800 });
+        getTestMethodName(), 800 });
   }
 
   public void testReplicatedSerialPropagationWithFilter() throws Exception {
@@ -288,28 +288,28 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
         new MyGatewayEventFilter(), true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, null, isOffHeap()  });
+        getTestMethodName(), null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, null, isOffHeap()  });
+        getTestMethodName(), null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap()  });
+        getTestMethodName(), "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap()  });
+        getTestMethodName(), "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap()  });
+        getTestMethodName(), "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap()  });
+        getTestMethodName(), "ln", isOffHeap()  });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 800 });
+        getTestMethodName(), 800 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 800 });
+        getTestMethodName(), 800 });
   }
   
   public void testReplicatedSerialPropagationWithFilter_AfterAck()
@@ -335,23 +335,23 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
             new MyGatewayEventFilter_AfterAck(), true });
 
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, null, isOffHeap() });
+        getTestMethodName(), null, isOffHeap() });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, null, isOffHeap() });
+        getTestMethodName(), null, isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap() });
+        getTestMethodName(), "ln", isOffHeap() });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap() });
+        getTestMethodName(), "ln", isOffHeap() });
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap() });
+        getTestMethodName(), "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName, "ln", isOffHeap() });
+        getTestMethodName(), "ln", isOffHeap() });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
 
     vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
         0 });
@@ -366,8 +366,8 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
     assertEquals(2000, (vm4Acks + vm5Acks));
 
     vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 1000 });
+        getTestMethodName(), 1000 });
     vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 1000 });
+        getTestMethodName(), 1000 });
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 7cb60d9..9072c4e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -60,25 +60,25 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
         false, 100, 10, false, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
 
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
     
     Wait.pause(2000);
     vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000
});
@@ -114,25 +114,25 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY });
 
 	vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", null, isOffHeap()  });
+		getTestMethodName() + "_RR", null, isOffHeap()  });
 
 	vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 	vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
 	vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
+		getTestMethodName() + "_RR", "ln", isOffHeap()  });
 	vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
+		getTestMethodName() + "_RR", "ln", isOffHeap()  });
 	vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
+		getTestMethodName() + "_RR", "ln", isOffHeap()  });
 	vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-		testName + "_RR", "ln", isOffHeap()  });
+		getTestMethodName() + "_RR", "ln", isOffHeap()  });
 
-	vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+	vm5.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
 		1000 });
 
 	vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-		testName + "_RR", 1000 });
+		getTestMethodName() + "_RR", 1000 });
 	    
 	Wait.pause(2000);
 	vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000
});
@@ -176,9 +176,9 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
         3, false, 100, 10, false, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
@@ -187,21 +187,21 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+        getTestMethodName() + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        getTestMethodName() + "_RR", 1000 });
     
     Wait.pause(2000);
     vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000
});
@@ -246,22 +246,22 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
         false, 100, 10, false, false, null, true });
     
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap()  });
+        getTestMethodName() + "_RR", null, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR", "ln", isOffHeap()  });
     
     AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { testName + "_RR", 10000 });
+        new Object[] { getTestMethodName() + "_RR", 10000 });
     Wait.pause(2000);
     AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender", new Object[]
{ "ln" });
     Boolean isKilled = Boolean.FALSE;
@@ -280,7 +280,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
     inv2.join();
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+        getTestMethodName() + "_RR", 10000 });
   
     vm2.invoke(WANTestBase.class, "checkGatewayReceiverStatsHA", new Object[] {1000, 10000,
10000 });
     
@@ -311,15 +311,15 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     //create one RR (RR_1) on remote site
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", null, isOffHeap()  });
+        getTestMethodName() + "_RR_1", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", null, isOffHeap()  });
+        getTestMethodName() + "_RR_1", null, isOffHeap()  });
 
     //create another RR (RR_2) on remote site
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", null, isOffHeap()  });
+        getTestMethodName() + "_RR_2", null, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", null, isOffHeap()  });
+        getTestMethodName() + "_RR_2", null, isOffHeap()  });
     
     //start the senders on local site
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
@@ -327,35 +327,35 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     //create one RR (RR_1) on local site
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
 
     //create another RR (RR_2) on local site
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_2", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_2", "ln", isOffHeap()  });
     
     //start puts in RR_1 in another thread
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_1",
1000 });
     //do puts in RR_2 in main thread
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 500 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR_2",
500 });
     //sleep for some time to let all the events propagate to remote site
     Thread.sleep(20);
     //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR_1", 1000 });
+        getTestMethodName() + "_RR_1", 1000 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR_2", 500 });
+        getTestMethodName() + "_RR_2", 500 });
     
     Wait.pause(2000);
     vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
@@ -405,7 +405,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     //create one RR (RR_1) on remote site
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", null, isOffHeap()  });
+        getTestMethodName() + "_RR_1", null, isOffHeap()  });
 
     //start the senders on local site
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
@@ -413,18 +413,18 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     //create one RR (RR_1) on local site
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR_1", "ln", isOffHeap()  });
+        getTestMethodName() + "_RR_1", "ln", isOffHeap()  });
 
     //start puts in RR_1 in another thread
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName
+ "_RR_1", 20000 });
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()
+ "_RR_1", 20000 });
     //destroy RR_1 in remote site
-    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_1", 500});
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { getTestMethodName() + "_RR_1",
500});
     
     try {
       inv1.join();
@@ -435,7 +435,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     //verify that all is well in local site. All the events should be present in local region
     vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR_1", 20000 });
+        getTestMethodName() + "_RR_1", 20000 });
     //assuming some events might have been dispatched before the remote region was destroyed,
     //sender's region queue will have events less than 1000 but the queue will not be empty.
     //NOTE: this much verification might be sufficient in DUnit. Hydra will take care of

@@ -473,26 +473,26 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
         new MyGatewayEventFilter(), true });
 
     vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 1, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 1, 100, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap()  });
+        getTestMethodName(), null, 1, 100, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap()  });
+        getTestMethodName(), null, 1, 100, isOffHeap()  });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName(), 1000 });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 800 });
+        getTestMethodName(), 800 });
     
     Wait.pause(2000);
     vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
@@ -529,22 +529,22 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
         false, 100, 10, true, false, null, true });
 
     vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 0, 100, isOffHeap()  });
     vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 0, 100, isOffHeap()  });
     vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 0, 100, isOffHeap()  });
     vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap()  });
+        getTestMethodName(), "ln", 0, 100, isOffHeap()  });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
 
     vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null,1, 100, isOffHeap()  });
+        getTestMethodName(), null,1, 100, isOffHeap()  });
     vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null,1, 100, isOffHeap()  });
+        getTestMethodName(), null,1, 100, isOffHeap()  });
 
     final Map keyValues = new HashMap();
     final Map updateKeyValues = new HashMap();
@@ -552,7 +552,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues
});
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName(),
keyValues });
 
     Wait.pause(5000);
     vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()
});
@@ -560,16 +560,16 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
       updateKeyValues.put(i, i+"_updated");
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues
});
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName(),
updateKeyValues });
 
     Wait.pause(5000);
     
     vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()
 + updateKeyValues.size() });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+        getTestMethodName(), 0 });
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues
});
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName(),
updateKeyValues });
 
     Wait.pause(5000);
     
@@ -579,14 +579,14 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     keyValues.putAll(updateKeyValues);
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
+        getTestMethodName(), keyValues.size() });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, keyValues.size() });
+      getTestMethodName(), keyValues.size() });
     
     vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
+        getTestMethodName(), keyValues });
     vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
+        getTestMethodName(), keyValues });
     
     Wait.pause(2000);
     vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 655ad2a..38d8827 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -86,7 +86,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static Integer createFirstLocatorWithDSId(int dsId) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -99,7 +99,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
@@ -112,7 +112,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static void createCache(Integer locPort){
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
@@ -121,7 +121,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static void createCacheWithGroups(Integer locPort, String groups){
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
@@ -214,7 +214,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static int createAndStartReceiver(int locPort) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -238,7 +238,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static int createReceiver(int locPort) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -256,7 +256,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static int createReceiverWithGroup(int locPort, String groups) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -275,7 +275,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static void startReceiver() {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     try {
       Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
       for (GatewayReceiver receiver : receivers) {
@@ -288,7 +288,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static void stopReceiver() {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     for (GatewayReceiver receiver : receivers) {
       receiver.stop();
@@ -296,7 +296,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static int createAndStartReceiverWithGroup(int locPort, String groups) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
@@ -444,7 +444,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
   }
 
   public static void verifyReceiverState(boolean isRunning) {
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     for (GatewayReceiver receiver : receivers) {
       assertEquals(isRunning, receiver.isRunning());
@@ -455,7 +455,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
       int startPort, int endPort, String bindAddress, int maxTimeBetweenPings,
       int socketBufferSize, List<String> expectedGatewayTransportFilters) {
 
-    WANCommandTestBase test = new WANCommandTestBase(testName);
+    WANCommandTestBase test = new WANCommandTestBase(getTestMethodName());
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     assertEquals("Number of receivers is incorrect", 1, receivers.size());
     for (GatewayReceiver receiver : receivers) {
@@ -491,8 +491,8 @@ public class WANCommandTestBase extends CliCommandTestBase{
     }
   }
 
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     closeCache();
     vm0.invoke(WANCommandTestBase.class, "closeCache");
     vm1.invoke(WANCommandTestBase.class, "closeCache");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
index caf8fdb..74f5554 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
@@ -51,8 +51,8 @@ public class WANManagementDUnitTest extends ManagementTestBase {
     super(name);
     }
 
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  public void preTearDown() throws Exception {
+    super.preTearDown();
    
   }
 
@@ -84,14 +84,14 @@ public class WANManagementDUnitTest extends ManagementTestBase {
 
 
     puneSender.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", "pn", 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
     managing.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", "pn", 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
     
     nyReceiver.invoke(WANTestBase.class, "createReceiver",
         new Object[] { nyPort });
     nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", null, 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
 
     puneSender.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
     managing.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
@@ -106,8 +106,8 @@ public class WANManagementDUnitTest extends ManagementTestBase {
     
  
     
-    checkSenderMBean(puneSender, testName + "_PR");
-    checkSenderMBean(managing, testName + "_PR");
+    checkSenderMBean(puneSender, getTestMethodName() + "_PR");
+    checkSenderMBean(managing, getTestMethodName() + "_PR");
     
     checkReceiverMBean(nyReceiver);
     
@@ -142,7 +142,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
     nyReceiver.invoke(WANTestBase.class, "createReceiver",
         new Object[] { nyPort });
     nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", null, 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
     
     // keep a larger batch to minimize number of exception occurrences in the
     // log
@@ -150,7 +150,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
         12, true, 100, 300, false, false, null, true });
 
     puneSender.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", "pn", 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
 
     puneSender.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
 
@@ -162,7 +162,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
     startManagingNode(managing);
 
 
-    checkSenderMBean(puneSender, testName + "_PR");
+    checkSenderMBean(puneSender, getTestMethodName() + "_PR");
     checkReceiverMBean(nyReceiver);
 
     DistributedMember nyMember = (DistributedMember) nyReceiver.invoke(
@@ -202,15 +202,15 @@ public class WANManagementDUnitTest extends ManagementTestBase {
 
 
     puneSender.invoke(WANTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new
Object[] {
-      testName + "_RR", "pn", false });
+      getTestMethodName() + "_RR", "pn", false });
     managing.invoke(WANTestBase.class, "createReplicatedRegionWithAsyncEventQueue", new Object[]
{
-      testName + "_RR", "pn", false });
+      getTestMethodName() + "_RR", "pn", false });
 
     
     nyReceiver.invoke(WANTestBase.class, "createReceiver",
         new Object[] { nyPort });
     nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", null, 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
     
     checkAsyncQueueMBean(puneSender);
     checkAsyncQueueMBean(managing);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
index 891486c..ba69123 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -59,8 +59,8 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
     super(name);
   }
 
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  public void preTearDown() throws Exception {
+    super.preTearDown();
 
   }
 
@@ -90,14 +90,14 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
         true, 100, 300, false, false, null, true });
 
     puneSender.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", "pn", 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", "pn", 1, 100, false });
     managing.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName + "_PR", "pn", 1, 100, false });
+        getTestMethodName() + "_PR", "pn", 1, 100, false });
 
     nyReceiver.invoke(WANTestBase.class, "createReceiver",
         new Object[] { nyPort });
     nyReceiver.invoke(WANTestBase.class, "createPartitionedRegion",
-        new Object[] { testName + "_PR", null, 1, 100, false });
+        new Object[] { getTestMethodName() + "_PR", null, 1, 100, false });
 
     puneSender.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
     managing.invoke(WANTestBase.class, "startSender", new Object[] { "pn" });
@@ -108,8 +108,8 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
     managing.invoke(WANTestBase.class, "waitForSenderRunningState",
         new Object[] { "pn" });
 
-    checkSenderMBean(puneSender, testName + "_PR");
-    checkSenderMBean(managing, testName + "_PR");
+    checkSenderMBean(puneSender, getTestMethodName() + "_PR");
+    checkSenderMBean(managing, getTestMethodName() + "_PR");
 
     checkReceiverMBean(nyReceiver);
 



Mime
View raw message