geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [38/62] [abbrv] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-837
Date Tue, 07 Jun 2016 20:54:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index be8281a,8d47e00..8cc03d8
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@@ -16,54 -16,7 +16,55 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan;
  
 -import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 +import static org.junit.Assert.*;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.Serializable;
 +import java.net.InetSocketAddress;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.LinkedList;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Properties;
 +import java.util.Set;
 +import java.util.StringTokenizer;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.ConcurrentSkipListSet;
 +import java.util.concurrent.ExecutionException;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Executors;
 +import java.util.concurrent.Future;
 +import java.util.concurrent.ThreadFactory;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicInteger;
 +
 +import com.jayway.awaitility.Awaitility;
 +import org.junit.experimental.categories.Category;
 +
 +import com.gemstone.gemfire.cache.AttributesFactory;
 +import com.gemstone.gemfire.cache.AttributesMutator;
 +import com.gemstone.gemfire.cache.Cache;
 +import com.gemstone.gemfire.cache.CacheClosedException;
 +import com.gemstone.gemfire.cache.CacheFactory;
 +import com.gemstone.gemfire.cache.CacheListener;
 +import com.gemstone.gemfire.cache.CacheTransactionManager;
 +import com.gemstone.gemfire.cache.DataPolicy;
 +import com.gemstone.gemfire.cache.DiskStore;
 +import com.gemstone.gemfire.cache.DiskStoreFactory;
 +import com.gemstone.gemfire.cache.EntryEvent;
 +import com.gemstone.gemfire.cache.PartitionAttributesFactory;
 +import com.gemstone.gemfire.cache.Region;
 +import com.gemstone.gemfire.cache.RegionAttributes;
 +import com.gemstone.gemfire.cache.RegionDestroyedException;
 +import com.gemstone.gemfire.cache.RegionFactory;
 +import com.gemstone.gemfire.cache.Scope;
  import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
  import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
  import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
@@@ -76,16 -29,10 +77,15 @@@ import com.gemstone.gemfire.cache.persi
  import com.gemstone.gemfire.cache.server.CacheServer;
  import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
  import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
 -import com.gemstone.gemfire.cache.wan.*;
 +import com.gemstone.gemfire.cache.wan.GatewayQueueEvent;
 +import com.gemstone.gemfire.cache.wan.GatewayReceiver;
 +import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
 +import com.gemstone.gemfire.cache.wan.GatewaySender;
  import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 +import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
 +import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
  import com.gemstone.gemfire.cache30.CacheTestCase;
  import com.gemstone.gemfire.distributed.Locator;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
  import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
  import com.gemstone.gemfire.distributed.internal.InternalLocator;
  import com.gemstone.gemfire.distributed.internal.ServerLocation;
@@@ -119,21 -56,21 +119,21 @@@ import com.gemstone.gemfire.internal.ca
  import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderQueue;
  import com.gemstone.gemfire.pdx.SimpleClass;
  import com.gemstone.gemfire.pdx.SimpleClass1;
 -import com.gemstone.gemfire.test.dunit.*;
 +import com.gemstone.gemfire.test.dunit.Assert;
 +import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 +import com.gemstone.gemfire.test.dunit.Host;
 +import com.gemstone.gemfire.test.dunit.IgnoredException;
 +import com.gemstone.gemfire.test.dunit.Invoke;
 +import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 +import com.gemstone.gemfire.test.dunit.VM;
 +import com.gemstone.gemfire.test.dunit.Wait;
 +import com.gemstone.gemfire.test.dunit.WaitCriterion;
 +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 +import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  import com.gemstone.gemfire.util.test.TestUtil;
 -import com.jayway.awaitility.Awaitility;
 -
 -import java.io.File;
 -import java.io.IOException;
 -import java.io.Serializable;
 -import java.net.InetSocketAddress;
 -import java.util.*;
 -import java.util.concurrent.*;
 -import java.util.concurrent.atomic.AtomicInteger;
  
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 -
 -public class WANTestBase extends DistributedTestCase{
 +@Category(DistributedTest.class)
- public class WANTestBase extends JUnit4DistributedTestCase{
++public class WANTestBase extends JUnit4DistributedTestCase {
  
    protected static Cache cache;
    protected static Region region;
@@@ -225,10 -155,10 +225,10 @@@
    }
  
    public static void createLocator(int dsId, int port, Set<String> localLocatorsList, Set<String> remoteLocatorsList){
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
      StringBuffer localLocatorBuffer = new StringBuffer(localLocatorsList.toString());
      localLocatorBuffer.deleteCharAt(0);
      localLocatorBuffer.deleteCharAt(localLocatorBuffer.lastIndexOf("]"));
@@@ -248,93 -178,93 +248,93 @@@
  
    public static Integer createFirstLocatorWithDSId(int dsId) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + port + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
      test.getSystem(props);
      return port;
    }
  
    public static Integer createFirstPeerLocator(int dsId) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + port + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
      test.getSystem(props);
      return port;
    }
  
    public static Integer createSecondLocator(int dsId, int locatorPort) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
      test.getSystem(props);
      return port;
    }
  
    public static Integer createSecondPeerLocator(int dsId, int locatorPort) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
      test.getSystem(props);
      return port;
    }
  
    public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
-     props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + port + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+     props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
      test.getSystem(props);
      return port;
    }
  
    public static void bringBackLocatorOnOldPort(int dsId, int remoteLocPort, int oldPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + oldPort + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + oldPort + "],server=true,peer=true,hostname-for-clients=localhost");
-     props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+     props.put(LOG_LEVEL, "fine");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + oldPort + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + oldPort + "],server=true,peer=true,hostname-for-clients=localhost");
+     props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
      test.getSystem(props);
    }
  
  
    public static Integer createFirstRemotePeerLocator(int dsId, int remoteLocPort) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
-     props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + port + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+     props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
      test.getSystem(props);
      return port;
    }
