geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [03/15] incubator-geode git commit: Refactor dunit
Date Wed, 03 Feb 2016 02:32:39 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index d46d6f5..3ea2674 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -65,10 +65,10 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
 
         //exercise region and gateway operations with different messaging
         exerciseWANOperations();
-        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
-        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
 
         exerciseFunctions();
 
@@ -102,12 +102,12 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
 
         exerciseWANOperations();
         AsyncInvocation invVM4transaction
-                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
         AsyncInvocation invVM5transaction
-                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
 
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
 
         exerciseFunctions();
 
@@ -143,11 +143,11 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
 
         //exercise region and gateway operations with messaging
         exerciseWANOperations();
-        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
-        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
+        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{getTestMethodName() + "_RR", 100});
 
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
 
         exerciseFunctions();
 
@@ -181,12 +181,12 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
 
         exerciseWANOperations();
         AsyncInvocation invVM4transaction
-                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
         AsyncInvocation invVM5transaction
-                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{getTestMethodName() + "_RR", 100, 1000});
 
-        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
-        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 1000});
 
         exerciseFunctions();
 
@@ -207,15 +207,15 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
     private void createReplicatedRegions(Integer nyPort) throws Exception {
         //create receiver
         vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
-          testName + "_RR", null, false});
+          getTestMethodName() + "_RR", null, false});
         vm2.invoke(WANTestBase.class, "createReceiverAfterCache", new Object[]{nyPort});
 
         //create senders
         vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
-          testName + "_RR", "ln1,ln2", false});
+          getTestMethodName() + "_RR", "ln1,ln2", false});
 
         vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
-          testName + "_RR", "ln1,ln2", false});
+          getTestMethodName() + "_RR", "ln1,ln2", false});
     }
 
     private void createCachesWith(Boolean socketPolicy, Integer nyPort, Integer lnPort) {
@@ -231,34 +231,34 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
         for (int x = 0; x < 1000; x++) {
             //setting it to Boolean.TRUE it should pass the test
             vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{testName + "_RR", 1, Boolean.TRUE});
+                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.TRUE});
             vm5.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{testName + "_RR", 1, Boolean.TRUE});
+                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.TRUE});
         }
         for (int x = 0; x < 1000; x++) {
             //setting the Boolean.FALSE below will cause a deadlock in some GFE versions
             //setting it to Boolean.TRUE as above it should pass the test
             //this is similar to the customer found distributed deadlock
             vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{testName + "_RR", 1, Boolean.FALSE});
+                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.FALSE});
             vm5.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
-                    new Object[]{testName + "_RR", 1, Boolean.FALSE});
+                    new Object[]{getTestMethodName() + "_RR", 1, Boolean.FALSE});
         }
     }
 
     private void createPartitionedRegions(Integer nyPort) throws Exception {
         //create remote receiver
-        vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{testName + "_RR",
+        vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{getTestMethodName() + "_RR",
                                                                                 "", 0, 113, false});
 
         vm2.invoke(WANTestBase.class, "createReceiverAfterCache", new Object[]{nyPort});
 
         //create sender vms
         vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{
-          testName + "_RR", "ln1,ln2", 1, 113, false});
+          getTestMethodName() + "_RR", "ln1,ln2", 1, 113, false});
 
         vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{
-          testName + "_RR", "ln1,ln2", 1, 113, false});
+          getTestMethodName() + "_RR", "ln1,ln2", 1, 113, false});
     }
 
     private void exerciseWANOperations() throws Exception {
@@ -266,35 +266,35 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
         //messaging between the WAN gateways and members
 
         //exercise region and gateway operations
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
-        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
         Wait.pause(2000); //wait for events to propogate
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
-        vm5.invoke(WANTestBase.class, "doDestroys", new Object[]{testName + "_RR", 100});
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "doDestroys", new Object[]{getTestMethodName() + "_RR", 100});
         Wait.pause(2000);//wait for events to propogate
-        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
-        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
-        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{getTestMethodName() + "_RR", 100});
         Wait.pause(2000); //wait for events to propogate
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 100});
         vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doInvalidates",
