http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java index f1a67ba..fcb9862 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java @@ -16,15 +16,7 @@ */ package com.gemstone.gemfire.management; -import java.util.Collection; -import java.util.Iterator; -import java.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; @@ -36,15 +28,11 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -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.RMIException; -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.Collection; +import java.util.Iterator; +import java.util.Properties; /** * Client health stats check @@ -258,10 +246,10 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase { props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000"); // props.setProperty("log-file", getTestMethodName()+"_client_" + clientNum + ".log"); - props.setProperty("log-level", "info"); - props.setProperty("statistic-archive-file", getTestMethodName()+"_client_" + clientNum + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); + props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getTestMethodName() + "_client_" + clientNum + ".gfs"); - props.setProperty("statistic-sampling-enabled", "true"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); ClientCacheFactory ccf = new ClientCacheFactory(props); if(subscriptionEnabled){ @@ -271,8 +259,8 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase { } if(durable){ - ccf.set("durable-client-id", "DurableClientId_"+clientNum); - ccf.set("durable-client-timeout", "" + 300); + ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "DurableClientId_" + clientNum); + ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 300); } ccf.addPoolServer(host.getHostName(), port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java index 8b70d5c..5dda3da 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java @@ -16,23 +16,7 @@ */ package com.gemstone.gemfire.management; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Properties; - -import org.json.JSONObject; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.data.Position; import com.gemstone.gemfire.distributed.DistributedSystem; @@ -49,6 +33,18 @@ import com.gemstone.gemfire.pdx.PdxInstance; import com.gemstone.gemfire.pdx.PdxInstanceFactory; import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.json.JSONObject; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.fail; /** * @since GemFire 8.1 @@ -93,10 +89,10 @@ public class DataBrowserJSONValidationJUnitTest { // System.setProperty("gemfire.stats.debug.debugSampleCollector", "true"); final Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("enable-time-statistics", "true"); - props.setProperty("statistic-sampling-enabled", "false"); - props.setProperty("statistic-sample-rate", "60000"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java index fb8ae7d..ca56c07 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java @@ -16,28 +16,23 @@ */ package com.gemstone.gemfire.management; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Properties; - import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.management.internal.ManagementConstants; -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.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.*; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** @@ -91,8 +86,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { Host host = Host.getHost(0); String host0 = getServerHostName(host); Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, host0 + "[" + locPort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, host0 + "[" + locPort + "]"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false"); @@ -113,8 +108,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { Host host = Host.getHost(0); String host0 = getServerHostName(host); Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, host0 + "[" + locPort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, host0 + "[" + locPort + "]"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false"); @@ -168,8 +163,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { String host0 = getServerHostName(host); Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, host0 + "[" + locPort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, host0 + "[" + locPort + "]"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); @@ -186,8 +181,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { String host0 = getServerHostName(host); Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, host0 + "[" + locPort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, host0 + "[" + locPort + "]"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); @@ -213,9 +208,9 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { assertFalse(InternalLocator.hasLocator()); Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); - - props.setProperty(DistributionConfig.LOCATORS_NAME, ""); + props.setProperty(MCAST_PORT, "0"); + + props.setProperty(LOCATORS, ""); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); InetAddress bindAddr = null; @@ -395,8 +390,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { * @return the host name */ public static String getServerHostName(Host host) { - return System.getProperty("gemfire.server-bind-address") != null? - System.getProperty("gemfire.server-bind-address") + return System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "server-bind-address") != null ? + System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "server-bind-address") : host.getHostName(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java index fc918ff..522a142 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java @@ -16,18 +16,6 @@ */ package com.gemstone.gemfire.management; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; - -import javax.management.Attribute; -import javax.management.AttributeList; -import javax.management.MBeanServer; -import javax.management.Notification; -import javax.management.NotificationListener; -import javax.management.ObjectName; - import com.gemstone.gemfire.OutOfOffHeapMemoryException; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.DataPolicy; @@ -36,17 +24,18 @@ import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.offheap.OffHeapStoredObject; import com.gemstone.gemfire.internal.offheap.OffHeapMemoryStats; import com.gemstone.gemfire.internal.offheap.OffHeapStorage; +import com.gemstone.gemfire.internal.offheap.OffHeapStoredObject; import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; import com.gemstone.gemfire.management.internal.beans.MemberMBean; -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 javax.management.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; /** * Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX interfaces. @@ -637,9 +626,9 @@ public class OffHeapManagementDUnitTest extends CacheTestCase { * Returns off-heap system properties for enabling off-heap and the JMX system. */ protected Properties getSystemProperties() { - Properties props = getDistributedSystemProperties(); - - props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); + Properties props = getDistributedSystemProperties(); + + props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java index b1662cf..78e00db 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java @@ -16,25 +16,12 @@ */ package com.gemstone.gemfire.management; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.data.Position; import com.gemstone.gemfire.cache.util.ObjectSizer; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.internal.cli.json.GfJsonException; import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject; import com.gemstone.gemfire.management.internal.cli.json.TypedJson; @@ -42,6 +29,14 @@ import com.gemstone.gemfire.pdx.PdxInstance; import com.gemstone.gemfire.pdx.PdxInstanceFactory; import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; @Category(IntegrationTest.class) public class TypedJsonJUnitTest { @@ -161,7 +156,7 @@ public class TypedJsonJUnitTest { @Test public void testPDXObject() { final Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); DistributedSystem.connect(props); Cache cache = new CacheFactory().create(); PdxInstanceFactory pf = PdxInstanceFactoryImpl.newCreator("Portfolio", false); @@ -181,7 +176,7 @@ public class TypedJsonJUnitTest { @Test public void testNestedPDXObject() { final Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); DistributedSystem.connect(props); Cache cache = new CacheFactory().create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java index 6516547..7816cc3 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java @@ -16,15 +16,6 @@ */ package com.gemstone.gemfire.management; -import java.io.IOException; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.InternalGemFireException; import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.cache.AttributesFactory; @@ -43,20 +34,16 @@ import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership; import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection; import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LocalLogWriter; -import com.gemstone.gemfire.management.membership.ClientMembership; -import com.gemstone.gemfire.management.membership.ClientMembershipEvent; -import com.gemstone.gemfire.management.membership.ClientMembershipListener; -import com.gemstone.gemfire.management.membership.MembershipEvent; -import com.gemstone.gemfire.management.membership.MembershipListener; -import com.gemstone.gemfire.management.membership.UniversalMembershipListenerAdapter; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -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.management.membership.*; +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.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Tests the UniversalMembershipListenerAdapter. @@ -415,8 +402,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes public Object call() { com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] 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); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1817,8 +1804,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] create loner 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); com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] create system bridge client"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java index 87be3e9..c5b0e8f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java @@ -16,16 +16,6 @@ */ package com.gemstone.gemfire.management.bean.stats; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Properties; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; @@ -38,6 +28,16 @@ import com.gemstone.gemfire.management.DistributedSystemMXBean; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.internal.SystemManagementService; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @@ -58,10 +58,10 @@ public class DistributedSystemStatsJUnitTest { public void setUp() throws Exception { final Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("enable-time-statistics", "true"); - props.setProperty("statistic-sampling-enabled", "false"); - props.setProperty("statistic-sample-rate", "60000"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000"); props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true"); // set JMX_MANAGER_UPDATE_RATE to practically an infinite value, so that http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java index 588c22d..8481bcd 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java @@ -16,17 +16,18 @@ */ package com.gemstone.gemfire.management.bean.stats; -import java.util.Properties; - -import org.junit.After; -import org.junit.Before; - -import static org.junit.Assert.*; - import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.NanoTimer; +import org.junit.After; +import org.junit.Before; + +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertNotNull; /** * Base test case for the management.bean.stats tests. @@ -47,11 +48,11 @@ public abstract class MBeanStatsTestCase { //System.setProperty("gemfire.stats.debug.debugSampleCollector", "true"); final Properties props = new Properties(); - //props.setProperty("log-level", "finest"); - props.setProperty("mcast-port", "0"); - props.setProperty("enable-time-statistics", "true"); - props.setProperty("statistic-sampling-enabled", "false"); - props.setProperty("statistic-sample-rate", "60000"); + //props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "finest"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000"); this.system = (InternalDistributedSystem) DistributedSystem.connect(props); assertNotNull(this.system.getStatSampler()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java index cea95c1..55d937e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java @@ -16,35 +16,21 @@ */ package com.gemstone.gemfire.management.internal.cli; -import java.util.Properties; -import java.util.Set; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.execute.*; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.management.DistributedRegionMXBean; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.RegionMXBean; import com.gemstone.gemfire.management.internal.cli.result.CommandResultException; -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.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 java.util.Properties; +import java.util.Set; /** * @@ -217,7 +203,7 @@ public class CliUtilDUnitTest extends CacheTestCase { public void createCacheWithMemberIdAndGroup(String memberName, String groupName){ Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, memberName); + localProps.setProperty(SystemConfigurationProperties.NAME, memberName); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); localProps.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java index 7bfde5b..f33bd3b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java @@ -16,23 +16,25 @@ */ package com.gemstone.gemfire.management.internal.cli; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.internal.AvailablePort.*; -import static org.junit.Assert.*; - -import java.io.IOException; -import java.util.Properties; - +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.junit.rules.TestName; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.internal.AvailablePort.SOCKET; +import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * TODO : Add more tests for error-catch, different type of results etc @@ -52,12 +54,12 @@ public class HeadlessGfshIntegrationTest { int port = getRandomAvailablePort(SOCKET); Properties properties = new Properties(); - properties.put(NAME_NAME, this.testName.getMethodName()); - properties.put(JMX_MANAGER_NAME, "true"); - properties.put(JMX_MANAGER_START_NAME, "true"); - properties.put(JMX_MANAGER_PORT_NAME, String.valueOf(port)); - properties.put(HTTP_SERVICE_PORT_NAME, "0"); - properties.put(MCAST_PORT_NAME, "0"); + properties.put(SystemConfigurationProperties.NAME, this.testName.getMethodName()); + properties.put(JMX_MANAGER, "true"); + properties.put(JMX_MANAGER_START, "true"); + properties.put(JMX_MANAGER_PORT, String.valueOf(port)); + properties.put(HTTP_SERVICE_PORT, "0"); + properties.put(MCAST_PORT, "0"); DistributedSystem ds = DistributedSystem.connect(properties); GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java index dc8045a..5b058b8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java @@ -16,19 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; - -import java.io.IOException; -import java.io.PrintStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Map; -import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.management.ManagementService; @@ -42,10 +31,21 @@ import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; import com.gemstone.gemfire.management.internal.security.JSONAuthorization; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; - import org.junit.Rule; import org.junit.rules.TemporaryFolder; +import java.io.IOException; +import java.io.PrintStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; + /** * Base class for all the CLI/gfsh command dunit tests. */ @@ -134,8 +134,8 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase { jmxHost = "localhost"; } - if (!localProps.containsKey(DistributionConfig.NAME_NAME)) { - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + if (!localProps.containsKey(SystemConfigurationProperties.NAME)) { + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); } final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java index 217b716..43c67e4 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java @@ -16,31 +16,10 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.internal.AvailablePort.*; -import static com.gemstone.gemfire.internal.AvailablePortHelper.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; -import static org.apache.commons.io.FileUtils.*; - -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; -import java.util.Collections; -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.server.CacheServer; 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.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalLocator; @@ -54,12 +33,26 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; -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.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.*; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.util.Collections; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.internal.AvailablePort.SOCKET; +import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort; +import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; +import static org.apache.commons.io.FileUtils.deleteDirectory; /** * Dunit class for testing GemFire config commands : export config @@ -104,12 +97,12 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { * Create properties for the controller VM */ final Properties localProps = new Properties(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOG_LEVEL_NAME, "info"); - localProps.setProperty(STATISTIC_SAMPLING_ENABLED_NAME, "true"); - localProps.setProperty(ENABLE_TIME_STATISTICS_NAME, "true"); - localProps.setProperty(NAME_NAME, controllerName); - localProps.setProperty(GROUPS_NAME, "G1"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOG_LEVEL, "info"); + localProps.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); + localProps.setProperty(ENABLE_TIME_STATISTICS, "true"); + localProps.setProperty(NAME, controllerName); + localProps.setProperty(GROUPS, "G1"); getSystem(localProps); Cache cache = getCache(); @@ -146,7 +139,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { assertEquals(true, cmdResult.getStatus().equals(Status.OK)); assertEquals(true, resultStr.contains("G1")); assertEquals(true, resultStr.contains(controllerName)); - assertEquals(true, resultStr.contains("archive-file-size-limit")); + assertEquals(true, resultStr.contains(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME)); assertEquals(true, !resultStr.contains("copy-on-read")); cmdResult = executeCommand(command + " --" + CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS + "=false"); @@ -167,16 +160,16 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { @Test public void testExportConfig() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, "Manager"); - localProps.setProperty(GROUPS_NAME, "Group1"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); // Create a cache in another VM (VM1) Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, "VM1"); - localProps.setProperty(GROUPS_NAME, "Group2"); + localProps.setProperty(SystemConfigurationProperties.NAME, "VM1"); + localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); } @@ -186,8 +179,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(2).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, "VM2"); - localProps.setProperty(GROUPS_NAME, "Group2"); + localProps.setProperty(SystemConfigurationProperties.NAME, "VM2"); + localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); } @@ -195,7 +188,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { // Create a cache in the local VM localProps = new Properties(); - localProps.setProperty(NAME_NAME, "Shell"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Shell"); getSystem(localProps); Cache cache = getCache(); @@ -267,8 +260,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { setUpJmxManagerOnVm0ThenConnect(null); Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, controller); - localProps.setProperty(LOG_LEVEL_NAME, "error"); + localProps.setProperty(SystemConfigurationProperties.NAME, controller); + localProps.setProperty(LOG_LEVEL, "error"); getSystem(localProps); final GemFireCacheImpl cache = (GemFireCacheImpl) getCache(); @@ -312,8 +305,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { setUpJmxManagerOnVm0ThenConnect(null); Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, controller); - localProps.setProperty(LOG_LEVEL_NAME, "error"); + localProps.setProperty(SystemConfigurationProperties.NAME, controller); + localProps.setProperty(LOG_LEVEL, "error"); getSystem(localProps); final GemFireCacheImpl cache = (GemFireCacheImpl) getCache(); @@ -322,7 +315,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, member1); + localProps.setProperty(SystemConfigurationProperties.NAME, member1); getSystem(localProps); Cache cache = getCache(); } @@ -360,8 +353,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { setUpJmxManagerOnVm0ThenConnect(null); Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, controller); - localProps.setProperty(LOG_LEVEL_NAME, "error"); + localProps.setProperty(SystemConfigurationProperties.NAME, controller); + localProps.setProperty(LOG_LEVEL, "error"); getSystem(localProps); final GemFireCacheImpl cache = (GemFireCacheImpl) getCache(); @@ -370,7 +363,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(NAME_NAME, member1); + localProps.setProperty(SystemConfigurationProperties.NAME, member1); getSystem(localProps); Cache cache = getCache(); } @@ -437,9 +430,9 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorDirectory, "locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, "Locator"); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); locatorProps.setProperty(CLUSTER_CONFIGURATION_DIR, locatorDirectory); try { @@ -465,8 +458,8 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { // Start the default manager Properties managerProps = new Properties(); - managerProps.setProperty(MCAST_PORT_NAME, "0"); - managerProps.setProperty(LOCATORS_NAME, "localhost:" + locatorPort); + managerProps.setProperty(MCAST_PORT, "0"); + managerProps.setProperty(LOCATORS, "localhost:" + locatorPort); setUpJmxManagerOnVm0ThenConnect(managerProps); // Create a cache in VM 1 @@ -475,14 +468,14 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { @Override public Object call() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locatorPort); - localProps.setProperty(LOG_LEVEL_NAME, "error"); - localProps.setProperty(GROUPS_NAME, groupName); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); + localProps.setProperty(LOG_LEVEL, "error"); + localProps.setProperty(GROUPS, groupName); getSystem(localProps); assertNotNull(getCache()); - assertEquals("error", basicGetSystem().getConfig().getAttribute(LOG_LEVEL_NAME)); + assertEquals("error", basicGetSystem().getConfig().getAttribute(LOG_LEVEL)); return null; } }); @@ -508,7 +501,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { fail("Error occurred in cluster configuration service", e); } - assertEquals("fine", gemfireProperties.get(LOG_LEVEL_NAME)); + assertEquals("fine", gemfireProperties.get(LOG_LEVEL)); } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java index 530428d..11d4c49 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java @@ -16,37 +16,13 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.jayway.awaitility.Awaitility.*; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.text.MessageFormat; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.Callable; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -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.asyncqueue.AsyncEvent; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; import com.gemstone.gemfire.compression.SnappyCompressor; 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.SharedConfiguration; @@ -68,8 +44,27 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.text.MessageFormat; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.Callable; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.TimeUnit; + +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; +import static com.jayway.awaitility.Awaitility.waitAtMost; @Category(DistributedTest.class) public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBase { @@ -407,7 +402,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas this.alterVm1Name = "VM" + this.alterVm1.getPid(); this.alterVm1.invoke(() -> { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, alterVm1Name); + localProps.setProperty(SystemConfigurationProperties.NAME, alterVm1Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); getSystem(localProps); Cache cache = getCache(); @@ -440,7 +435,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas this.alterVm2Name = "VM" + this.alterVm2.getPid(); this.alterVm2.invoke(() -> { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, alterVm2Name); + localProps.setProperty(SystemConfigurationProperties.NAME, alterVm2Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1,Group2"); getSystem(localProps); Cache cache = getCache(); @@ -776,8 +771,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas Host.getHost(0).getVM(3).invoke(() -> { final File locatorLogFile = new File("locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(DistributionConfig.NAME_NAME, "Locator"); - locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); try { @@ -792,16 +787,16 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas // Start the default manager Properties managerProps = new Properties(); - managerProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - managerProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + managerProps.setProperty(MCAST_PORT, "0"); + managerProps.setProperty(LOCATORS, "localhost:" + locatorPort); setUpJmxManagerOnVm0ThenConnect(managerProps); // Create a cache in VM 1 VM vm = Host.getHost(0).getVM(1); vm.invoke(() -> { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); getSystem(localProps); assertNotNull(getCache()); @@ -838,8 +833,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas assertTrue(cache.isClosed()); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true"); getSystem(localProps); @@ -880,8 +875,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas assertTrue(cache.isClosed()); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true"); getSystem(localProps); @@ -910,8 +905,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas Host.getHost(0).getVM(3).invoke(() -> { final File locatorLogFile = new File("locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(DistributionConfig.NAME_NAME, "Locator"); - locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); try { @@ -926,16 +921,16 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas // Start the default manager Properties managerProps = new Properties(); - managerProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - managerProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + managerProps.setProperty(MCAST_PORT, "0"); + managerProps.setProperty(LOCATORS, "localhost:" + locatorPort); setUpJmxManagerOnVm0ThenConnect(managerProps); // Create a cache in VM 1 VM vm = Host.getHost(0).getVM(1); vm.invoke(() -> { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); getSystem(localProps); assertNotNull(getCache()); @@ -990,8 +985,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas assertTrue(cache.isClosed()); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true"); getSystem(localProps); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java index c070ce9..4ed7821 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java @@ -16,18 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.Properties; -import java.util.regex.Pattern; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - 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.DistributionManager; import com.gemstone.gemfire.distributed.internal.InternalLocator; @@ -40,13 +30,20 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.remote.CommandExecutionContext; import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; -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 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.Test; +import org.junit.experimental.categories.Category; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.Properties; +import java.util.regex.Pattern; + +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.*; /** * Unit tests for the DeployCommands class @@ -102,7 +99,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final String vmName = "VM" + vm.getPid(); // Create the cache in this VM - props.setProperty(DistributionConfig.NAME_NAME, "Controller"); + props.setProperty(SystemConfigurationProperties.NAME, "Controller"); props.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); getSystem(props); getCache(); @@ -110,7 +107,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Create the cache in the other VM vm.invoke(new SerializableRunnable() { public void run() { - props.setProperty(DistributionConfig.NAME_NAME, vmName); + props.setProperty(SystemConfigurationProperties.NAME, vmName); props.setProperty(DistributionConfig.GROUPS_NAME, "Group2"); getSystem(props); getCache(); @@ -188,7 +185,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final String vmName = "VM" + vm.getPid(); // Create the cache in this VM - props.setProperty(DistributionConfig.NAME_NAME, "Controller"); + props.setProperty(SystemConfigurationProperties.NAME, "Controller"); props.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); getSystem(props); getCache(); @@ -196,7 +193,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Create the cache in the other VM vm.invoke(new SerializableRunnable() { public void run() { - props.setProperty(DistributionConfig.NAME_NAME, vmName); + props.setProperty(SystemConfigurationProperties.NAME, vmName); props.setProperty(DistributionConfig.GROUPS_NAME, "Group2"); getSystem(props); getCache(); @@ -265,7 +262,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final String vmName = "VM" + vm.getPid(); // Create the cache in this VM - props.setProperty(DistributionConfig.NAME_NAME, "Controller"); + props.setProperty(SystemConfigurationProperties.NAME, "Controller"); props.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); getSystem(props); getCache(); @@ -273,7 +270,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Create the cache in the other VM vm.invoke(new SerializableRunnable() { public void run() { - props.setProperty(DistributionConfig.NAME_NAME, vmName); + props.setProperty(SystemConfigurationProperties.NAME, vmName); props.setProperty(DistributionConfig.GROUPS_NAME, "Group2"); getSystem(props); getCache(); @@ -341,8 +338,8 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorLogPath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(DistributionConfig.NAME_NAME, "Locator"); - locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); @@ -370,9 +367,9 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Start the default manager Properties managerProps = new Properties(); - managerProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + managerProps.setProperty(MCAST_PORT, "0"); managerProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); - managerProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + managerProps.setProperty(LOCATORS, "localhost:" + locatorPort); setUpJmxManagerOnVm0ThenConnect(managerProps); // Create a JAR file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java index 8681713..fcfd16e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java @@ -16,35 +16,12 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.concurrent.CopyOnWriteArrayList; - -import com.gemstone.gemfire.cache.Cache; -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.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.Region; -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.query.data.PortfolioPdx; import com.gemstone.gemfire.compression.SnappyCompressor; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; 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.SharedConfiguration; @@ -60,17 +37,21 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.shell.Gfsh; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; -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.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.test.junit.categories.FlakyTest; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; /** * The DiskStoreCommandsDUnitTest class is a distributed test suite of test cases for testing the disk store commands @@ -102,7 +83,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { vm1.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm1Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); getSystem(localProps); Cache cache = getCache(); } @@ -298,8 +279,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { @Test public void testOfflineDiskStorePdxCommands() { final Properties props = new Properties(); - props.setProperty("mcast-port", "0"); - props.setProperty("start-locator", "localhost[" + AvailablePortHelper.getRandomAvailableTCPPort() + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(START_LOCATOR, "localhost[" + AvailablePortHelper.getRandomAvailableTCPPort() + "]"); final File diskStoreDir = new File(new File(".").getAbsolutePath(), "DiskStoreCommandDUnitDiskStores"); diskStoreDir.mkdir(); @@ -460,8 +441,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File("locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(DistributionConfig.NAME_NAME, "Locator"); - locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); try { @@ -488,8 +469,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { // Start the default manager Properties managerProps = new Properties(); - managerProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - managerProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + managerProps.setProperty(MCAST_PORT, "0"); + managerProps.setProperty(LOCATORS, "localhost:" + locatorPort); setUpJmxManagerOnVm0ThenConnect(managerProps); // Create a cache in VM 1 @@ -502,8 +483,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStoreDir.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); getSystem(localProps); assertNotNull(getCache()); @@ -540,8 +521,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { public Object call() { getCache().close(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true"); getSystem(localProps); @@ -592,8 +573,8 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { public Object call() { getCache().close(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost:" + locatorPort); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName); localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true"); getSystem(localProps); @@ -766,7 +747,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { filesToBeDeleted.add(fullBackupDirPath); Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, controllerName); + props.setProperty(SystemConfigurationProperties.NAME, controllerName); getSystem(props); @@ -781,7 +762,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { vm1.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm1Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); getSystem(localProps); Cache cache = getCache(); @@ -859,7 +840,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore1Dir2.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm1Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); getSystem(localProps); getCache(); @@ -875,7 +856,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore2Dir.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm2Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2"); getSystem(localProps); getCache(); @@ -978,7 +959,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore2Dir1.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm1Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1,Group2"); getSystem(localProps); Cache cache = getCache(); @@ -1004,7 +985,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore2Dir2.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm2Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2"); getSystem(localProps); Cache cache = getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java index 8d1252b..ba5974d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java @@ -16,19 +16,13 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.List; -import java.util.Properties; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionFactory; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionService; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.management.DistributedRegionMXBean; @@ -38,16 +32,18 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.json.GfJsonException; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; -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.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.DistributedTest; - import org.junit.Test; import org.junit.experimental.categories.Category; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; + /** * Dunit class for testing gemfire function commands : execute function, destroy function, list function */ @@ -275,7 +271,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMember() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -306,7 +302,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMembers() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -340,7 +336,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMembersWithArgs() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS); @@ -376,7 +372,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMembersWithArgsAndCustomResultCollector() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS); @@ -413,7 +409,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnGroups() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -492,7 +488,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testDestroyOnGroups() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -582,7 +578,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { vm1.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm1Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2"); getSystem(localProps); getCache(); @@ -601,7 +597,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { vm2.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, vm2Name); + localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group3"); getSystem(localProps); getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java index eed7db1..28424a5 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java @@ -16,37 +16,13 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.IgnoredException.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Random; -import java.util.Set; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.QueryInvalidException; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.CompiledValue; import com.gemstone.gemfire.cache.query.internal.QCompiler; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.management.DistributedRegionMXBean; @@ -57,11 +33,7 @@ import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.CliUtil; import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh; import com.gemstone.gemfire.management.internal.cli.domain.DataCommandRequest; -import com.gemstone.gemfire.management.internal.cli.dto.Car; -import com.gemstone.gemfire.management.internal.cli.dto.Key1; -import com.gemstone.gemfire.management.internal.cli.dto.ObjectWithCharAttr; -import com.gemstone.gemfire.management.internal.cli.dto.Value1; -import com.gemstone.gemfire.management.internal.cli.dto.Value2; +import com.gemstone.gemfire.management.internal.cli.dto.*; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.json.GfJsonArray; import com.gemstone.gemfire.management.internal.cli.json.GfJsonException; @@ -71,18 +43,20 @@ import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.S import com.gemstone.gemfire.management.internal.cli.result.ResultData; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -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.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.test.junit.categories.FlakyTest; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import java.io.File; +import java.io.IOException; +import java.util.*; + +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; /** * Dunit class for testing gemfire data commands : get, put, remove, select, rebalance @@ -130,7 +104,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { final VM vm1 = Host.getHost(0).getVM(1); final VM vm2 = Host.getHost(0).getVM(2); Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, testName + "Manager"); + props.setProperty(SystemConfigurationProperties.NAME, testName + "Manager"); HeadlessGfsh gfsh = setUpJmxManagerOnVm0ThenConnect(props); assertNotNull(gfsh); assertEquals(true, gfsh.isConnectedAndReady());