@@@ -342,14 -272,14 +342,14 @@@
    public static Integer createSecondRemoteLocator(int dsId, int localPort,
        int remoteLocPort) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localPort + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
-     props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + localPort + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+     props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
      test.getSystem(props);
      return port;
    }
@@@ -357,14 -287,14 +357,14 @@@
    public static Integer createSecondRemotePeerLocator(int dsId, int localPort,
        int remoteLocPort) {
      stopOldLocator();
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
-     props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localPort + "]");
-     props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
-     props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+     props.setProperty(LOCATORS, "localhost[" + localPort + "]");
+     props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+     props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
      test.getSystem(props);
      return port;
    }
@@@ -916,26 -846,26 +916,26 @@@
    }
  
    public static void createCacheConserveSockets(Boolean conserveSockets,Integer locPort){
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
-     props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, conserveSockets.toString());
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort + "]");
+     props.setProperty(CONSERVE_SOCKETS, conserveSockets.toString());
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);
    }
  
    protected static void createCache(boolean management, Integer locPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
      if (management) {
-       props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-       props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
-       props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
-       props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+       props.setProperty(JMX_MANAGER, "true");
+       props.setProperty(JMX_MANAGER_START, "false");
+       props.setProperty(JMX_MANAGER_PORT, "0");
+       props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
      }
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);
    }
@@@ -973,10 -903,10 +973,10 @@@
    }
  
    public static void createCache_PDX(Integer locPort){
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      CacheConfig cacheConfig = new CacheConfig();
      cacheConfig.setPdxPersistent(true);
@@@ -990,19 -920,19 +990,19 @@@
    }
  
    public static void createCache(Integer locPort1, Integer locPort2){
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort1
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort1
          + "],localhost[" + locPort2 + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);
    }
  
    public static void createCacheWithoutLocator(Integer mCastPort){
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, ""+mCastPort);
+     props.setProperty(MCAST_PORT, "" + mCastPort);
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);
    }
@@@ -2004,11 -1933,11 +2003,11 @@@
    }
  
    public static void createReceiverWithBindAddress(int locPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+     props.setProperty(LOCATORS, "localhost[" + locPort
          + "]");
  
      InternalDistributedSystem ds = test.getSystem(props);
@@@ -2082,10 -2011,10 +2081,10 @@@
    }
  
    public static void createReceiverAndServer(int locPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort
          + "]");
  
      InternalDistributedSystem ds = test.getSystem(props);
@@@ -2116,10 -2045,10 +2115,10 @@@
    }
  
    public static int createServer(int locPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort
          + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);
@@@ -2138,10 -2067,10 +2137,10 @@@
  
    public static void createClientWithLocator(int port0,String host,
        String regionName) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty("mcast-port", "0");
-     props.setProperty("locators", "");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "");
  
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);
@@@ -2172,10 -2101,10 +2171,10 @@@
    }
  
    public static int createReceiver_PDX(int locPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      CacheConfig cacheConfig = new CacheConfig();
      File pdxDir = new File(CacheTestCase.getDiskDir(), "pdx");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 21b78c3,6c7379f..37d061a
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@@ -16,29 -16,22 +16,22 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.disttx;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 +
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import org.junit.Ignore;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
 +
+ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
  import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
  import com.gemstone.gemfire.test.dunit.Invoke;
  import com.gemstone.gemfire.test.dunit.LogWriterUtils;
  import com.gemstone.gemfire.test.dunit.SerializableCallable;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 -
 +@Category(DistributedTest.class)
  public class DistTXWANDUnitTest extends WANTestBase {
  
--  private static final long serialVersionUID = 1L;
--
-   public DistTXWANDUnitTest() {
-     super();
 -  public DistTXWANDUnitTest(String name) {
 -    super(name);
--  }
--
    @Override
    protected final void postSetUpWANTestBase() throws Exception {
      Invoke.invokeInEveryVM(new SerializableCallable() {
@@@ -50,14 -43,14 +43,14 @@@
      }); 
    }
  
--  /*
++  /**
     * Disabled because it hangs with current implementation of notifying
     * adjunct receivers by sending DistTXAdjunctCommitMessage from primary at the
     * time of commit.
     */
--  public void DISABLED_testPartitionedSerialPropagation_SenderSameAsCoordinator() throws Exception {
--
--    
++  @Ignore("TODO: test is disabled")
++  @Test
++  public void testPartitionedSerialPropagation_SenderSameAsCoordinator() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
@@@ -94,10 -87,9 +87,8 @@@
          getTestMethodName() + "_PR", 50 ));
    }
  
 +  @Test
    public void testPartitionedSerialPropagation_SenderNotSameAsCoordinator() throws Exception {
--
--    
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
@@@ -134,8 -126,7 +125,7 @@@
          getTestMethodName() + "_PR", 50 ));
    }
  
--  
 +  @Test
    public void testPartitionedRegionParallelPropagation() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -189,10 -180,9 +179,4 @@@
      vm2.invoke(() -> WANTestBase.validateRegionSize(
          getTestMethodName() + "_PR", 5 ));
    }
--
-   @Test
--  public void testDummy() {
--  }
--  
  }
--

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index 7b425ed,9e94a5e..541e5a3
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@@ -16,45 -16,33 +16,35 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.misc;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
- 
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import static com.gemstone.gemfire.test.dunit.Assert.*;
 +
 +import java.util.Properties;
 +
- import com.gemstone.gemfire.internal.logging.LogService;
- import com.gemstone.gemfire.security.AuthInitialize;
- import com.gemstone.gemfire.security.AuthenticationFailedException;
- import com.gemstone.gemfire.security.SecurityTestUtils;
- import com.gemstone.gemfire.security.generator.CredentialGenerator;
++import org.apache.logging.log4j.Logger;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
 +
  import com.gemstone.gemfire.cache.CacheFactory;
  import com.gemstone.gemfire.distributed.DistributedMember;
  import com.gemstone.gemfire.distributed.DistributedSystem;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
  import com.gemstone.gemfire.internal.Assert;
  import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