-                new Object[]{testName + "_RR", 100, 100});
-        vm4.invoke(WANTestBase.class, "doPutAll", new Object[]{testName + "_RR", 100, 10});
-        vm5.invoke(WANTestBase.class, "doPutAll", new Object[]{testName + "_RR", 100, 10});
+                new Object[]{getTestMethodName() + "_RR", 100, 100});
+        vm4.invoke(WANTestBase.class, "doPutAll", new Object[]{getTestMethodName() + "_RR", 100, 10});
+        vm5.invoke(WANTestBase.class, "doPutAll", new Object[]{getTestMethodName() + "_RR", 100, 10});
         Wait.pause(2000);//wait for events to propogate
-        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 1000});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 1000});
-        vm4.invoke(WANTestBase.class, "doDestroys", new Object[]{testName + "_RR", 1000});
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 1000});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 1000});
+        vm4.invoke(WANTestBase.class, "doDestroys", new Object[]{getTestMethodName() + "_RR", 1000});
         Wait.pause(2000);//wait for events to propogate
-        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
-        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
-        vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[]{testName + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{getTestMethodName() + "_RR", 0});
+        vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[]{getTestMethodName() + "_RR", 100});
         Wait.pause(2000);
-        vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{testName + "_RR", 100});
-        vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{testName + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{getTestMethodName() + "_RR", 100});
+        vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{getTestMethodName() + "_RR", 100});
     }
 
     private void startSerialSenders() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index 09c1646..89b575f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -67,27 +67,27 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
     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() });
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
 
     vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", keyValues.size() });
+      getTestMethodName() + "_RR", keyValues.size() });
     
     vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", keyValues.size() });
+      getTestMethodName() + "_RR", keyValues.size() });
     
     vm4.invoke(WANTestBase.class, "printEventListenerMap", new Object[]{});
     vm5.invoke(WANTestBase.class, "printEventListenerMap", new Object[]{});
@@ -118,40 +118,40 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
         false, 100, 10, false, false, null, false, 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() });
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
       keyValues.put(i, i);
     }
 
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
 
     vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", keyValues.size() });
+      getTestMethodName() + "_RR", keyValues.size() });
     
     vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", keyValues.size() });
+      getTestMethodName() + "_RR", keyValues.size() });
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 0 });
+        getTestMethodName() + "_RR", 0 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 0 });
+        getTestMethodName() + "_RR", 0 });
     
     vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", keyValues });
   }
@@ -180,21 +180,21 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
         false, 100, 10, false, false, null, true, 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() });
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
@@ -202,13 +202,13 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
     }
 
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 0 });
+        getTestMethodName() + "_RR", 0 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 0 });
+        getTestMethodName() + "_RR", 0 });
     
     vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener2", new Object[] {"ln", keyValues });
   }
@@ -252,20 +252,20 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
     vm4.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() });
 
     final Map initialKeyValues = new HashMap();
     for(int i=0; i< 1000; i++) {
       initialKeyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       initialKeyValues });
 
     vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", initialKeyValues });
@@ -277,7 +277,7 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
       keyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", initialKeyValues });
@@ -289,7 +289,7 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
       finalKeyValues.put(i, i);
     }
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       finalKeyValues });
     
     finalKeyValues.putAll(initialKeyValues);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index 19f608b..90ccd1b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -80,9 +80,9 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     createSenderRegions();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         100 ));
 
     vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifyGatewaySenderOperations( "ln" ));
@@ -92,20 +92,20 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
   protected void createSenderRegions() {
     vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
   }
 
   protected void createReceiverRegions() {
     vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", null, isOffHeap() ));
+        getTestMethodName() + "_RR", null, isOffHeap() ));
     vm3.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", null, isOffHeap() ));
+        getTestMethodName() + "_RR", null, isOffHeap() ));
   }
 
   protected void createSenderCaches(Integer lnPort) {
@@ -146,12 +146,12 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     createSenderRegions();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         100 ));
 
     vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
@@ -160,7 +160,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderPausedState( "ln" ));
     vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderPausedState( "ln" ));
 
-    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR", 10 ));
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", 10 ));
 
     vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
     vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
@@ -180,9 +180,9 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     validateQueueContents(vm4, "ln", 0);
     validateQueueContents(vm5, "ln", 0);
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 100 ));
+        getTestMethodName() + "_RR", 100 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 100 ));
+        getTestMethodName() + "_RR", 100 ));
 
   }
 
@@ -201,23 +201,23 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     createSenderRegions();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         20 ));
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         20 ));
     
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 20 ));
+        getTestMethodName() + "_RR", 20 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 20 ));
+        getTestMethodName() + "_RR", 20 ));
     
     vm2.invoke(() -> WANTestBase.stopReceivers());
     vm3.invoke(() -> WANTestBase.stopReceivers());
     
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         20 ));
     
     vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
