http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java ---------------------------------------------------------------------- diff --git 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 index 53e6cca..6e70d92 100644 --- 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,49 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan; -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.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.*; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; @@ -71,13 +29,8 @@ import com.gemstone.gemfire.cache.persistence.PartitionOfflineException; 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.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.*; 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; @@ -88,21 +41,11 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.FileUtil; import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; -import com.gemstone.gemfire.internal.cache.BucketRegion; -import com.gemstone.gemfire.internal.cache.CacheConfig; -import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.CustomerIDPartitionResolver; -import com.gemstone.gemfire.internal.cache.ForceReattemptException; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.RegionQueue; -import com.gemstone.gemfire.internal.cache.execute.data.CustId; +import com.gemstone.gemfire.internal.cache.*; +import com.gemstone.gemfire.internal.cache.execute.data.*; import com.gemstone.gemfire.internal.cache.execute.data.Customer; import com.gemstone.gemfire.internal.cache.execute.data.Order; -import com.gemstone.gemfire.internal.cache.execute.data.OrderId; import com.gemstone.gemfire.internal.cache.execute.data.Shipment; -import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId; import com.gemstone.gemfire.internal.cache.partitioned.PRLocallyDestroyedException; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; @@ -114,19 +57,20 @@ import com.gemstone.gemfire.internal.cache.wan.serial.ConcurrentSerialGatewaySen 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.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -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.*; 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.SystemConfigurationProperties.*; + public class WANTestBase extends DistributedTestCase{ protected static Cache cache; @@ -214,7 +158,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createLocator(int dsId, int port, Set<String> localLocatorsList, Set<String> remoteLocatorsList){ WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); StringBuffer localLocatorBuffer = new StringBuffer(localLocatorsList.toString()); localLocatorBuffer.deleteCharAt(0); @@ -222,8 +166,8 @@ public class WANTestBase extends DistributedTestCase{ String localLocator = localLocatorBuffer.toString(); localLocator = localLocator.replace(" ", ""); - props.setProperty(DistributionConfig.LOCATORS_NAME, localLocator); - props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); + props.setProperty(LOCATORS, localLocator); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); StringBuffer remoteLocatorBuffer = new StringBuffer(remoteLocatorsList.toString()); remoteLocatorBuffer.deleteCharAt(0); remoteLocatorBuffer.deleteCharAt(remoteLocatorBuffer.lastIndexOf("]")); @@ -238,10 +182,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); test.getSystem(props); return port; } @@ -251,10 +195,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost"); test.getSystem(props); return port; } @@ -264,10 +208,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + locatorPort + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); test.getSystem(props); return port; } @@ -277,10 +221,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + locatorPort + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost"); test.getSystem(props); return port; } @@ -290,10 +234,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); test.getSystem(props); return port; @@ -303,10 +247,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); props.put(DistributionConfig.LOG_LEVEL_NAME, "fine"); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + oldPort + "]"); + props.setProperty(START_LOCATOR, "localhost[" + oldPort + "],server=true,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); test.getSystem(props); } @@ -317,10 +261,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); test.getSystem(props); return port; @@ -332,10 +276,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + localPort + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); test.getSystem(props); return port; @@ -347,10 +291,10 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + localPort + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); test.getSystem(props); return port; @@ -905,8 +849,8 @@ public class WANTestBase extends DistributedTestCase{ public static void createCacheConserveSockets(Boolean conserveSockets,Integer locPort){ WANTestBase test = new WANTestBase(getTestMethodName()); 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 + "]"); props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, conserveSockets.toString()); InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); @@ -921,8 +865,8 @@ public class WANTestBase extends DistributedTestCase{ props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0"); props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "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); } @@ -950,8 +894,8 @@ public class WANTestBase extends DistributedTestCase{ TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/client.truststore")); gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME, "password"); - gemFireProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - gemFireProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); + gemFireProps.setProperty(MCAST_PORT, "0"); + gemFireProps.setProperty(LOCATORS, "localhost[" + locPort + "]"); LogWriterUtils.getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps); @@ -962,8 +906,8 @@ public class WANTestBase extends DistributedTestCase{ public static void createCache_PDX(Integer locPort){ WANTestBase test = new WANTestBase(getTestMethodName()); 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); @@ -979,8 +923,8 @@ public class WANTestBase extends DistributedTestCase{ public static void createCache(Integer locPort1, Integer locPort2){ WANTestBase test = new WANTestBase(getTestMethodName()); 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); @@ -989,7 +933,7 @@ public class WANTestBase extends DistributedTestCase{ public static void createCacheWithoutLocator(Integer mCastPort){ WANTestBase test = new WANTestBase(getTestMethodName()); 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); } @@ -1993,9 +1937,9 @@ public class WANTestBase extends DistributedTestCase{ public static void createReceiverWithBindAddress(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + props.setProperty(LOCATORS, "localhost[" + locPort + "]"); InternalDistributedSystem ds = test.getSystem(props); @@ -2044,8 +1988,8 @@ public class WANTestBase extends DistributedTestCase{ TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/cacheserver.truststore")); gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME, "password"); - gemFireProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - gemFireProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); + gemFireProps.setProperty(MCAST_PORT, "0"); + gemFireProps.setProperty(LOCATORS, "localhost[" + locPort + "]"); LogWriterUtils.getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps); @@ -2071,8 +2015,8 @@ public class WANTestBase extends DistributedTestCase{ public static void createReceiverAndServer(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); 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); @@ -2105,8 +2049,8 @@ public class WANTestBase extends DistributedTestCase{ public static int createServer(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); 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); @@ -2127,8 +2071,8 @@ public class WANTestBase extends DistributedTestCase{ String regionName) { WANTestBase test = new WANTestBase(getTestMethodName()); 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); @@ -2161,8 +2105,8 @@ public class WANTestBase extends DistributedTestCase{ public static int createReceiver_PDX(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); 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/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java index 315e9ca..27fb3c1 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java @@ -21,6 +21,7 @@ import com.gemstone.gemfire.cache.EntryExistsException; import com.gemstone.gemfire.cache.client.ServerOperationException; import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; 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.AsyncInvocation; @@ -530,18 +531,18 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { getTestMethodName() + "_RR_1", 1000 )); } finally { System.setProperty( - "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); vm4.invoke(new CacheSerializableRunnable("UnSetting system property ") { public void run2() throws CacheException { System.setProperty( - "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); } }); vm5.invoke(new CacheSerializableRunnable("UnSetting system property ") { public void run2() throws CacheException { System.setProperty( - "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index 63e7266..104223e 100644 --- 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,6 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.disttx; +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; @@ -34,7 +35,7 @@ public class DistTXWANDUnitTest extends WANTestBase { Invoke.invokeInEveryVM(new SerializableCallable() { @Override public Object call() throws Exception { - System.setProperty("gemfire.log-level", LogWriterUtils.getDUnitLogLevel()); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); return null; } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index f0303b9..c4a0cea 100644 --- 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,26 +16,26 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; -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 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.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + public class NewWanAuthenticationDUnitTest extends WANTestBase { private static final long serialVersionUID = 1L; @@ -209,8 +209,8 @@ public class NewWanAuthenticationDUnitTest extends WANTestBase { } public static void createSecuredCache(Properties authProps, Object javaProps, Integer locPort) { - authProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - authProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); + authProps.setProperty(MCAST_PORT, "0"); + authProps.setProperty(LOCATORS, "localhost[" + locPort + "]"); logger.info("Set the server properties to: " + authProps); logger.info("Set the java properties to: " + javaProps); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index 1f4d72c..fd41fe7 100644 --- 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,16 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; -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 com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.DiskStore; import com.gemstone.gemfire.cache.DiskStoreFactory; @@ -33,13 +23,25 @@ import com.gemstone.gemfire.cache.wan.GatewayReceiver; import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.VM; +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.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + public class SenderWithTransportFilterDUnitTest extends WANTestBase { private static final long serialVersionUID = 1L; @@ -101,8 +103,8 @@ public class SenderWithTransportFilterDUnitTest extends WANTestBase { public static int createReceiverWithTransportFilters(int locPort) { WANTestBase test = new WANTestBase(getTestMethodName()); 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java index 22c129e..4b2fc67 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java @@ -16,36 +16,13 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; -import static org.junit.Assert.*; - -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; - -import com.gemstone.gemfire.internal.AvailablePortHelper; -import org.junit.After; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -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.GatewaySenderFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; +import com.gemstone.gemfire.cache.wan.*; import com.gemstone.gemfire.cache30.MyGatewayEventFilter1; import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1; import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2; -import com.gemstone.gemfire.internal.AvailablePort; +import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.wan.GatewayReceiverException; import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException; @@ -53,6 +30,16 @@ import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory; import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class WANConfigurationJUnitTest { @@ -69,7 +56,7 @@ public class WANConfigurationJUnitTest { @Test public void test_GatewaySender_without_Locator() throws IOException { try { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); GatewaySender sender1 = fact.create("NYSender", 2); @@ -94,7 +81,7 @@ public class WANConfigurationJUnitTest { */ @Test public void test_SameGatewaySenderCreatedTwice() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); try { GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); @@ -120,7 +107,7 @@ public class WANConfigurationJUnitTest { @Test public void test_SameGatewaySenderIdAddedTwice() { try { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); fact.setManualStart(true); @@ -143,7 +130,7 @@ public class WANConfigurationJUnitTest { @Test public void test_GatewaySenderIdAndAsyncEventId() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); AttributesFactory factory = new AttributesFactory(); factory.addGatewaySenderId("ln"); factory.addGatewaySenderId("ny"); @@ -165,7 +152,7 @@ public class WANConfigurationJUnitTest { * */ public void DIABLEB_DUE_TO_BUG51491_test_GatewaySender_Parallel_DistributedRegion() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); fact.setManualStart(true); @@ -186,7 +173,7 @@ public class WANConfigurationJUnitTest { @Test public void test_GatewaySender_Parallel_MultipleDispatherThread() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); fact.setManualStart(true); @@ -201,7 +188,7 @@ public class WANConfigurationJUnitTest { @Test public void test_GatewaySender_Serial_ZERO_DispatherThread() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setManualStart(true); fact.setDispatcherThreads(0); @@ -223,7 +210,7 @@ public class WANConfigurationJUnitTest { */ @Test public void test_ValidateGatewayReceiverAttributes() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); int[] randomAvailableTCPPorts = AvailablePortHelper.getRandomAvailableTCPPorts(2); int port1 = randomAvailableTCPPorts[0]; int port2 = randomAvailableTCPPorts[1]; @@ -265,7 +252,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatewayReceiverStatus() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); int[] randomAvailableTCPPorts = AvailablePortHelper.getRandomAvailableTCPPorts(2); int port1 = randomAvailableTCPPorts[0]; int port2 = randomAvailableTCPPorts[1]; @@ -294,7 +281,7 @@ public class WANConfigurationJUnitTest { */ @Test public void test_ValidateSerialGatewaySenderAttributes() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setManualStart(true); fact.setBatchConflationEnabled(true); @@ -348,7 +335,7 @@ public class WANConfigurationJUnitTest { */ @Test public void test_ValidateParallelGatewaySenderAttributes() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); fact.setParallel(true); fact.setManualStart(true); @@ -400,7 +387,7 @@ public class WANConfigurationJUnitTest { @Test public void test_GatewaySenderWithGatewaySenderEventListener1() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); InternalGatewaySenderFactory fact = (InternalGatewaySenderFactory)cache.createGatewaySenderFactory(); AsyncEventListener listener = new MyGatewaySenderEventListener(); ((InternalGatewaySenderFactory)fact).addAsyncEventListener(listener); @@ -421,7 +408,7 @@ public class WANConfigurationJUnitTest { @Test public void test_GatewaySenderWithGatewaySenderEventListener2() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewaySenderFactory fact = cache.createGatewaySenderFactory(); AsyncEventListener listener = new MyGatewaySenderEventListener(); ((InternalGatewaySenderFactory)fact).addAsyncEventListener(listener); @@ -434,7 +421,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatwayReceiverAttributes() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setStartPort(50504); fact.setMaximumTimeBetweenPings(1000); @@ -471,7 +458,7 @@ public class WANConfigurationJUnitTest { if (System.getProperty("os.name").equals("Mac OS X")) { fail("Failing to avoid known hang on Mac OS X."); } - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setStartPort(50504); fact.setMaximumTimeBetweenPings(1000); @@ -498,7 +485,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatwayReceiverDefaultStartPortAndDefaultEndPort() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setMaximumTimeBetweenPings(1000); fact.setSocketBufferSize(4000); @@ -522,7 +509,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatwayReceiverDefaultStartPortAndEndPortProvided() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setMaximumTimeBetweenPings(1000); fact.setSocketBufferSize(4000); @@ -546,7 +533,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatwayReceiverWithManualStartFALSE() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setMaximumTimeBetweenPings(1000); fact.setSocketBufferSize(4000); @@ -563,7 +550,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatwayReceiverWithStartPortAndDefaultEndPort() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setMaximumTimeBetweenPings(1000); fact.setSocketBufferSize(4000); @@ -587,7 +574,7 @@ public class WANConfigurationJUnitTest { @Test public void test_ValidateGatwayReceiverWithWrongEndPortProvided() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); try { GatewayReceiverFactory fact = cache.createGatewayReceiverFactory(); fact.setMaximumTimeBetweenPings(1000); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index bd0c118..249e189 100644 --- 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,12 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.wan.misc; -import java.io.IOException; -import java.util.Properties; - 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; @@ -39,6 +35,11 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public class WANLocatorServerDUnitTest extends WANTestBase { static PoolImpl proxy; @@ -95,11 +96,11 @@ public class WANLocatorServerDUnitTest extends WANTestBase { Integer startingPort) { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + 1); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1 + props.setProperty(LOCATORS, "localhost[" + port1 + "],localhost[" + port2 + "],localhost[" + port3 + "]"); - props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + props.setProperty(START_LOCATOR, "localhost[" + startingPort + "],server=true,peer=true,hostname-for-clients=localhost"); test.getSystem(props); @@ -108,8 +109,8 @@ public class WANLocatorServerDUnitTest extends WANTestBase { public static void createReceiver(Integer port1, Integer port2, Integer port3) { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1 + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + port1 + "],localhost[" + port2 + "],localhost[" + port3 + "]"); InternalDistributedSystem ds = test.getSystem(props); @@ -133,8 +134,8 @@ public class WANLocatorServerDUnitTest extends WANTestBase { public static void createServer(Integer port1, Integer port2, Integer port3) { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1 + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + port1 + "],localhost[" + port2 + "],localhost[" + port3 + "]"); InternalDistributedSystem ds = test.getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index 5e00c77..4be960b 100644 --- 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,23 +16,16 @@ */ package com.gemstone.gemfire.internal.cache.wan.parallel; -import java.util.concurrent.TimeUnit; - -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.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.dunit.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; -import com.jayway.awaitility.Awaitility; +import org.junit.experimental.categories.Category; /** * DUnit test for operations on ParallelGatewaySender @@ -589,7 +582,8 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase { private void setMaximumMessageSize(int maximumMessageSizeBytes) { Message.MAX_MESSAGE_SIZE = maximumMessageSizeBytes; - LogWriterUtils.getLogWriter().info("Set gemfire.client.max-message-size: " + System.getProperty("gemfire.client.max-message-size")); + LogWriterUtils.getLogWriter() + .info("Set gemfire.client.max-message-size: " + System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "client.max-message-size")); } private void createSendersReceiversAndPartitionedRegion(Integer lnPort, Integer nyPort, boolean createAccessors, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index 7169b2e..eaa02b2 100644 --- 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,16 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.parallel; -import java.io.File; -import java.util.Properties; -import java.util.Set; - -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.*; import com.gemstone.gemfire.cache.wan.GatewayEventFilter; import com.gemstone.gemfire.cache.wan.GatewaySender; import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; @@ -33,7 +24,6 @@ import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; import com.gemstone.gemfire.cache30.MyGatewayEventFilter1; import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1; import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.cache.RegionQueue; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; @@ -43,6 +33,13 @@ 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.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + /** * DUnit for ParallelSenderQueue overflow operations. * @@ -380,8 +377,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { WANTestBase test = new WANTestBase(getTestMethodName()); 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); @@ -443,8 +440,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { WANTestBase test = new WANTestBase(getTestMethodName()); 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index 190b381..a33c1ea 100644 --- 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,27 +16,15 @@ */ package com.gemstone.gemfire.internal.cache.wan.serial; -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -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.*; 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; import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1; import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.cache.RegionQueue; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; @@ -45,6 +33,15 @@ import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; +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.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ @@ -214,8 +211,8 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + localLocPort + "]"); InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); @@ -278,8 +275,8 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ WANTestBase test = new WANTestBase(getTestMethodName()); 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); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index a9d0f29..67d8816 100644 --- 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,23 +16,19 @@ */ package com.gemstone.gemfire.internal.cache.wan.serial; -import java.io.IOException; -import java.util.Map; - -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.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.dunit.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.io.IOException; +import java.util.Map; public class SerialWANPropogationDUnitTest extends WANTestBase { @@ -619,18 +615,18 @@ public class SerialWANPropogationDUnitTest extends WANTestBase { getTestMethodName() + "_RR_1", 1000 )); } finally { System.setProperty( - "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); vm4.invoke(new CacheSerializableRunnable("UnSetting system property ") { public void run2() throws CacheException { System.setProperty( - "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); } }); vm5.invoke(new CacheSerializableRunnable("UnSetting system property ") { public void run2() throws CacheException { System.setProperty( - "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False"); } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java index 71b5910..bd69adc 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java @@ -16,26 +16,12 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import javax.management.remote.JMXConnectorServer; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.DiskStore; import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -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.*; 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.distributed.DistributedMember; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -44,11 +30,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase; -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.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; import javax.management.remote.JMXConnectorServer; import java.io.File; @@ -58,6 +40,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static com.gemstone.gemfire.test.dunit.Assert.assertEquals; import static com.gemstone.gemfire.test.dunit.Assert.fail; @@ -95,10 +78,10 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public Integer createFirstLocatorWithDSId(int dsId) { int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); InternalDistributedSystem ds = getSystem(props); cache = CacheFactory.create(ds); return port; @@ -107,10 +90,10 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public Integer createFirstRemoteLocator(int dsId, int remoteLocPort) { int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "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(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); getSystem(props); return port; @@ -118,16 +101,16 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public void createCache(Integer locPort){ Properties props = 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 = getSystem(props); cache = CacheFactory.create(ds); } public void createCacheWithGroups(Integer locPort, String groups){ Properties props = 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 + "]"); props.setProperty(DistributionConfig.GROUPS_NAME, groups); InternalDistributedSystem ds = getSystem(props); cache = CacheFactory.create(ds); @@ -218,8 +201,8 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public int createAndStartReceiver(int locPort) { Properties props = 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 = getSystem(props); @@ -241,8 +224,8 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public int createReceiver(int locPort) { Properties props = 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 = getSystem(props); @@ -258,8 +241,8 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public int createReceiverWithGroup(int locPort, String groups) { Properties props = 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 + "]"); props.setProperty(DistributionConfig.GROUPS_NAME, groups); @@ -295,8 +278,8 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { public int createAndStartReceiverWithGroup(int locPort, String groups) { Properties props = 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 + "]"); props.setProperty(DistributionConfig.GROUPS_NAME, groups); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java index a4333c7..86ca1a3 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java @@ -16,19 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.wan.GatewayReceiver; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; @@ -36,6 +25,17 @@ import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; /** * DUnit tests for 'create gateway-receiver' command. @@ -55,8 +55,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -118,8 +118,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -175,8 +175,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -236,8 +236,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -300,8 +300,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -349,8 +349,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -405,8 +405,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -464,8 +464,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -523,8 +523,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -579,8 +579,8 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends WANCommandTestBase int punePort = (Integer)puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java index 2ddbd04..ab07226 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java @@ -16,16 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.wan.GatewaySender; import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; import com.gemstone.gemfire.distributed.DistributedMember; @@ -37,6 +27,17 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @Category(DistributedTest.class) public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { @@ -63,9 +64,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -112,9 +113,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -184,9 +185,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -240,9 +241,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -315,9 +316,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() ->createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -388,9 +389,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -453,9 +454,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -518,9 +519,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -580,9 +581,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -649,9 +650,9 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props);