- 
+ import com.gemstone.gemfire.internal.logging.LogService;
+ import com.gemstone.gemfire.security.AuthInitialize;
+ import com.gemstone.gemfire.security.AuthenticationFailedException;
+ import com.gemstone.gemfire.security.SecurityTestUtils;
+ import com.gemstone.gemfire.security.generator.CredentialGenerator;
  import com.gemstone.gemfire.security.generator.DummyCredentialGenerator;
  import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
- 
--import org.apache.logging.log4j.Logger;
 -
 -import java.util.Properties;
 -
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
 +@Category(DistributedTest.class)
  public class NewWanAuthenticationDUnitTest extends WANTestBase {
  
--  private static final long serialVersionUID = 1L;
--
    public static final Logger logger = LogService.getLogger();
  
-   public NewWanAuthenticationDUnitTest() {
-     super();
 -  public NewWanAuthenticationDUnitTest(String name) {
 -    super(name);
--  }
++  public static boolean isDifferentServerInGetCredentialCall = false;
  
    /**
     * Authentication test for new WAN with valid credentials. Although, nothing
@@@ -118,7 -105,7 +108,6 @@@
      vm2.invoke(() -> WANTestBase.startSender( "ln" ));
      vm2.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
      logger.info("Done successfully.");
--
    }
  
    /**
@@@ -188,7 -174,7 +177,7 @@@
        fail("Authentication Failed: While starting the sender, an exception should have been thrown");
      } catch (Exception e) {
        if (!(e.getCause().getCause() instanceof AuthenticationFailedException)) {
--        fail("Authentication is not working as expected");
++        fail("Authentication is not working as expected", e);
        }
      }
    }
@@@ -196,7 -182,7 +185,6 @@@
    private static Properties buildProperties(String clientauthenticator,
                                              String clientAuthInit, String accessor, Properties extraAuthProps,
                                              Properties extraAuthzProps) {
--
      Properties authProps = new Properties();
      if (clientauthenticator != null) {
        authProps.setProperty(
@@@ -235,11 -220,11 +222,12 @@@
      assertNotNull(cache);
    }
  
--  public static boolean isDifferentServerInGetCredentialCall = false;
    public static class UserPasswdAI extends UserPasswordAuthInit {
++
      public static AuthInitialize createAI() {
        return new UserPasswdAI();
      }
++
      @Override
      public Properties getCredentials(Properties props,
                                       DistributedMember server, boolean isPeer)
@@@ -316,7 -300,7 +304,6 @@@
  
        vm2.invoke(() -> verifyDifferentServerInGetCredentialCall());
        vm3.invoke(() -> verifyDifferentServerInGetCredentialCall());
--
      }
    }
  }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 006c19d,09703d6..4c1746a
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@@ -16,25 -16,6 +16,22 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.misc;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
- 
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import static com.gemstone.gemfire.test.dunit.Assert.*;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +import java.util.ArrayList;
 +import java.util.Properties;
 +import java.util.zip.Adler32;
 +import java.util.zip.CheckedInputStream;
 +import java.util.zip.CheckedOutputStream;
 +
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
  import com.gemstone.gemfire.cache.CacheFactory;
  import com.gemstone.gemfire.cache.DiskStore;
  import com.gemstone.gemfire.cache.DiskStoreFactory;
@@@ -48,17 -28,28 +44,12 @@@ import com.gemstone.gemfire.internal.Av
  import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
  import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
  import com.gemstone.gemfire.test.dunit.VM;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
 -import java.io.File;
 -import java.io.IOException;
 -import java.io.InputStream;
 -import java.io.OutputStream;
 -import java.util.ArrayList;
 -import java.util.Properties;
 -import java.util.zip.Adler32;
 -import java.util.zip.CheckedInputStream;
 -import java.util.zip.CheckedOutputStream;
 -
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
 -
 +@Category(DistributedTest.class)
  public class SenderWithTransportFilterDUnitTest extends WANTestBase {
  
--  private static final long serialVersionUID = 1L;
--
-   public SenderWithTransportFilterDUnitTest() {
-     super();
 -  public SenderWithTransportFilterDUnitTest(String name) {
 -    super(name);
--  }
--
 +  @Test
    public void testSerialSenderWithTansportFilter() {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
  
@@@ -111,10 -101,10 +102,10 @@@
    }
    
    public static int createReceiverWithTransportFilters(int locPort) {
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + locPort
          + "]");
  
      InternalDistributedSystem ds = test.getSystem(props);
@@@ -135,9 -125,9 +126,7 @@@
        receiver.start();
      }
      catch (IOException e) {
--      e.printStackTrace();
--      fail("Test " + test.getName()
--          + " failed to start GatewayRecevier on port " + port);
++      fail("Test " + test.getName() + " failed to start GatewayRecevier on port " + port, e);
      }
      return port;
    }
@@@ -216,24 -206,24 +205,24 @@@
      public CheckSumTranportFilter(String name){
        this.name = name;
      }
--    
++
++    @Override
      public String toString(){
        return this.name;
      }
++
++    @Override
      public InputStream getInputStream(InputStream stream) {
        return new CheckedInputStream(stream, checker);
--      // return new ZipInputStream(stream);
      }
  
++    @Override
      public OutputStream getOutputStream(OutputStream stream) {
        return new CheckedOutputStream(stream, checker);
--      // return new ZipOutputStream(stream);
      }
  
++    @Override
      public void close() {
--      // TODO Auto-generated method stub
      }
--
    }
--  
  }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 2b22093,3d7d2d2..3435d5d
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@@ -16,21 -16,8 +16,17 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.misc;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
- 
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
++import static com.gemstone.gemfire.test.dunit.Assert.*;
 +
 +import java.io.IOException;
 +import java.util.Properties;
 +
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
  import com.gemstone.gemfire.cache.Cache;
  import com.gemstone.gemfire.cache.CacheFactory;
- import com.gemstone.gemfire.cache.client.ClientCache;
  import com.gemstone.gemfire.cache.client.ClientCacheFactory;
  import com.gemstone.gemfire.cache.client.PoolManager;
  import com.gemstone.gemfire.cache.client.internal.Connection;
@@@ -47,16 -33,20 +42,13 @@@ import com.gemstone.gemfire.internal.ca
  import com.gemstone.gemfire.test.dunit.Assert;
  import com.gemstone.gemfire.test.dunit.Host;
  import com.gemstone.gemfire.test.dunit.LogWriterUtils;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
 -import java.io.IOException;
 -import java.util.Properties;
 -
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 -
 +@Category(DistributedTest.class)
  public class WANLocatorServerDUnitTest extends WANTestBase {
  
    static PoolImpl proxy;
  
-   public WANLocatorServerDUnitTest() {
-     super();
 -  public WANLocatorServerDUnitTest(String name) {
 -    super(name);
--  }
--
    @Override
    protected final void postSetUpWANTestBase() throws Exception {
      final Host host = Host.getHost(0);
@@@ -99,7 -88,7 +91,6 @@@
          port1, port2, port3, port3 ));
  
      vm5.invoke(() -> WANLocatorServerDUnitTest.tryNewConnection());
--
    }
  
    public static void createLocator(Integer port1, Integer port2, Integer port3,
@@@ -135,9 -124,9 +126,7 @@@
        receiver.start();
      }
      catch (IOException e) {
--      e.printStackTrace();
--      fail("Test " + test.getName()
--          + " failed to start GatewayRecevier on port " + port);
++      fail("Test " + test.getName() + " failed to start GatewayRecevier on port " + port, e);
      }
    }
  
@@@ -157,9 -146,9 +146,7 @@@
        server.start();
      }
      catch (IOException e) {
--      e.printStackTrace();
--      fail("Test " + test.getName() + " failed to start CacheServer on port "
--          + port);
++      fail("Test " + test.getName() + " failed to start CacheServer on port " + port, e);
      }
      LogWriterUtils.getLogWriter().info(
          "Server Started on port : " + port + " : server : " + server);
@@@ -188,7 -177,7 +175,7 @@@
        con1.close(true);
      }
      catch (Exception e) {
--      e.printStackTrace();
++      fail("createClient failed", e);
      }
    }
  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 432de87,4be960b..cda5ba3
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@@ -16,40 -16,26 +16,31 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.parallel;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
- 
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
++import static com.gemstone.gemfire.test.dunit.Assert.*;
 +
++import org.junit.Test;
 +import org.junit.experimental.categories.Category;
 +
  import com.gemstone.gemfire.GemFireIOException;
+ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
  import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
  import com.gemstone.gemfire.internal.cache.tier.sockets.MessageTooLargeException;
  import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
  import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
  import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 -import com.gemstone.gemfire.test.dunit.*;
 +import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 +import com.gemstone.gemfire.test.dunit.IgnoredException;
 +import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 +import com.gemstone.gemfire.test.dunit.RMIException;
 +import com.gemstone.gemfire.test.dunit.Wait;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 -import org.junit.experimental.categories.Category;
  
  /**
   * DUnit test for operations on ParallelGatewaySender
   */
 +@Category(DistributedTest.class)
  public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
--  private static final long serialVersionUID = 1L;
--  
-   public ParallelGatewaySenderOperationsDUnitTest() {
-     super();
 -  public ParallelGatewaySenderOperationsDUnitTest(String name) {
 -    super(name);
--  }
  
    @Override
    protected final void postSetUpWANTestBase() throws Exception {
@@@ -98,12 -82,11 +89,10 @@@
      validateRegionSizes(getTestMethodName() + "_PR", 10, vm2, vm3);
    }
  
--  
    /**
     * Normal scenario in which the sender is paused in between.
--   * @throws Exception
     */
 +  @Test
    public void testParallelPropagationSenderPause() throws Exception {
      Integer[] locatorPorts = createLNAndNYLocators();
      Integer lnPort = locatorPorts[0];
@@@ -132,9 -115,8 +121,8 @@@
  
    /**
     * Normal scenario in which a paused sender is resumed.
--   * @throws Exception
     */
 +  @Test
    public void testParallelPropagationSenderResume() throws Exception {
      Integer[] locatorPorts = createLNAndNYLocators();
      Integer lnPort = locatorPorts[0];
@@@ -169,17 -151,16 +157,14 @@@
      
      //find the region size on remote vm
      vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 1000 ));
-- 
    }
  
    /**
     * Negative scenario in which a sender that is stopped (and not paused) is resumed.
     * Expected: resume is only valid for pause. If a sender which is stopped is resumed,
     * it will not be started again.
--   * 
--   * @throws Exception
     */
 +  @Test
    public void testParallelPropagationSenderResumeNegativeScenario() throws Exception {
      Integer[] locatorPorts = createLNAndNYLocators();
      Integer lnPort = locatorPorts[0];
@@@ -235,9 -216,8 +220,8 @@@
  
    /**
     * Normal scenario in which a sender is stopped.
--   * @throws Exception
     */
 +  @Test
    public void testParallelPropagationSenderStop() throws Exception {
      IgnoredException.addIgnoredException("Broken pipe");
      Integer[] locatorPorts = createLNAndNYLocators();
@@@ -264,10 -244,9 +248,9 @@@
  
    /**
     * Normal scenario in which a sender is stopped and then started again.
--   * @throws Exception
     */
    @Category(FlakyTest.class) // GEODE-933: thread sleeps, random ports, async actions, time sensitive
 +  @Test
    public void testParallelPropagationSenderStartAfterStop() throws Exception {
      IgnoredException.addIgnoredException("Broken pipe");
      Integer[] locatorPorts = createLNAndNYLocators();
@@@ -321,9 -300,8 +304,8 @@@
     * Normal scenario in which a sender is stopped and then started again.
     * Differs from above test case in the way that when the sender is starting from
     * stopped state, puts are simultaneously happening on the region by another thread.
--   * @throws Exception
     */
 +  @Test
    public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception {
      IgnoredException.addIgnoredException("Broken pipe");
      Integer[] locatorPorts = createLNAndNYLocators();
@@@ -378,9 -358,8 +362,8 @@@
    
    /**
     * Normal scenario in which a sender is stopped and then started again on accessor node.
--   * @throws Exception
     */
 +  @Test
    public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws Exception {
      IgnoredException.addIgnoredException("Broken pipe");
      IgnoredException.addIgnoredException("Connection reset");
@@@ -483,8 -461,8 +466,7 @@@
      try {
        inv1.join();
      } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail("Interrupted the async invocation.");
++      fail("Interrupted the async invocation.", e);
      }
      
      //verify all buckets drained on all sender nodes.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index deb60d1,899528a..275d685
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@@ -16,26 -16,7 +16,23 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.parallel;
  
- import org.junit.Ignore;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
 -import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 +import static org.junit.Assert.*;
 +
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
- 
 +import java.io.File;
 +import java.util.Properties;
 +import java.util.Set;
 +
++import org.junit.Ignore;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
 +import com.gemstone.gemfire.cache.AttributesFactory;
 +import com.gemstone.gemfire.cache.CacheFactory;
 +import com.gemstone.gemfire.cache.DataPolicy;
 +import com.gemstone.gemfire.cache.DiskStore;
 +import com.gemstone.gemfire.cache.DiskStoreFactory;
 +import com.gemstone.gemfire.cache.Region;
  import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
  import com.gemstone.gemfire.cache.wan.GatewaySender;
  import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
@@@ -52,22 -32,27 +48,15 @@@ import com.gemstone.gemfire.test.dunit.
  import com.gemstone.gemfire.test.dunit.LogWriterUtils;
  import com.gemstone.gemfire.test.dunit.VM;
  import com.gemstone.gemfire.test.dunit.Wait;
 -
 -import java.io.File;
 -import java.util.Properties;
 -import java.util.Set;
 -
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
  /**
   * DUnit for ParallelSenderQueue overflow operations.
-- * 
-- *
   */
 +@Category(DistributedTest.class)
  public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
  
--  private static final long serialVersionUID = 1L;
--  
-   public ParallelGatewaySenderQueueOverflowDUnitTest() {
-     super();
 -  public ParallelGatewaySenderQueueOverflowDUnitTest(String name) {
 -    super(name);
--  }
--  
 +  @Test
    public void testParallelSenderQueueEventsOverflow_NoDiskStoreSpecified() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -141,12 -126,10 +130,10 @@@
    
    /**
     * Keep same max memory limit for all the VMs
--   *   
--   * @throws Exception
     */
-   @Ignore("TODO")
 -  public void _testParallelSenderQueueEventsOverflow() throws Exception {
++  @Ignore("TODO: test is disabled")
 +  @Test
 +  public void testParallelSenderQueueEventsOverflow() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
@@@ -224,12 -207,10 +211,10 @@@
    /**
     * Set a different memory limit for each VM and make sure that all the VMs are utilized to
     * full extent of available memory.
--   * 
--   * @throws Exception
     */
-   @Ignore("TODO")
 -  public void _testParallelSenderQueueEventsOverflow_2() throws Exception {
++  @Ignore("TODO: test is disabled")
 +  @Test
 +  public void testParallelSenderQueueEventsOverflow_2() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
@@@ -310,9 -291,7 +295,9 @@@
      vm3.invoke(() -> WANTestBase.validateRegionSize( getTestMethodName(), 50 ));
    }
  
-   @Ignore("TODO")
 -  public void _testParallelSenderQueueNoEventsOverflow() throws Exception {
++  @Ignore("TODO: test is disabled")
 +  @Test
 +  public void testParallelSenderQueueNoEventsOverflow() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
@@@ -391,17 -370,15 +376,17 @@@
     * Test to validate that ParallelGatewaySenderQueue diskSynchronous attribute
     * when persistence of sender is enabled. 
     */
-   @Ignore("TODO")
 -  public void _test_ValidateParallelGatewaySenderQueueAttributes_1() {
++  @Ignore("TODO: test is disabled")
 +  @Test
 +  public void test_ValidateParallelGatewaySenderQueueAttributes_1() {
      Integer localLocPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      
      Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
      
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + localLocPort + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);  
  
@@@ -456,17 -433,15 +441,17 @@@
     * Test to validate that ParallelGatewaySenderQueue diskSynchronous attribute
     * when persistence of sender is not enabled. 
     */
-   @Ignore("TODO")
 -  public void _test_ValidateParallelGatewaySenderQueueAttributes_2() {
++  @Ignore("TODO: test is disabled")
 +  @Test
 +  public void test_ValidateParallelGatewaySenderQueueAttributes_2() {
      Integer localLocPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      
      Integer remoteLocPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, localLocPort ));
      
 -    WANTestBase test = new WANTestBase(getTestMethodName());
 +    WANTestBase test = new WANTestBase();
      Properties props = test.getDistributedSystemProperties();
-     props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-     props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");
+     props.setProperty(MCAST_PORT, "0");
+     props.setProperty(LOCATORS, "localhost[" + localLocPort + "]");
      InternalDistributedSystem ds = test.getSystem(props);
      cache = CacheFactory.create(ds);  
  
@@@ -506,6 -481,6 +491,4 @@@
        ex.remove();
      }
    }
--
--
  }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index ea2e517,6b33b69..edcfa78
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@@ -16,30 -16,10 +16,27 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.serial;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
 -import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 +import static org.junit.Assert.*;
 +
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
- 
 +import java.io.File;
 +import java.util.HashMap;
 +import java.util.List;
 +import java.util.Properties;
 +import java.util.Set;
 +
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
 +import com.gemstone.gemfire.cache.AttributesFactory;
 +import com.gemstone.gemfire.cache.CacheFactory;
 +import com.gemstone.gemfire.cache.DataPolicy;
 +import com.gemstone.gemfire.cache.DiskStore;
 +import com.gemstone.gemfire.cache.DiskStoreFactory;
 +import com.gemstone.gemfire.cache.Region;
- import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
  import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
  import com.gemstone.gemfire.cache.wan.GatewaySender;
+ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
  import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
  import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
  import com.gemstone.gemfire.cache30.MyGatewayEventFilter1;
@@@ -53,18 -32,25 +49,12 @@@ import com.gemstone.gemfire.internal.ca
  import com.gemstone.gemfire.test.dunit.IgnoredException;
  import com.gemstone.gemfire.test.dunit.VM;
  import com.gemstone.gemfire.test.dunit.Wait;
- 
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
 -import java.io.File;
 -import java.util.HashMap;
 -import java.util.List;
 -import java.util.Properties;
 -import java.util.Set;
 -
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
 -
 -
 -public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
 -
 -  private static final long serialVersionUID = 1L;
 -
 -  public SerialGatewaySenderQueueDUnitTest(String name) {
 -    super(name);
 -  }
 +@Category(DistributedTest.class)
- public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
- 
-   private static final long serialVersionUID = 1L;
- 
-   public SerialGatewaySenderQueueDUnitTest() {
-     super();
-   }
++public class SerialGatewaySenderQueueDUnitTest extends WANTestBase {
  
 +  @Test
    public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
  
@@@ -277,7 -261,7 +267,6 @@@
      } finally {
        exTKSender.remove();
      }
--
    }
    
    /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index ebb96d5,67d8816..7df9689
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@@ -16,42 -16,28 +16,33 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.serial;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
 +import static org.junit.Assert.*;
 +
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
- 
 +import java.io.IOException;
 +import java.util.Map;
 +
++import org.junit.Ignore;
++import org.junit.Test;
 +import org.junit.experimental.categories.Category;
 +
  import com.gemstone.gemfire.cache.CacheException;
  import com.gemstone.gemfire.cache.EntryExistsException;
  import com.gemstone.gemfire.cache.client.ServerOperationException;
  import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
  import com.gemstone.gemfire.internal.cache.wan.BatchException70;
  import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 -import com.gemstone.gemfire.test.dunit.*;
 +import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 +import com.gemstone.gemfire.test.dunit.IgnoredException;
 +import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 +import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 +import com.gemstone.gemfire.test.dunit.Wait;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 -import org.junit.experimental.categories.Category;
 -
 -import java.io.IOException;
 -import java.util.Map;
  
 +@Category(DistributedTest.class)
  public class SerialWANPropogationDUnitTest extends WANTestBase {
  
--  private static final long serialVersionUID = 1L;
--
-   public SerialWANPropogationDUnitTest() {
-     super();
 -  public SerialWANPropogationDUnitTest(String name) {
 -    super(name);
--  }
--
    @Override
    public final void postSetUpWANTestBase() throws Exception {
      IgnoredException.addIgnoredException("Connection reset");
@@@ -60,10 -46,10 +51,14 @@@
      IgnoredException.addIgnoredException("could not get remote locator information");
      IgnoredException.addIgnoredException("Unexpected IOException");
    }
--  
--  // this test is disabled due to a high rate of failure in unit test runs
--  // see ticket #52190
--  public void disabledtestReplicatedSerialPropagation_withoutRemoteLocator() throws Exception {
++
++  /**
++   * this test is disabled due to a high rate of failure in unit test runs
++   * see ticket #52190
++   */
++  @Ignore("TODO: test is disabled because of #52190")
++  @Test
++  public void testReplicatedSerialPropagation_withoutRemoteLocator() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
  
      createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
@@@ -159,10 -144,9 +154,8 @@@
    
    /**
     * Added to reproduce the bug #46595
--   * 
--   * @throws Exception
     */
 +  @Test
    public void testReplicatedSerialPropagationWithoutRemoteSite_defect46595()
        throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@@ -204,8 -188,8 +197,6 @@@
      vm2.invoke(() -> WANTestBase.createReceiver());
      vm3.invoke(() -> WANTestBase.createReceiver());
  
--
--
      vm4.invoke(() -> WANTestBase.validateRegionSize(
          getTestMethodName() + "_RR", 10000 ));
  
@@@ -213,10 -197,9 +204,9 @@@
          getTestMethodName() + "_RR", 10000 ));
      vm3.invoke(() -> WANTestBase.validateRegionSize(
          getTestMethodName() + "_RR", 10000 ));
--
    }
  
 +  @Test
    public void testReplicatedSerialPropagation() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -328,10 -310,9 +318,8 @@@
     * Two regions configured with the same sender and put is in progress 
     * on both the regions.
     * One of the two regions is destroyed in the middle.
--   * 
--   * @throws Exception
     */
 +  @Test
    public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -391,12 -372,12 +379,8 @@@
      //destroy RR_2 after above puts are complete
      vm4.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_2"));
      
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++    inv1.join();
++
      //vm4.invoke(() -> WANTestBase.verifyQueueSize( "ln", 0 ));
      vm2.invoke(() -> WANTestBase.validateRegionSize(
          getTestMethodName() + "_RR_1", 1000 ));
@@@ -408,10 -389,9 +392,8 @@@
     * 1 region and sender configured on local site and 1 region and a 
     * receiver configured on remote site. Puts to the local region are in progress.
     * Remote region is destroyed in the middle.
--   * 
--   * @throws Exception
     */
 +  @Test
    public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -455,13 -435,13 +437,8 @@@
      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
      //destroy RR_1 in remote site
      vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName() + "_RR_1"));
--    
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++
++    inv1.join();
  
      //verify that all is well in local site. All the events should be present in local region
      vm4.invoke(() -> WANTestBase.validateRegionSize(
@@@ -477,10 -457,9 +454,8 @@@
     * Two regions configured in local with the same sender and put is in progress 
     * on both the regions. Same two regions are configured on remote site as well.
     * One of the two regions is destroyed in the middle on remote site.
--   * 
--   * @throws Exception
     */
 +  @Test
    public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -544,21 -523,20 +519,16 @@@
      
      //start puts in RR_1 in another thread
      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
--   
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++
++    inv1.join();
++
      //though region RR_2 is destroyed, RR_1 should still get all the events put in it 
      //in local site
      vm2.invoke(() -> WANTestBase.validateRegionSize(
          getTestMethodName() + "_RR_1", 1000 ));
--
    }
  
 +  @Test
    public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
        throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@@ -622,13 -600,13 +592,9 @@@
      vm2.invoke(() -> WANTestBase.destroyRegion( getTestMethodName()
          + "_RR_2" ));
  
--    try {
--      inv1.join();
--      inv2.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++    inv1.join();
++    inv2.join();
++
      // though region RR_2 is destroyed, RR_1 should still get all the events put
      // in it
      // in local site
@@@ -652,17 -630,16 +618,14 @@@
          }
        });
      }
--
    }
    
    /**
     * one region and sender configured on local site and the same region and a 
     * receiver configured on remote site. Puts to the local region are in progress.
     * Receiver on remote site is stopped in the middle by closing remote site cache.
--   * 
--   * @throws Exception
     */
 +  @Test
    public void testReplicatedSerialPropagationWithRemoteReceiverStopped() throws Exception {
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
@@@ -684,8 -661,8 +647,6 @@@
      //create one RR (RR_1) on remote site
      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
          getTestMethodName() + "_RR_1", null, isOffHeap()  ));