@@ -249,7 +249,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
     vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
 
-    vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
       110 ));
     
     vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 130 ));
@@ -262,9 +262,9 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
     
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-      testName + "_RR", 110 ));
+      getTestMethodName() + "_RR", 110 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
-      testName + "_RR", 110 ));
+      getTestMethodName() + "_RR", 110 ));
     
     vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
     vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
@@ -292,23 +292,23 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         100 ));
 
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
 
     vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
     
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         200 ));
     
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 200 ));
+        getTestMethodName() + "_RR", 200 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 200 ));
+        getTestMethodName() + "_RR", 200 ));
     
     //Do some puts while restarting a sender
-    AsyncInvocation asyncPuts = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR",
+    AsyncInvocation asyncPuts = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         300 ));
     
     Thread.sleep(10);
@@ -318,9 +318,9 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
     
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 300 ));
+        getTestMethodName() + "_RR", 300 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 300 ));
+        getTestMethodName() + "_RR", 300 ));
     
     vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
     
@@ -344,22 +344,22 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
 
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
 
     vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
     
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         100 ));
     
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
 
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 100 ));
+        getTestMethodName() + "_RR", 100 ));
     vm3.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 100 ));
+        getTestMethodName() + "_RR", 100 ));
   }
   
   public void testStopOneSender_StartAnotherSender() {
@@ -368,15 +368,15 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
     vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", null, isOffHeap() ));
+        getTestMethodName() + "_RR", null, isOffHeap() ));
 
     vm4.invoke(() -> WANTestBase.createCache( lnPort ));
     createSenderVM4();
     vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
     vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
@@ -384,14 +384,14 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm5.invoke(() -> WANTestBase.createCache( lnPort ));
     createSenderVM5();
     vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-      testName + "_RR", "ln", isOffHeap() ));
+      getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm5.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         100 ));
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 100 ));
+        getTestMethodName() + "_RR", 100 ));
   }
 
   public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
@@ -401,10 +401,10 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm4.invoke(() -> WANTestBase.createCache( lnPort ));
     createSenderVM4();
     vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
     validateQueueContents(vm4, "ln", 10);
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
@@ -414,10 +414,10 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm5.invoke(() -> WANTestBase.createCache( lnPort ));
     createSenderVM5();
     vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", "ln", isOffHeap() ));
+        getTestMethodName() + "_RR", "ln", isOffHeap() ));
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
 
-    vm5.invoke(() -> WANTestBase.doPutsFrom( testName + "_RR", 10, 110 ));
+    vm5.invoke(() -> WANTestBase.doPutsFrom( getTestMethodName() + "_RR", 10, 110 ));
 
     validateQueueContents(vm5, "ln", 100);
     validateQueueClosedVM4();
@@ -431,15 +431,15 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm5.invoke(() -> WANTestBase.startSender( "ln" ));
     vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
     vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-        testName + "_RR", null, isOffHeap() ));
+        getTestMethodName() + "_RR", null, isOffHeap() ));
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 100 ));
+        getTestMethodName() + "_RR", 100 ));
     vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
 
     vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 110 ));
+        getTestMethodName() + "_RR", 110 ));
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
   }
   
@@ -473,15 +473,15 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
     
     //before destroying, stop the sender
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
     vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
     
-    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
-    vm5.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
+    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", getTestMethodName() + "_RR" ));
+    vm5.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", getTestMethodName() + "_RR" ));
 
     vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
     vm5.invoke(() -> WANTestBase.destroySender( "ln" ));
@@ -510,13 +510,13 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
     
     //before destroying, stop the sender
     vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
         
-    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
+    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", getTestMethodName() + "_RR" ));
     
     vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
     
@@ -545,7 +545,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     startSenders();
 
-    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+    vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR",
         10 ));
     
     try {
@@ -554,7 +554,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
       assertTrue("Cause of the exception should be GatewaySenderException", e.getCause() instanceof GatewaySenderException);
     }
     vm2.invoke(() -> WANTestBase.validateRegionSize(
-        testName + "_RR", 10 ));
+        getTestMethodName() + "_RR", 10 ));
   }
 
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 38e3178..af82aef 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -70,9 +70,9 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     vm3.invoke(WANTestBase.class, "createCache", new Object[] {nyPort });
 
     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() });
 
     vm2.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
     vm3.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
