http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java index 1efae19..f5190f6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java @@ -16,19 +16,7 @@ */ package com.gemstone.gemfire.cache30; - -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.CachePerfStats; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -37,6 +25,8 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; +import java.util.Properties; + public class CacheRegionsReliablityStatsCheckDUnitTest extends CacheTestCase { public CacheRegionsReliablityStatsCheckDUnitTest(String name) { super(name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java index 48fa935..bc50219 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java @@ -16,54 +16,22 @@ */ package com.gemstone.gemfire.cache30; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Properties; - -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import junit.framework.AssertionFailedError; - -import org.xml.sax.SAXException; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheXmlException; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.DiskWriteAttributesFactory; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.MirrorType; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.PoolManager; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.util.ObjectSizer; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.DiskWriteAttributesImpl; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlParser; -import com.gemstone.gemfire.internal.cache.xmlcache.ClientCacheCreation; -import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2; -import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; -import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation; +import com.gemstone.gemfire.internal.cache.xmlcache.*; +import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.util.test.TestUtil; +import junit.framework.AssertionFailedError; +import org.xml.sax.SAXException; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.Properties; /** * Tests the functionality of loading a declarative caching file when http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java index 0a275f5..80a845a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java @@ -19,15 +19,19 @@ package com.gemstone.gemfire.cache30; import com.company.app.DBLoader; import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.internal.AvailablePort; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.DistributedRegion; -import com.gemstone.gemfire.internal.cache.xmlcache.*; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; +import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; +import com.gemstone.gemfire.internal.cache.xmlcache.CacheTransactionManagerCreation; +import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; +import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; -import java.io.*; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; /** * Tests the declarative caching functionality introduced in GemFire @@ -159,7 +163,7 @@ public class CacheXml45DUnitTest extends CacheXml41DUnitTest { // make our system play the roles used by this test so the create regions // will not think the a required role is missing Properties config = new Properties(); - config.setProperty("roles", MY_ROLES); + config.setProperty(DistributionConfig.ROLES_NAME, MY_ROLES); this.xmlProps = config; } DistributedRegion.ignoreReconnect = true; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java index afcb9b0..6ba30f2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java @@ -20,9 +20,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.List; -import java.util.Properties; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.Declarable; import com.gemstone.gemfire.cache.Region; @@ -39,6 +36,9 @@ import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.IgnoredException; +import java.util.List; +import java.util.Properties; + public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest { private static final long serialVersionUID = -6437436147079728413L; @@ -58,7 +58,7 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest { @SuppressWarnings("rawtypes") public void testEnableOffHeapMemory() { try { - System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); final String regionName = "testEnableOffHeapMemory"; @@ -82,7 +82,7 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest { assertEquals(true, ((LocalRegion)regionAfter).getOffHeap()); regionAfter.localDestroyRegion(); } finally { - System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME); } } @@ -158,7 +158,7 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest { final float high = 95.0f; try { - System.setProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); Cache c; ResourceManagerCreation rmc = new ResourceManagerCreation(); @@ -236,7 +236,7 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest { assertEquals(0f, c.getResourceManager().getEvictionOffHeapPercentage()); assertEquals(0f, c.getResourceManager().getCriticalOffHeapPercentage()); } finally { - System.clearProperty("gemfire."+DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java index 8c9776e..eef0788 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java @@ -16,13 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Properties; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; @@ -32,6 +25,12 @@ import com.gemstone.gemfire.internal.cache.xmlcache.ClientCacheCreation; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.util.test.TestUtil; +import java.io.*; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + public class CacheXmlTestCase extends CacheTestCase { /** The file used by this test (method) to initialize the cache */ @@ -97,8 +96,8 @@ public class CacheXmlTestCase extends CacheTestCase { // make it a loner if (lonerDistributedSystem) { - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); } return props; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java index 6c4bcf6..bfd32fc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java @@ -22,17 +22,7 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.test.dunit.DistributedTestCase; @@ -40,6 +30,8 @@ import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; +import java.util.Properties; + /** * */ @@ -81,7 +73,7 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{ public static void createCache(){ try{ CacheListener aListener = new ListenerCallBk(); -// props.setProperty("mcast-port", "1234"); + // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "1234"); // ds = DistributedSystem.connect(props); ds = (new ClearMultiVmCallBkDUnitTest("temp")).getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java index da3614c..5fc0813 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java @@ -29,7 +29,6 @@ import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership; import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl; @@ -49,6 +48,9 @@ import java.net.Socket; import java.util.*; import java.util.concurrent.TimeUnit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + /** * Tests the ClientMembership API including ClientMembershipListener. * @@ -824,8 +826,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { // create bridge client in controller vm... System.out.println("[testClientMembershipEventsInClient] create bridge client"); Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); getSystem(config); try { @@ -1026,8 +1028,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { public Object call() { System.out.println("[testClientMembershipEventsInServer] create bridge client"); Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); properties = config; DistributedSystem s = getSystem(config); AttributesFactory factory = new AttributesFactory(); @@ -1209,8 +1211,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { // create loner in controller vm... Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); properties = config; getSystem(config); @@ -1291,8 +1293,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { public Object call() { System.out.println("[testGetConnectedClients] create bridge client"); properties = new Properties(); - properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - properties.setProperty(DistributionConfig.LOCATORS_NAME, ""); + properties.setProperty(MCAST_PORT, "0"); + properties.setProperty(LOCATORS, ""); getSystem(properties); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1388,8 +1390,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { System.out.println("[testGetConnectedServers] create bridge client"); Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); properties = config; getSystem(config); getCache(); @@ -1493,8 +1495,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { System.out.println("[testGetNotifiedClients] create bridge client"); Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); properties = config; getSystem(); getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java index 325da80..b9614cc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java @@ -16,22 +16,19 @@ */ package com.gemstone.gemfire.cache30; -import java.io.IOException; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.CacheException; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -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.cache.client.SubscriptionNotEnabledException; +import com.gemstone.gemfire.cache.client.internal.PoolImpl; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Tests the client register interest @@ -90,8 +87,8 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase { LogWriterUtils.getLogWriter().info("[testBug35381] create bridge client"); Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); getSystem(config); getCache(); @@ -222,8 +219,8 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase { // create the bridge client LogWriterUtils.getLogWriter().info("[testBug35654] create bridge client"); Properties config = new Properties(); - config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - config.setProperty(DistributionConfig.LOCATORS_NAME, ""); + config.setProperty(MCAST_PORT, "0"); + config.setProperty(LOCATORS, ""); getSystem(config); getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java index cb8ae57..b1e6694 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java @@ -16,43 +16,22 @@ */ package com.gemstone.gemfire.cache30; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Collection; -import java.util.HashMap; - -import junit.framework.AssertionFailedError; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.server.CacheServer; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.internal.cache.TombstoneService; import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; -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.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -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 junit.framework.AssertionFailedError; + +import java.util.*; /** * concurrency-control tests for client/server @@ -591,7 +570,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase { ClientCacheFactory cf = new ClientCacheFactory(); cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port); cf.setPoolSubscriptionEnabled(true); - cf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + cf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache cache = getClientCache(cf); ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); crf.setConcurrencyChecksEnabled(ccEnabled); @@ -615,9 +594,9 @@ public class ClientServerCCEDUnitTest extends CacheTestCase { cf.setPoolSubscriptionEnabled(true); cf.setPoolSubscriptionRedundancy(1); // bug #50683 - secondary durable queue retains all GC messages - cf.set("durable-client-id", ""+vm.getPid()); - cf.set("durable-client-timeout", "" + 200); - cf.set("log-level", LogWriterUtils.getDUnitLogLevel()); + cf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "" + vm.getPid()); + cf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 200); + cf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); ClientCache cache = getClientCache(cf); ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); crf.setConcurrencyChecksEnabled(ccEnabled); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java index 8555a07..71b3dd7 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java @@ -22,31 +22,15 @@ */ package com.gemstone.gemfire.cache30; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; + +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; /** * @@ -91,7 +75,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{ public static void createCache(){ try{ - //props.setProperty("mcast-port", "1234"); + //props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "1234"); //ds = DistributedSystem.connect(props); ds = (new DistAckMapMethodsDUnitTest("temp")).getSystem(props); cache = CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java index 810f1a7..c9c059a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Distributed Ack Overflow Region with ConcurrencyChecksEnabled and OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java index 13ec4a3..f81b0df 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Distributed Ack Persistent Region with ConcurrencyChecksEnabled and OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java index 3684e70..7594cc2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java @@ -20,58 +20,25 @@ */ package com.gemstone.gemfire.cache30; -import java.net.UnknownHostException; -import java.util.Collections; -import java.util.Properties; -import java.util.Set; - -import junit.framework.Assert; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.cache.util.GatewayConflictHelper; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.cache.util.TimestampedEntryEvent; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionManager; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.distributed.internal.membership.NetMember; -import com.gemstone.gemfire.internal.cache.AbstractRegionEntry; -import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor.InitialImageAdvice; -import com.gemstone.gemfire.internal.cache.DistributedCacheOperation; -import com.gemstone.gemfire.internal.cache.DistributedRegion; -import com.gemstone.gemfire.internal.cache.EntryEventImpl; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.InitialImageOperation; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.RegionClearedException; -import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.internal.cache.Token; -import com.gemstone.gemfire.internal.cache.TombstoneService; -import com.gemstone.gemfire.internal.cache.UpdateOperation; -import com.gemstone.gemfire.internal.cache.VersionTagHolder; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.versions.VMVersionTag; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.internal.cache.vmotion.VMotionObserver; import com.gemstone.gemfire.internal.cache.vmotion.VMotionObserverHolder; -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.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -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.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.net.UnknownHostException; +import java.util.Properties; +import java.util.Set; public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitTest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java index 77fcd83..f1ba65e 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java index 30786e5..78d4138 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java @@ -16,20 +16,11 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -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.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; + +import java.util.Properties; /** * This class tests the functionality of a cache {@link Region region} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java index cfe7642..2f6bea9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Distributed Ack Region with OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java index 011b8f5..816ef6f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java @@ -16,37 +16,24 @@ */ package com.gemstone.gemfire.cache30; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.SharedConfiguration; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.CachedDeserializableFactory; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.pdx.PdxReader; import com.gemstone.gemfire.pdx.PdxSerializable; import com.gemstone.gemfire.pdx.PdxSerializationException; import com.gemstone.gemfire.pdx.PdxWriter; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.File; +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; public class DistributedMulticastRegionDUnitTest extends CacheTestCase { @@ -252,9 +239,9 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase { Properties p = new Properties(); p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); p.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "multicast"); - p.put(DistributionConfig.MCAST_PORT_NAME, mcastport); - p.put(DistributionConfig.MCAST_TTL_NAME, mcastttl); - p.put(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort +"]"); + p.put(MCAST_PORT, mcastport); + p.put(MCAST_TTL, mcastttl); + p.put(LOCATORS, "localhost[" + locatorPort + "]"); p.put(DistributionConfig.LOG_LEVEL_NAME, "info"); return p; } @@ -284,9 +271,9 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase { public Object call() { final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(DistributionConfig.NAME_NAME, "LocatorWithMcast"); - locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastport); - locatorProps.setProperty(DistributionConfig.MCAST_TTL_NAME, mcastttl); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "LocatorWithMcast"); + locatorProps.setProperty(MCAST_PORT, mcastport); + locatorProps.setProperty(MCAST_TTL, mcastttl); locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); //locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); try { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java index 9e9348b..15a045c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java @@ -16,33 +16,17 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Map; -import java.util.Properties; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.cache.LocalRegion; -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.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -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.util.Map; +import java.util.Properties; public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDUnitTest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java index d6c91a1..7c302b5 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java index 30c4c3e..de7b4df 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Distributed NoAck Region with OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java index 3c8b6e5..d054c9f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java @@ -20,16 +20,7 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - -import org.junit.Ignore; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -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.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.RegionClearedException; @@ -40,6 +31,9 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; +import org.junit.Ignore; + +import java.util.Properties; /** * This test is only for GLOBAL REPLICATE Regions. Tests are http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java index 39f0b1a..1ac1966 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Global Region with ConcurrencyChecksEnabled and OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java index c178917..95ce20a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Global Region with OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java index 5d53968..5dc4848 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; @@ -26,6 +24,8 @@ import com.gemstone.gemfire.internal.cache.lru.HeapEvictor; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests the basic functionality of the lru eviction * controller and its statistics using off-heap regions. @@ -56,8 +56,8 @@ public class OffHeapLRUEvictionControllerDUnitTest extends @Override public Properties getDistributedSystemProperties() { - Properties properties = super.getDistributedSystemProperties(); - properties.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "100m"); + Properties properties = super.getDistributedSystemProperties(); + properties.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "100m"); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java index 3dbe5f9..ae2a698 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -25,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil; import com.gemstone.gemfire.test.dunit.Invoke; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests Partitioned Region with OffHeap memory. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java index 6a38b99..3b6fbda 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java @@ -16,31 +16,17 @@ */ package com.gemstone.gemfire.cache30; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.CachePerfStats; +import com.gemstone.gemfire.internal.cache.DistributedRegion; +import com.gemstone.gemfire.test.dunit.*; + import java.util.List; import java.util.Map; import java.util.Properties; import java.util.TreeMap; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheEvent; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.cache.CachePerfStats; -import com.gemstone.gemfire.internal.cache.DistributedRegion; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; - /** * Test to make sure message queuing works. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java index fe39484..fc69bda 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java @@ -16,42 +16,13 @@ */ package com.gemstone.gemfire.cache30; - -import java.util.Properties; -import java.util.concurrent.TimeoutException; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage; -import com.gemstone.gemfire.distributed.internal.SizeableRunnable; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.DistributedRegion; -import com.gemstone.gemfire.internal.cache.EntryEventImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.internal.cache.Token; -import com.gemstone.gemfire.internal.cache.VMCachedDeserializable; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.versions.VMVersionTag; import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.test.dunit.DistributedTestUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -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.*; /** * concurrency-control tests for client/server http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java index 948e75a..9c3498d 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java @@ -48,6 +48,8 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + @SuppressWarnings("serial") public class ReconnectDUnitTest extends CacheTestCase { @@ -117,8 +119,8 @@ public class ReconnectDUnitTest extends CacheTestCase dsProperties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true"); dsProperties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "false"); dsProperties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); - dsProperties.put(DistributionConfig.LOCATORS_NAME, "localHost["+locatorPort+"]"); - dsProperties.put(DistributionConfig.MCAST_PORT_NAME, "0"); + dsProperties.put(LOCATORS, "localHost[" + locatorPort + "]"); + dsProperties.put(MCAST_PORT, "0"); dsProperties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000"); dsProperties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); } @@ -196,8 +198,8 @@ public class ReconnectDUnitTest extends CacheTestCase // DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region"); locatorPort = locPort; Properties props = getDistributedSystemProperties(); - props.put("cache-xml-file", xmlFileLoc+ fileSeparator +"MyDisconnect-cache.xml"); - props.put("max-num-reconnect-tries", "2"); + props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2"); // props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log"); Cache cache = new CacheFactory(props).create(); IgnoredException.addIgnoredException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum"); @@ -265,9 +267,9 @@ public class ReconnectDUnitTest extends CacheTestCase // DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region"); locatorPort = locPort; Properties props = getDistributedSystemProperties(); - props.put("cache-xml-file", xmlFileLoc+ fileSeparator +"MyDisconnect-cache.xml"); - props.put("max-wait-time-reconnect", "1000"); - props.put("max-num-reconnect-tries", "2"); + props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2"); // props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log"); Cache cache = new CacheFactory(props).create(); Region myRegion = cache.getRegion("root/myRegion"); @@ -285,11 +287,11 @@ public class ReconnectDUnitTest extends CacheTestCase // DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region"); locatorPort = locPort; final Properties props = getDistributedSystemProperties(); - props.put("cache-xml-file", xmlFileLoc+ fileSeparator +"MyDisconnect-cache.xml"); - props.put("max-wait-time-reconnect", "5000"); - props.put("max-num-reconnect-tries", "2"); - props.put("start-locator", "localhost["+secondLocPort+"]"); - props.put("locators", props.get("locators")+",localhost["+secondLocPort+"]"); + props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "5000"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2"); + props.put(START_LOCATOR, "localhost[" + secondLocPort + "]"); + props.put(LOCATORS, props.get(LOCATORS) + ",localhost[" + secondLocPort + "]"); // props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log"); getSystem(props); // MembershipManagerHelper.getMembershipManager(system).setDebugJGroups(true); @@ -480,9 +482,9 @@ public class ReconnectDUnitTest extends CacheTestCase { locatorPort = locPort; Properties props = getDistributedSystemProperties(); - props.put("max-wait-time-reconnect", "1000"); - props.put("max-num-reconnect-tries", "2"); - props.put("locators", props.get("locators")+",localhost["+locPort+"]"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2"); + props.put(LOCATORS, props.get(LOCATORS) + ",localhost[" + locPort + "]"); props.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); try { Locator.startLocatorAndDS(secondLocPort, null, props); @@ -504,9 +506,9 @@ public class ReconnectDUnitTest extends CacheTestCase // DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region"); locatorPort = locPort; Properties props = getDistributedSystemProperties(); - props.put("cache-xml-file", xmlFileLoc+ fileSeparator +"MyDisconnect-cache.xml"); - props.put("max-wait-time-reconnect", "1000"); - props.put("max-num-reconnect-tries", "2"); + props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2"); ReconnectDUnitTest.savedSystem = getSystem(props); Cache cache = getCache(); Region myRegion = cache.getRegion("root/myRegion"); @@ -668,10 +670,10 @@ public class ReconnectDUnitTest extends CacheTestCase LogWriterUtils.getLogWriter().info("####### STARTING THE REAL TEST ##########"); locatorPort = locPort; Properties props = getDistributedSystemProperties(); - props.put("cache-xml-file", xmlFileLoc+ fileSeparator +"RoleReconnect-cache.xml"); - props.put("max-wait-time-reconnect", "200"); + props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "RoleReconnect-cache.xml"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "200"); final int timeReconnect = 3; - props.put("max-num-reconnect-tries", "3"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "3"); props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); // props.put("log-file", "roleLossVM0.log"); @@ -890,9 +892,9 @@ public class ReconnectDUnitTest extends CacheTestCase LogWriterUtils.getLogWriter().info("Starting the test and creating the cache and regions etc ..."); locatorPort = locPort; Properties props = getDistributedSystemProperties(); - props.put("cache-xml-file", "RoleRegained.xml"); - props.put("max-wait-time-reconnect", "3000"); - props.put("max-num-reconnect-tries", "8"); + props.put(DistributionConfig.CACHE_XML_FILE_NAME, "RoleRegained.xml"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "3000"); + props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "8"); props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); getSystem(props); @@ -1041,7 +1043,7 @@ public class ReconnectDUnitTest extends CacheTestCase public void run() { locatorPort = locPort; final Properties props = getDistributedSystemProperties(); - props.put("max-wait-time-reconnect", "1000"); + props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000"); // props.put("log-file", ""); dsProperties = props; ReconnectDUnitTest.savedSystem = getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java index 46ff2b7..df2699e 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java @@ -18,10 +18,10 @@ package com.gemstone.gemfire.cache30; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.server.CacheServer; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper; import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; -import com.gemstone.gemfire.internal.cache.CacheServerLauncher; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -58,7 +58,7 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase { public void testCacheServerConfigRetained() { // make sure the environment isn't polluted - assertFalse(Boolean.getBoolean("gemfire.autoReconnect-useCacheXMLFile")); + assertFalse(Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "autoReconnect-useCacheXMLFile")); GemFireCacheImpl gc = (GemFireCacheImpl)this.cache; @@ -73,8 +73,8 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase { } public void testDefaultCacheServerNotCreatedOnReconnect() { - - assertFalse(Boolean.getBoolean("gemfire.autoReconnect-useCacheXMLFile")); + + assertFalse(Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "autoReconnect-useCacheXMLFile")); GemFireCacheImpl gc = (GemFireCacheImpl)this.cache; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java index 98c2b6e..d12a31c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java @@ -16,19 +16,7 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; -import java.util.Set; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionRoleListener; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.RoleEvent; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.util.RegionRoleListenerAdapter; import com.gemstone.gemfire.distributed.Role; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -36,6 +24,9 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalRole; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; +import java.util.Set; + /** * Tests the functionality of the {@link RegionRoleListener} class. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java index 86ed3a9..db3fedd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java @@ -16,40 +16,7 @@ */ package com.gemstone.gemfire.cache30; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.locks.Lock; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CommitDistributionException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAccessException; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDistributionException; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.RegionMembershipListener; -import com.gemstone.gemfire.cache.RegionReinitializedException; -import com.gemstone.gemfire.cache.RequiredRoles; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.Query; import com.gemstone.gemfire.cache.query.QueryService; import com.gemstone.gemfire.cache.util.RegionMembershipListenerAdapter; @@ -59,21 +26,15 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.distributed.internal.membership.InternalRole; -import com.gemstone.gemfire.internal.cache.AbstractRegion; -import com.gemstone.gemfire.internal.cache.DistributedCacheOperation; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.TXManagerImpl; -import com.gemstone.gemfire.internal.cache.TXState; -import com.gemstone.gemfire.internal.cache.TXStateInterface; -import com.gemstone.gemfire.internal.cache.TXStateProxyImpl; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.internal.cache.*; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.experimental.categories.Category; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.*; +import java.util.concurrent.locks.Lock; /** * Tests region reliability defined by MembershipAttributes. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java index 094f7e8..eee3071 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java @@ -16,30 +16,17 @@ */ package com.gemstone.gemfire.cache30; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RequiredRoles; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.Role; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalRole; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Properties; +import java.util.Set; /** * Tests the functionality of the {@link RequiredRoles} class. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java index 0e805b9..51ab9c6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java @@ -16,19 +16,14 @@ */ package com.gemstone.gemfire.cache30; -import java.util.Properties; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import java.util.Properties; + /** * Tests the performance of Regions when Roles are assigned. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java index 0d99870..de24694 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java @@ -16,37 +16,24 @@ */ package com.gemstone.gemfire.cache30; -import java.io.Serializable; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Properties; -import java.util.Set; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.internal.DM; import com.gemstone.gemfire.distributed.internal.DMStats; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.tcp.Connection; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.ThreadUtils; -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.test.junit.categories.DistributedTest; +import org.junit.Ignore; +import org.junit.experimental.categories.Category; + +import java.io.Serializable; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Properties; +import java.util.Set; /** * Test to make sure slow receiver queuing is working @@ -263,7 +250,7 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "1"); + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "1"); doCreateOtherVm(p, false); int repeatCount = 2; @@ -339,7 +326,7 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "1"); + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "1"); doCreateOtherVm(p, false); forceQueuing(r); @@ -409,7 +396,7 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "2"); + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "2"); doCreateOtherVm(p, false); forceQueuing(r); @@ -461,7 +448,7 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "1"); + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "1"); doCreateOtherVm(p, false); { VM vm = getOtherVm(); @@ -658,8 +645,8 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "5"); - p.setProperty("async-max-queue-size", "1"); // 1 meg + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5"); + p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1"); // 1 meg doCreateOtherVm(p, false); @@ -730,8 +717,8 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "5"); - p.setProperty("async-queue-timeout", "500"); // 500 ms + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5"); + p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "500"); // 500 ms doCreateOtherVm(p, true); @@ -959,9 +946,9 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled final Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "5"); - p.setProperty("async-queue-timeout", "86400000"); // max value - p.setProperty("async-max-queue-size", "1024"); // max value + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5"); + p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "86400000"); // max value + p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1024"); // max value getOtherVm().invoke(new CacheSerializableRunnable("Create other vm") { public void run2() throws CacheException { @@ -1166,9 +1153,9 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled final Properties p = new Properties(); - p.setProperty("async-distribution-timeout", "5"); - p.setProperty("async-queue-timeout", "86400000"); // max value - p.setProperty("async-max-queue-size", "1024"); // max value + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, "5"); + p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "86400000"); // max value + p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1024"); // max value getOtherVm().invoke(new CacheSerializableRunnable("Create other vm") { public void run2() throws CacheException { @@ -1322,9 +1309,9 @@ public class SlowRecDUnitTest extends CacheTestCase { // create receiver in vm0 with queuing enabled final Properties p = new Properties(); - p.setProperty("async-distribution-timeout", String.valueOf(1000*4)); // 4 sec - p.setProperty("async-queue-timeout", "86400000"); // max value - p.setProperty("async-max-queue-size", "1024"); // max value + p.setProperty(DistributionConfig.ASYNC_DISTRIBUTION_TIMEOUT_NAME, String.valueOf(1000 * 4)); // 4 sec + p.setProperty(DistributionConfig.ASYNC_QUEUE_TIMEOUT_NAME, "86400000"); // max value + p.setProperty(DistributionConfig.ASYNC_MAX_QUEUE_SIZE_NAME, "1024"); // max value getOtherVm().invoke(new CacheSerializableRunnable("Create other vm") { public void run2() throws CacheException {