--    //vm3.invoke(() -> WANTestBase.createReplicatedRegion(
--    //    testName + "_RR_1", null, isOffHeap()  ));
  
      //start the senders on local site
      startSenderInVMs("ln", vm4, vm5);
@@@ -704,14 -681,14 +665,8 @@@
      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 500 ));
      //close cache in remote site. This will automatically kill the remote receivers.
      vm2.invoke(() -> WANTestBase.closeCache());
--    //vm3.invoke(() -> WANTestBase.closeCache());
--    
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++
++    inv1.join();
  
      //verify that all is well in local site
      vm4.invoke(() -> WANTestBase.validateRegionSize(
@@@ -756,14 -732,14 +711,8 @@@
      // receivers.
      Wait.pause(2000);
      vm2.invoke(() -> WANTestBase.closeCache());
--    // vm3.invoke(() -> WANTestBase.closeCache());
  
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++    inv1.join();
      
      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
  
@@@ -771,9 -747,9 +720,6 @@@
      vm4.invoke(() -> WANTestBase.validateRegionSize(
          getTestMethodName() + "_RR_1", 8000 ));
  
--//    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
--//        new Object[] { "ln" });
--
      createCacheInVMs(nyPort, vm2);
      vm2.invoke(() -> WANTestBase.createReplicatedRegion(
          getTestMethodName() + "_RR_1", null, isOffHeap()  ));
@@@ -813,14 -788,14 +759,12 @@@
      // create one RR (RR_1) on local site
      vm4.invoke(() -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR_1", "ln", isOffHeap()));
  
--    
      // start puts in RR_1 in another thread
      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
      // close cache in remote site. This will automatically kill the remote
      // receivers.
      vm2.invoke(() -> WANTestBase.closeCache());
  
--
      inv1.join();
  
      // verify that all is well in local site
@@@ -876,14 -850,14 +820,9 @@@
      Wait.pause(2000);
      vm1.invoke(() -> WANTestBase.shutdownLocator());
      vm2.invoke(() -> WANTestBase.closeCache());
--    // vm3.invoke(() -> WANTestBase.closeCache());
  
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++    inv1.join();
++
      // Do some extra puts after cache close so that some events are in the queue.
      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
  
@@@ -950,14 -923,14 +889,9 @@@
      Wait.pause(2000);
      vm1.invoke(() -> WANTestBase.shutdownLocator());
      vm2.invoke(() -> WANTestBase.closeCache());
--    // vm3.invoke(() -> WANTestBase.closeCache());
  
--    try {
--      inv1.join();
--    } catch (InterruptedException e) {
--      e.printStackTrace();
--      fail();
--    }
++    inv1.join();
++
      vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 1000 ));
      // verify that all is well in local site
      vm4.invoke(() -> WANTestBase.validateRegionSize(
@@@ -970,7 -943,7 +904,6 @@@
        getTestMethodName() + "_RR_1", null, isOffHeap()  ));
      vm6.invoke(() -> WANTestBase.createReceiver());
  
--
      vm4.invoke(() -> WANTestBase.validateQueueContents( "ln",
          0 ));
  
@@@ -1008,8 -980,8 +941,6 @@@
      // start the senders on local site
      vm4.invoke(() -> WANTestBase.startSender("ln"));
  
--
--
      // start puts in RR_1 in another thread
      AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_RR_1", 8000 ));
      // close cache in remote site. This will automatically kill the remote
@@@ -1034,9 -1006,8 +965,8 @@@
      vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR_1", 8000));
    }
    
 +  @Test
    public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