@@ -91,23 +91,23 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     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, "addQueueListener", new Object[] { "ln", false});
     vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
     
-    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_RR"});
-    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_RR"});
+    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_RR"});
+    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_RR"});
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
     
-    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
       1000 });
     Wait.pause(5000);
     HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
@@ -130,7 +130,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
     Wait.pause(5000);
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 1000 });
+      getTestMethodName() + "_RR", 1000 });
     primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
     HashMap receiverUpdates = (HashMap)vm2.invoke(WANTestBase.class, "checkQueue");
     
@@ -158,12 +158,12 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
 
     vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      testName + "_PR", null, 1, 100, isOffHeap() });
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
     vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      testName + "_PR", null, 1, 100, isOffHeap() });
+      getTestMethodName() + "_PR", null, 1, 100, isOffHeap() });
   
-    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_PR"});
-    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_PR"});
+    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_PR"});
+    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {getTestMethodName() + "_PR"});
   
     vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
     vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
@@ -176,13 +176,13 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
         false, 100, 10, false, false, null, true,1, OrderPolicy.KEY });
 
     vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName + "_PR", "ln", 1, 100, isOffHeap() });
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName + "_PR", "ln", 1, 100, isOffHeap() });
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName + "_PR", "ln", 1, 100, isOffHeap() });
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName + "_PR", "ln", 1, 100, isOffHeap() });
+        getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
@@ -192,7 +192,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
     
-    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR",
       1000 });
     Wait.pause(5000);
     HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
@@ -211,7 +211,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
     Wait.pause(5000);
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_PR", 1000 });
+      getTestMethodName() + "_PR", 1000 });
   }
   
   /**
@@ -225,7 +225,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     Integer remoteLocPort = (Integer) vm1.invoke(WANTestBase.class,
         "createFirstRemoteLocator", new Object[] { 2, localLocPort });
 
-    WANTestBase test = new WANTestBase(testName);
+    WANTestBase test = new WANTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["
@@ -291,7 +291,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
     Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
         "createFirstRemoteLocator", new Object[] { 2, localLocPort });
     
-    WANTestBase test = new WANTestBase(testName);
+    WANTestBase test = new WANTestBase(getTestMethodName());
     Properties props = new Properties();
     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index 605696c..6cc2d99 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -64,29 +64,29 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
         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 });
 
   }
 
@@ -115,29 +115,29 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
         false, 100, 10, false, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", null, isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
     vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", null, isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { 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 });
 
   }
 
@@ -166,29 +166,29 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
         false, 100, 10, false, true, null, true });
 
     vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", null, isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
     vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", null, isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", null, isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
-        new Object[] { testName + "_RR", "ln", isOffHeap() });
+        new Object[] { 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 });
 
   }
 
@@ -221,26 +221,26 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore);
 
     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, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
@@ -289,9 +289,9 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     Wait.pause(5000);
 
     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 });
 
   }
 
@@ -326,26 +326,26 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore);
 
     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, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
@@ -369,10 +369,10 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     LogWriterSupport.getLogWriter().info("Created the sender.... in vm5 ");
     
     vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
+      getTestMethodName() + "_RR", "ln", isOffHeap() });
     
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
+      getTestMethodName() + "_RR", "ln", isOffHeap() });
   
     AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
         new Object[] { "ln" });
@@ -389,9 +389,9 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     Wait.pause(5000);
 
     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 });
 
   }
   
@@ -423,26 +423,26 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
             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, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
@@ -480,9 +480,9 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     LogWriterSupport.getLogWriter().info("Started the sender in vm 5");
     
     AsyncInvocation inv1 =  vm4.invokeAsync(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
+      getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
+      getTestMethodName() + "_RR", "ln", isOffHeap() });
     
     try {
       inv1.join();
@@ -491,13 +491,13 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     }
 
     Wait.pause(5000);
-    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 });
 
   }
   
@@ -533,26 +533,26 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     LogWriterSupport.getLogWriter().info("The first ds is " + secondDStore);
 
     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, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR",
         1000 });
 
     LogWriterSupport.getLogWriter().info("Completed puts in the region");
@@ -576,10 +576,10 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     LogWriterSupport.getLogWriter().info("Created the sender.... in vm5 ");
     
     vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
+      getTestMethodName() + "_RR", "ln", isOffHeap() });
     
     vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
+      getTestMethodName() + "_RR", "ln", isOffHeap() });
   
     AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
         new Object[] { "ln" });
@@ -596,9 +596,9 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
     Wait.pause(5000);
 
     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 });
 
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index cebcbda..4269b76 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -56,9 +56,9 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
         false, 100, 10, false, false, null, true });
 
     vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny", isOffHeap() });
+        getTestMethodName() + "_RR", "ny", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
@@ -69,41 +69,41 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
         false });
     
     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", "ny", isOffHeap() });
+        getTestMethodName() + "_RR", "ny", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny", isOffHeap()});
+        getTestMethodName() + "_RR", "ny", isOffHeap()});
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     keyValues.clear();
     for(int i=1; i< 2; i++) {
       keyValues.put(i, i);
     }
-    vm6.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm6.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 2 });
+        getTestMethodName() + "_RR", 2 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 2 });
+        getTestMethodName() + "_RR", 2 });
     
     vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 2 });
+      getTestMethodName() + "_RR", 2 });
     vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 2 });
+      getTestMethodName() + "_RR", 2 });
     vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 2 });
+      getTestMethodName() + "_RR", 2 });
     vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 2 });
+      getTestMethodName() + "_RR", 2 });
   
   
     Wait.pause(5000);
@@ -156,11 +156,11 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
 
     
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap()});
+        getTestMethodName() + "_RR", "ln", isOffHeap()});
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny", isOffHeap()});
+        getTestMethodName() + "_RR", "ny", isOffHeap()});
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "tk", isOffHeap()});
+        getTestMethodName() + "_RR", "tk", isOffHeap()});
 
     vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
@@ -175,39 +175,39 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
   
     
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
+        getTestMethodName() + "_RR", "ln", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny", isOffHeap() });
+        getTestMethodName() + "_RR", "ny", isOffHeap() });
 
 
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     keyValues.clear();
     for(int i=1; i< 2; i++) {
       keyValues.put(i, i);
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     keyValues.clear();
     for(int i=2; i< 3; i++) {
       keyValues.put(i, i);
     }
-    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
         
     vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 3 });
+        getTestMethodName() + "_RR", 3 });
     vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 3 });
+        getTestMethodName() + "_RR", 3 });
     vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 3 });
+        getTestMethodName() + "_RR", 3 });
     
     
     Wait.pause(5000);
@@ -277,11 +277,11 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
 
     
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln1,ln2", isOffHeap()});
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap()});
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny1,ny2", isOffHeap()});
+        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap()});
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "tk1,tk2", isOffHeap() });
+        getTestMethodName() + "_RR", "tk1,tk2", isOffHeap() });
 
     vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
     vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
@@ -307,22 +307,22 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
   
     
     vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln1,ln2", isOffHeap() });
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() });
     vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny1,ny2", isOffHeap() });
+        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap() });
     
     final Map keyValues = new HashMap();
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     keyValues.clear();
     for(int i=1; i< 2; i++) {
       keyValues.put(i, i);
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     keyValues.clear();
@@ -330,16 +330,16 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
       
       keyValues.put(i, i);
     }
-    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     Wait.pause(2000);
     vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 3 });
+        getTestMethodName() + "_RR", 3 });
     vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 3 });
+        getTestMethodName() + "_RR", 3 });
     vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 3 });
+        getTestMethodName() + "_RR", 3 });
     
     Wait.pause(5000);
     vm6.invoke(WANTestBase.class, "verifyQueueSize",
@@ -433,11 +433,11 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
 
     
     vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln1,ln2", isOffHeap() });
+        getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() });
     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ny1,ny2", isOffHeap() });
+        getTestMethodName() + "_RR", "ny1,ny2", isOffHeap() });
     vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "tk1,tk2", isOffHeap() });
+        getTestMethodName() + "_RR", "tk1,tk2", isOffHeap() });
 
     
     vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
@@ -466,15 +466,15 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
     for(int i=0; i< 1; i++) {
       keyValues.put(i, i);
     }
-    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { getTestMethodName() + "_RR",
       keyValues });
     
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1 });
+        getTestMethodName() + "_RR", 1 });
     vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1 });
+        getTestMethodName() + "_RR", 1 });
     vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1 });
+        getTestMethodName() + "_RR", 1 });
     
     Wait.pause(5000);
     vm3.invoke(WANTestBase.class, "verifyQueueSize",


Mime
View raw message