--
      Integer lnPort = createFirstLocatorWithDSId(1);
      Integer nyPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
      Integer tkPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 3, lnPort ));
@@@ -1084,9 -1055,8 +1014,8 @@@
          getTestMethodName() + "_RR", 1000 ));
    }
  
 +  @Test
    public void testReplicatedSerialPropagationHA() throws Exception {
--
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
      Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
@@@ -1131,12 -1101,12 +1060,13 @@@
     * Remote site:: vm2, vm3, vm6, vm7: All hosting receivers
     * 
     * vm4 is killed, so vm5 takes primary charge
--   * 
--   * @throws Exception
++   *
++   * SUR: disabling due to connection information not available in open source
++   * enable this once in closed source
     */
--  // commenting due to connection information not available in open source
--  // enable this once in closed source
--  public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
++  @Ignore("TODO: test is disabled")
++  @Test
++  public void testReplicatedSerialPropagationHA_ReceiverAffinity()
        throws Exception {
  
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@@ -1210,12 -1180,12 +1140,13 @@@
     * 
     * vm4 is killed, so vm5 takes primary charge. vm4 brought up. vm5 is killed,
     * so vm4 takes primary charge again.
--   * 
--   * @throws Exception
++   *
++   * SUR: commenting due to connection information not available in open source
++   * enable this once in closed source
     */
--  // commenting due to connection information not available in open source
--  // enable this once in closed source
--  public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
++  @Ignore("TODO: test is disabled")
++  @Test
++  public void testReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
        throws Exception {
  
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@@ -1353,7 -1322,7 +1284,6 @@@
          getTestMethodName() + "_RR", 0 ));
      
      vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, 0, 0));
--    
    }
    
    /**
@@@ -1362,10 -1331,9 +1292,10 @@@
     * Site 1 (LN site): vm4, vm5, vm6, vm7
     * Site 2 (NY site): vm2, vm3
     */
 +  @Test
    public void testReplicatedSerialPropagationWithRemoteSenderConfiguredButNotStarted() {
--	Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
--	Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
++    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
++    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
  
      createCacheInVMs(nyPort, vm2, vm3);
      createReceiverInVMs(vm2, vm3);
@@@ -1373,7 -1341,7 +1303,6 @@@
      createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
      createReceiverInVMs(vm4, vm5);
  
--
      vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
          false, 100, 10, false, false, null, true ));
      vm5.invoke(() -> WANTestBase.createSender( "ln", 2,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
index 5e51d32,02bd845..f67639b
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
@@@ -70,15 -61,14 +72,15 @@@ public class SerialWANPropogationsFeatu
          getTestMethodName() + "_RR", "ln", isOffHeap()  ));
  
      vm4.invoke(() -> WANTestBase.doHeavyPuts(
-         getTestMethodName() + "_RR", 120 ));
+         getTestMethodName() + "_RR", 15 ));
  
      vm2.invoke(() -> WANTestBase.validateRegionSize(
-         getTestMethodName() + "_RR", 120, 240000 ));
+         getTestMethodName() + "_RR", 15, 240000 ));
      vm3.invoke(() -> WANTestBase.validateRegionSize(
-         getTestMethodName() + "_RR", 120, 240000 ));
+         getTestMethodName() + "_RR", 15, 240000 ));
    }
  
 +  @Test
    public void testSerialReplicatedWanWithPersistence() {
  
      Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
index 20fef80,8db28c4..6cc475e
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDUnitTest.java
@@@ -17,16 -17,8 +17,17 @@@
  
  package com.gemstone.gemfire.management.internal.cli.commands;
  
 +import org.junit.experimental.categories.Category;
 +import org.junit.Test;
 +
 +import static org.junit.Assert.*;
 +
 +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
 +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 +import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 +
  import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+ import com.gemstone.gemfire.test.junit.categories.SecurityTest;
  import com.gemstone.gemfire.test.junit.runner.SuiteRunner;
  
  import org.junit.ClassRule;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
index 3f1669b,a52f9ca..4c687f7
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
@@@ -16,38 -16,28 +16,29 @@@
   */
  package com.gemstone.gemfire.management.internal.cli.commands;
  
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
- 
- import static org.junit.Assert.*;
- 
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 -import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
 -import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 -import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
--import com.gemstone.gemfire.test.junit.categories.DistributedTest;
- 
 -import com.gemstone.gemfire.test.junit.categories.SecurityTest;
 -import org.junit.Ignore;
 -import org.junit.Test;
 -import org.junit.experimental.categories.Category;
 +import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
 +import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;
- import static com.gemstone.gemfire.test.dunit.Assert.*;
 +import static com.gemstone.gemfire.util.test.TestUtil.*;
++import static org.junit.Assert.*;
  
 +import java.io.File;
 +import java.util.Properties;
  import javax.net.ssl.HostnameVerifier;
  import javax.net.ssl.HttpsURLConnection;
  import javax.net.ssl.SSLSession;
 -import java.io.File;
 -import java.util.Properties;
  
 -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 -import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;
 -import static com.gemstone.gemfire.test.dunit.Assert.*;
 -import static com.gemstone.gemfire.util.test.TestUtil.getResourcePath;
++import org.junit.Ignore;
++import org.junit.Test;
++import org.junit.experimental.categories.Category;
++
 +import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
 +import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 +import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
 +import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 +import com.gemstone.gemfire.test.junit.categories.SecurityTest;
  
- import org.junit.Ignore;
- import org.junit.Test;
- import org.junit.experimental.categories.Category;
- 
  /**
-  * @since  8.1
+  * @since GemFire  8.1
   */
  @Category({ DistributedTest.class, SecurityTest.class })
  public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {
@@@ -207,7 -197,7 +198,7 @@@
      setUpJmxManagerOnVm0ThenConnect(localProps);
    }
  
--  @Ignore("disabled for unknown reason")
++  @Ignore("TODO: disabled for unknown reason")
    @Test
    public void testSSLWithCipherSuite() throws Exception {
      Properties localProps = new Properties();
@@@ -220,7 -210,7 +211,7 @@@
      //"https.cipherSuites" which is required to restrict cipher suite with HttpsURLConnection
      //Keeping the below code for further investigation on different Java versions ( 7 & 8) @TODO
      
--   /*SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
++    /*SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
      
      sslContext.init(null, null, new java.security.SecureRandom());
      String[] cipherSuites = sslContext.getSocketFactory().getSupportedCipherSuites();*/
@@@ -237,7 -227,7 +228,7 @@@
      setUpJmxManagerOnVm0ThenConnect(localProps);
    }
  
--  @Ignore("disabled for unknown reason")
++  @Ignore("TODO: disabled for unknown reason")
    @Test
    public void testSSLWithMultipleCipherSuite() throws Exception {
      System.setProperty("javax.net.debug", "ssl,handshake,failure");


Mime
View raw message