Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4E295200B40 for ; Thu, 2 Jun 2016 02:08:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4CACB160A51; Thu, 2 Jun 2016 00:08:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 08C9B160A4D for ; Thu, 2 Jun 2016 02:08:08 +0200 (CEST) Received: (qmail 12247 invoked by uid 500); 2 Jun 2016 00:08:08 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 12238 invoked by uid 99); 2 Jun 2016 00:08:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2016 00:08:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 7F7F0C0771 for ; Thu, 2 Jun 2016 00:08:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.636 X-Spam-Level: X-Spam-Status: No, score=-4.636 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426, T_FILL_THIS_FORM_SHORT=0.01] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id t0CzgP5lLMtF for ; Thu, 2 Jun 2016 00:07:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id A651A5FE5F for ; Thu, 2 Jun 2016 00:07:48 +0000 (UTC) Received: (qmail 5762 invoked by uid 99); 2 Jun 2016 00:07:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2016 00:07:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A91DDE967C; Thu, 2 Jun 2016 00:07:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: udo@apache.org To: commits@geode.incubator.apache.org Date: Thu, 02 Jun 2016 00:07:53 -0000 Message-Id: <59e97aff4675476c9c2a48f2cd817228@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public archived-at: Thu, 02 Jun 2016 00:08:11 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java index 0194132..f284f02 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java @@ -16,24 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Host.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -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.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.management.DistributedRegionMXBean; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.ManagerMXBean; @@ -49,10 +33,21 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.test.junit.categories.DistributedTest; - import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_LEVEL; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.NAME; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Host.getHost; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; + /** * The GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest class is test suite of test cases testing the Gfsh * 'get' data command when a cache miss occurs on data in a Region with a CacheLoader defined. @@ -146,8 +141,8 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C private Properties createDistributedSystemProperties(final String gemfireName) { Properties distributedSystemProperties = new Properties(); - distributedSystemProperties.setProperty(LOG_LEVEL_NAME, GEMFIRE_LOG_LEVEL); - distributedSystemProperties.setProperty(NAME_NAME, gemfireName); + distributedSystemProperties.setProperty(LOG_LEVEL, GEMFIRE_LOG_LEVEL); + distributedSystemProperties.setProperty(NAME, gemfireName); return distributedSystemProperties; } @@ -270,7 +265,7 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C } public String getName() { - return getConfiguration().getProperty(NAME_NAME); + return getConfiguration().getProperty(SystemConfigurationProperties.NAME); } public VM getVm() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java index b27e76e..0be65d2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java @@ -16,21 +16,21 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static org.junit.Assert.*; - -import java.io.File; -import java.util.Properties; - +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import com.gemstone.gemfire.util.test.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -import com.gemstone.gemfire.util.test.TestUtil; +import java.io.File; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertEquals; /** * @since GemFire 8.1 @@ -48,10 +48,10 @@ public class HTTPServiceSSLSupportJUnitTest { @After public void tearDown() throws Exception { - System.clearProperty("gemfire.javax.net.ssl.keyStore"); - System.clearProperty("gemfire.javax.net.ssl.keyStorePassword"); - System.clearProperty("gemfire.javax.net.ssl.trustStore"); - System.clearProperty("gemfire.javax.net.ssl.trustStorePassword"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStore"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStorePassword"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStore"); + System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStorePassword"); System.clearProperty("gemfireSecurityPropertyFile"); } @@ -73,7 +73,7 @@ public class HTTPServiceSSLSupportJUnitTest { public void testSSLWithClusterSSL() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + localProps.setProperty(MCAST_PORT, "0"); localProps.setProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true"); localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME, "password"); @@ -100,15 +100,15 @@ public class HTTPServiceSSLSupportJUnitTest { public void testSSLWithDeprecatedClusterSSL_HTTPService() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + localProps.setProperty(MCAST_PORT, "0"); localProps.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true"); - System.setProperty("gemfire.javax.net.ssl.keyStore", jks.getCanonicalPath()); - System.setProperty("gemfire.javax.net.ssl.keyStorePassword", "password"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStore", jks.getCanonicalPath()); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStorePassword", "password"); localProps.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "SSL"); localProps.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true"); - System.setProperty("gemfire.javax.net.ssl.trustStore", jks.getCanonicalPath()); - System.setProperty("gemfire.javax.net.ssl.trustStorePassword", "password"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStore", jks.getCanonicalPath()); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStorePassword", "password"); DistributionConfigImpl config = new DistributionConfigImpl(localProps); @@ -128,7 +128,7 @@ public class HTTPServiceSSLSupportJUnitTest { public void testSSLWithDeprecatedClusterSSL_HTTPService_WithSSL_Properties() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + localProps.setProperty(MCAST_PORT, "0"); localProps.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true"); localProps.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "SSL"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java index 0707766..4bd6cd5 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java @@ -25,12 +25,10 @@ import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget; 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.shell.GfshConfig; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.contrib.java.lang.system.ProvideSystemProperty; import org.junit.experimental.categories.Category; @@ -38,6 +36,8 @@ import org.junit.experimental.categories.Category; import java.util.Map; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; import static com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase.commandResultToString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -57,8 +57,8 @@ public class HelpCommandsIntegrationTest { jmxPort = AvailablePortHelper.getRandomAvailableTCPPort(); Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.LOCATORS_NAME, ""); - localProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + localProps.setProperty(LOCATORS, ""); + localProps.setProperty(MCAST_PORT, "0"); localProps.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true"); localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true"); localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java index 3e6946a..456da75 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java @@ -16,21 +16,10 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; - -import java.io.File; -import java.io.IOException; -import java.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -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.*; import com.gemstone.gemfire.cache.query.Index; 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; @@ -41,20 +30,20 @@ import com.gemstone.gemfire.management.internal.cli.domain.Stock; 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.util.CommandStringBuilder; -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 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 java.io.File; +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; +import static com.gemstone.gemfire.test.dunit.Assert.*; + @Category(DistributedTest.class) public class IndexCommandsDUnitTest extends CliCommandTestBase { @@ -611,8 +600,8 @@ public class IndexCommandsDUnitTest 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 { @@ -639,8 +628,8 @@ public class IndexCommandsDUnitTest 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 @@ -649,8 +638,8 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { @Override public void run() { 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()); @@ -692,8 +681,8 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { 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); @@ -737,8 +726,8 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { 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); @@ -777,7 +766,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { @Override public Object call() throws Exception { Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, VM1Name); + props.setProperty(SystemConfigurationProperties.NAME, VM1Name); props.setProperty(DistributionConfig.GROUPS_NAME, group1); getSystem(props); Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class); @@ -811,7 +800,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { @Override public Object call() throws Exception { Properties props = new Properties(); - props.setProperty(DistributionConfig.NAME_NAME, VM1Name); + props.setProperty(SystemConfigurationProperties.NAME, VM1Name); props.setProperty(DistributionConfig.GROUPS_NAME, group1); getSystem(props); Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java index 02a5554..469ff7b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java @@ -16,30 +16,26 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Host.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; - -import java.io.Serializable; -import java.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; - import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.Serializable; +import java.util.Properties; + +import static com.gemstone.gemfire.test.dunit.Assert.assertEquals; +import static com.gemstone.gemfire.test.dunit.Assert.assertNotNull; +import static com.gemstone.gemfire.test.dunit.Host.getHost; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; + /** * The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper * functioning of the 'list disk-store' and 'describe disk-store' commands.

@@ -126,8 +122,8 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas private Properties createDistributedSystemProperties(final String gemfireName) { final Properties distributedSystemProperties = new Properties(); - distributedSystemProperties.setProperty(LOG_LEVEL_NAME, getDUnitLogLevel()); - distributedSystemProperties.setProperty(NAME_NAME, gemfireName); + distributedSystemProperties.setProperty(SystemConfigurationProperties.LOG_LEVEL, getDUnitLogLevel()); + distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName); return distributedSystemProperties; } @@ -174,7 +170,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas } public String getName() { - return getDistributedSystemConfiguration().getProperty(NAME_NAME); + return getDistributedSystemConfiguration().getProperty(SystemConfigurationProperties.NAME); } public VM getVm() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java index e747685..e190dba 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java @@ -16,22 +16,10 @@ */ 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.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.FixedPartitionAttributes; -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.util.CacheListenerAdapter; import com.gemstone.gemfire.compression.SnappyCompressor; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.RegionEntryContext; import com.gemstone.gemfire.management.cli.Result.Status; @@ -46,8 +34,12 @@ 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.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @Category(DistributedTest.class) public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase { @@ -69,11 +61,11 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase { private Properties createProperties(String name, String groups) { Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); - props.setProperty(DistributionConfig.NAME_NAME, name); + props.setProperty(SystemConfigurationProperties.NAME, name); props.setProperty(DistributionConfig.GROUPS_NAME, groups); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java index 313f782..fb50491 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java @@ -16,33 +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 java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.IndexStatistics; import com.gemstone.gemfire.cache.query.IndexType; import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.lang.MutableIdentifiable; import com.gemstone.gemfire.internal.lang.ObjectUtils; @@ -55,6 +34,16 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.Serializable; +import java.util.*; +import java.util.concurrent.atomic.AtomicLong; + +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; /** * The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell @@ -138,7 +127,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { final Properties distributedSystemProperties = new Properties(); distributedSystemProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel()); - distributedSystemProperties.setProperty(DistributionConfig.NAME_NAME, gemfireName); + distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName); return distributedSystemProperties; } @@ -328,7 +317,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { } public String getName() { - return getConfiguration().getProperty(DistributionConfig.NAME_NAME); + return getConfiguration().getProperty(SystemConfigurationProperties.NAME); } public VM getVm() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java index c8e0ed9..fb21bf3 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java @@ -16,33 +16,10 @@ */ 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.NetworkUtils.*; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -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.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.FixedPartitionAttributes; -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.distributed.DistributedMember; import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -57,6 +34,18 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; 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.IOException; +import java.util.*; + +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.assertEquals; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName; @Category(DistributedTest.class) public class MemberCommandsDUnitTest extends JUnit4CacheTestCase { @@ -88,11 +77,11 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase { private Properties createProperties(String name, String groups) { Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); - props.setProperty(DistributionConfig.NAME_NAME, name); + props.setProperty(SystemConfigurationProperties.NAME, name); props.setProperty(DistributionConfig.GROUPS_NAME, groups); return props; } @@ -180,8 +169,8 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase { private Properties createProperties(Host host, int locatorPort) { Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, getServerHostName(host) + "[" + locatorPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, getServerHostName(host) + "[" + locatorPort + "]"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java index 5238765..a4d5496 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java @@ -16,22 +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.IgnoredException.*; -import static com.gemstone.gemfire.test.dunit.Invoke.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.IOException; -import java.util.List; -import java.util.Properties; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -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.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.lang.ThreadUtils; @@ -39,24 +25,25 @@ import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.cli.Result.Status; import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh; 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.result.CompositeResultData; +import com.gemstone.gemfire.management.internal.cli.result.*; import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData; -import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder; -import com.gemstone.gemfire.management.internal.cli.result.ResultData; -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 com.gemstone.gemfire.test.junit.categories.FlakyTest; - import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.IOException; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException; +import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM; +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 : GC, Shutdown */ @@ -71,7 +58,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { invokeInEveryVM(new SerializableRunnable("reset log level") { public void run() { if (cachedLogLevel != null) { - System.setProperty("gemfire.log-level", cachedLogLevel); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, cachedLogLevel); cachedLogLevel = null; } } @@ -82,7 +69,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { @Test public void testGCForGroup() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); String command = "gc --group=Group1"; @@ -137,7 +124,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { public void testShowLogDefault() throws IOException { Properties props = new Properties(); try { - props.setProperty("log-file", "testShowLogDefault.log"); + props.setProperty(DistributionConfig.LOG_FILE_NAME, "testShowLogDefault.log"); setUpJmxManagerOnVm0ThenConnect(props); final VM vm1 = Host.getHost(0).getVM(0); final String vm1MemberId = (String) vm1.invoke(() -> getMemberId()); @@ -159,7 +146,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { @Test public void testShowLogNumLines() { Properties props = new Properties(); - props.setProperty("log-file", "testShowLogNumLines.log"); + props.setProperty(DistributionConfig.LOG_FILE_NAME, "testShowLogNumLines.log"); try { setUpJmxManagerOnVm0ThenConnect(props); final VM vm1 = Host.getHost(0).getVM(0); @@ -414,7 +401,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { String serverName1 = (String) vm0.invoke(new SerializableCallable() { @Override public Object call() throws Exception { - cachedLogLevel = System.getProperty("gemfire.log-level"); + cachedLogLevel = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "log-level"); return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId(); } }); @@ -422,7 +409,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { String serverName2 = (String) vm1.invoke(new SerializableCallable() { @Override public Object call() throws Exception { - cachedLogLevel = System.getProperty("gemfire.log-level"); + cachedLogLevel = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "log-level"); return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId(); } }); @@ -452,7 +439,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { @Test public void testChangeLogLevelForGrps() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0"); final VM vm1 = Host.getHost(0).getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java index 57b94db..a60cf6c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java @@ -16,19 +16,11 @@ */ 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.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -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.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.FileUtil; import com.gemstone.gemfire.internal.logging.LogWriterImpl; @@ -39,10 +31,19 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; 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 java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Properties; + +import static com.gemstone.gemfire.test.dunit.Assert.assertEquals; +import static com.gemstone.gemfire.test.dunit.Assert.fail; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; + /** * Dunit class for testing gemfire function commands : export logs */ @@ -85,7 +86,7 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes @Test public void testExportLogsForGroup() throws IOException { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Manager"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); String dir = getCurrentTimeString(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java index ef26a59..d58a226 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java @@ -16,21 +16,10 @@ */ 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.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.CopyOnWriteArrayList; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; 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; @@ -46,10 +35,23 @@ 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.junit.categories.DistributedTest; - import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CopyOnWriteArrayList; + +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.gemstone.gemfire.test.dunit.Wait.waitForCriterion; + /** * A distributed test suite of test cases for testing the queue commands that are part of Gfsh. * @@ -90,7 +92,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { diskStoreDir.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(); @@ -102,7 +104,7 @@ public class QueueCommandsDUnitTest 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, "Group2"); getSystem(localProps); getCache(); @@ -257,8 +259,8 @@ public class QueueCommandsDUnitTest 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 { @@ -285,8 +287,8 @@ public class QueueCommandsDUnitTest 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 @@ -295,8 +297,8 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { @Override public void run() { 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()); @@ -360,8 +362,8 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { 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/SharedConfigurationCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java index 334d2e1..a77aeee 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java @@ -16,25 +16,11 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.internal.AvailablePortHelper.*; -import static com.gemstone.gemfire.management.internal.cli.CliUtil.*; -import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Host.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.NetworkUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.File; -import java.io.IOException; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.InternalLocator; import com.gemstone.gemfire.distributed.internal.SharedConfiguration; import com.gemstone.gemfire.internal.ClassBuilder; @@ -50,10 +36,24 @@ 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.junit.categories.DistributedTest; - import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.File; +import java.io.IOException; +import java.util.Properties; +import java.util.Set; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts; +import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers; +import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Host.getHost; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.NetworkUtils.getIPLiteral; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; + /** * DUnit test to test export and import of shared configuration. */ @@ -133,15 +133,15 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locator1LogFilePath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, locator1Name); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "config"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_START_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS_NAME, String.valueOf(locator1JmxHost)); - locatorProps.setProperty(JMX_MANAGER_PORT_NAME, String.valueOf(locator1JmxPort)); - locatorProps.setProperty(HTTP_SERVICE_PORT_NAME, String.valueOf(locator1HttpPort)); + locatorProps.setProperty(NAME, locator1Name); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "config"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); + locatorProps.setProperty(JMX_MANAGER, "true"); + locatorProps.setProperty(JMX_MANAGER_START, "true"); + locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS, String.valueOf(locator1JmxHost)); + locatorProps.setProperty(JMX_MANAGER_PORT, String.valueOf(locator1JmxPort)); + locatorProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(locator1HttpPort)); try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); @@ -175,10 +175,10 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase { @Override public Object call() { Properties localProps = new Properties(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port); - localProps.setProperty(GROUPS_NAME, groupName); - localProps.setProperty(NAME_NAME, "DataMember"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locator1Port); + localProps.setProperty(GROUPS, groupName); + localProps.setProperty(SystemConfigurationProperties.NAME, "DataMember"); getSystem(localProps); Cache cache = getCache(); assertNotNull(cache); @@ -286,11 +286,11 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase { public void run() { final File locatorLogFile = new File(locator2LogFilePath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, locator2Name); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "fine"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); - locatorProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port); + locatorProps.setProperty(SystemConfigurationProperties.NAME, locator2Name); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "fine"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); + locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port); try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null, locatorProps); @@ -317,8 +317,8 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase { assertNotNull(clusterConfig); assertTrue(clusterConfig.getCacheXmlContent().contains(region2Name)); assertTrue(clusterConfig.getJarNames().contains(deployedJarName)); - assertTrue(clusterConfig.getGemfireProperties().getProperty(LOG_LEVEL_NAME).equals(logLevel)); - assertTrue(clusterConfig.getGemfireProperties().getProperty(STATISTIC_ARCHIVE_FILE_NAME).equals(startArchiveFileName)); + assertTrue(clusterConfig.getGemfireProperties().getProperty(LOG_LEVEL).equals(logLevel)); + assertTrue(clusterConfig.getGemfireProperties().getProperty(STATISTIC_ARCHIVE_FILE).equals(startArchiveFileName)); } catch (IOException e) { fail("Unable to create a locator with a shared configuration", e); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java index fec6c5e..06ebd15 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java @@ -16,15 +16,10 @@ */ 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.File; -import java.util.concurrent.TimeUnit; - import com.gemstone.gemfire.distributed.AbstractLauncher.Status; import com.gemstone.gemfire.distributed.LocatorLauncher; import com.gemstone.gemfire.distributed.LocatorLauncher.LocatorState; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.internal.util.IOUtils; @@ -36,10 +31,15 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; 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 java.io.File; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; + @Category(DistributedTest.class) public class ShellCommandsDUnitTest extends CliCommandTestBase { @@ -63,11 +63,11 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase { final int jmxManagerPort = ports[0]; final int locatorPort = ports[1]; - System.setProperty("gemfire.jmx-manager-port", String.valueOf(jmxManagerPort)); - System.setProperty("gemfire.jmx-manager-http-port", "0"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port", String.valueOf(jmxManagerPort)); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-http-port", "0"); - assertEquals(String.valueOf(jmxManagerPort), System.getProperty("gemfire.jmx-manager-port")); - assertEquals("0", System.getProperty("gemfire.jmx-manager-http-port")); + assertEquals(String.valueOf(jmxManagerPort), System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port")); + assertEquals("0", System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-http-port")); final String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); final File workingDirectory = new File(pathname); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java index df01f14..42ef6eb 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java @@ -16,24 +16,6 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Invoke.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionContext; @@ -55,6 +37,20 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; 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.IOException; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; /** * This DUnit tests uses same code as GemFireDeadlockDetectorDUnitTest and uses the command processor for executing the @@ -166,7 +162,7 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { private Properties createProperties(Host host, int locatorPort) { Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); // props.setProperty(DistributionConfig.LOCATORS_NAME, getServerHostName(host) + "[" + locatorPort + "]"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java index 2a20672..cc7017a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java @@ -16,45 +16,36 @@ */ 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.Collections; -import java.util.Properties; -import javax.management.ObjectName; - 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.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.management.CacheServerMXBean; -import com.gemstone.gemfire.management.DistributedRegionMXBean; -import com.gemstone.gemfire.management.DistributedSystemMXBean; -import com.gemstone.gemfire.management.ManagementService; -import com.gemstone.gemfire.management.MemberMXBean; -import com.gemstone.gemfire.management.RegionMXBean; +import com.gemstone.gemfire.management.*; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.cli.Result.Status; 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.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 javax.management.ObjectName; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.Properties; + +import static com.gemstone.gemfire.test.dunit.Assert.assertEquals; +import static com.gemstone.gemfire.test.dunit.Assert.assertTrue; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; + @Category(DistributedTest.class) public class ShowMetricsDUnitTest extends CliCommandTestBase { @@ -62,7 +53,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase { private void createLocalSetUp() { Properties localProps = new Properties(); - localProps.setProperty(DistributionConfig.NAME_NAME, "Controller"); + localProps.setProperty(SystemConfigurationProperties.NAME, "Controller"); getSystem(localProps); Cache cache = getCache(); RegionFactory dataRegionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE); @@ -83,7 +74,7 @@ public class ShowMetricsDUnitTest 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(); @@ -126,7 +117,7 @@ public class ShowMetricsDUnitTest 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(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java index 2614091..61a20d9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java @@ -16,13 +16,7 @@ */ 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.File; -import java.io.IOException; -import java.util.Properties; - +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result.Status; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; @@ -32,10 +26,18 @@ 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.junit.categories.DistributedTest; - import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.File; +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.assertFalse; +import static com.gemstone.gemfire.test.dunit.Assert.assertTrue; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; + /*** * DUnit test for 'show stack-trace' command */ @@ -51,11 +53,11 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase { private Properties createProperties(Host host, String name, String groups) { Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); - props.setProperty(DistributionConfig.NAME_NAME, name); + props.setProperty(SystemConfigurationProperties.NAME, name); props.setProperty(DistributionConfig.GROUPS_NAME, groups); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java index d02dff5..ee80360 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java @@ -16,13 +16,6 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Properties; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassBuilder; import com.gemstone.gemfire.internal.ClassPathLoader; @@ -33,10 +26,16 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; 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.FileOutputStream; +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.test.dunit.Assert.assertEquals; + /** * Unit tests for configuring user commands. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java index 9f84a36..6e55000 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java @@ -16,12 +16,7 @@ */ package com.gemstone.gemfire.management.internal.cli.functions; -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.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.management.internal.cli.domain.DataCommandResult; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.AfterClass; @@ -31,6 +26,7 @@ import org.junit.experimental.categories.Category; import java.util.List; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -87,7 +83,7 @@ public class DataCommandFunctionJUnitTest { @BeforeClass public static void setUp() throws Exception { cache = new CacheFactory(). - set(DistributionConfig.MCAST_PORT_NAME, "0"). + set(MCAST_PORT, "0"). create(); RegionFactory factory = cache.createRegionFactory(RegionShortcut.PARTITION); region1 = factory.create(PARTITIONED_REGION); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java index f0c685b..e6ee71b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java @@ -16,30 +16,12 @@ */ package com.gemstone.gemfire.management.internal.configuration; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.internal.AvailablePortHelper.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Host.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.DiskStoreFactory; import com.gemstone.gemfire.cache.RegionFactory; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DM; import com.gemstone.gemfire.distributed.internal.InternalLocator; import com.gemstone.gemfire.distributed.internal.SharedConfiguration; @@ -57,6 +39,19 @@ import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; 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.IOException; +import java.net.InetAddress; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Host.getHost; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; /** * Tests the starting up of shared configuration, installation of {@link ConfigurationRequestHandler} @@ -99,10 +94,10 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator1Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, locator1Name); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "fine"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, locator1Name); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "fine"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); @@ -148,11 +143,11 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator2Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, locator2Name); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "fine"); - locatorProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, locator2Name); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "fine"); + locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null, locatorProps); @@ -234,10 +229,10 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator1Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, "Locator1"); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "info"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator1"); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "info"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); @@ -266,9 +261,9 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { @Override public Object call() { Properties localProps = new Properties(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port); - localProps.setProperty(GROUPS_NAME, testGroup); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locator1Port); + localProps.setProperty(GROUPS, testGroup); getSystem(localProps); Cache cache = getCache(); @@ -293,7 +288,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { assertTrue(scw.addXmlEntity(xmlEntity, new String[] {testGroup})); //Modify property and cache attributes Properties clusterProperties = new Properties(); - clusterProperties.setProperty(LOG_LEVEL_NAME, clusterLogLevel); + clusterProperties.setProperty(LOG_LEVEL, clusterLogLevel); XmlEntity cacheEntity = XmlEntity.builder().withType(CacheXml.CACHE).build(); Map cacheAttributes = new HashMap(); cacheAttributes.put(CacheXml.COPY_ON_READ, "true"); @@ -301,7 +296,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { //assertTrue(scw.modifyProperties(clusterProperties, null)); // TODO: why is this commented out? assertTrue(scw.modifyPropertiesAndCacheAttributes(clusterProperties, cacheEntity, null)); - clusterProperties.setProperty(LOG_LEVEL_NAME, groupLogLevel); + clusterProperties.setProperty(LOG_LEVEL, groupLogLevel); assertTrue(scw.modifyPropertiesAndCacheAttributes(clusterProperties, cacheEntity, new String[]{testGroup})); //Add a jar @@ -326,11 +321,11 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator2Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, "Locator2"); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "info"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); - locatorProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port); + locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator2"); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "info"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); + locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port); try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null, locatorProps); @@ -358,14 +353,14 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { assertNotNull(clusterConfig); assertNotNull(clusterConfig.getJarNames()); assertTrue(clusterConfig.getJarNames().contains("foo.jar")); - assertTrue(clusterConfig.getGemfireProperties().getProperty(LOG_LEVEL_NAME).equals(clusterLogLevel)); + assertTrue(clusterConfig.getGemfireProperties().getProperty(LOG_LEVEL).equals(clusterLogLevel)); assertNotNull(clusterConfig.getCacheXmlContent()); Configuration testGroupConfiguration = entireConfiguration.get(testGroup); assertNotNull(testGroupConfiguration); assertNotNull(testGroupConfiguration.getJarNames()); assertTrue(testGroupConfiguration.getJarNames().contains("bar.jar")); - assertTrue(testGroupConfiguration.getGemfireProperties().getProperty(LOG_LEVEL_NAME).equals(groupLogLevel)); + assertTrue(testGroupConfiguration.getGemfireProperties().getProperty(LOG_LEVEL).equals(groupLogLevel)); assertNotNull(testGroupConfiguration.getCacheXmlContent()); assertTrue(testGroupConfiguration.getCacheXmlContent().contains(REGION1)); @@ -400,13 +395,13 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { assertNull(configResponse.getJarNames()); assertNull(configResponse.getJars()); assertTrue(clusterConfiguration.getJarNames().isEmpty()); - assertTrue(clusterConfiguration.getGemfireProperties().getProperty(LOG_LEVEL_NAME).equals(clusterLogLevel)); + assertTrue(clusterConfiguration.getGemfireProperties().getProperty(LOG_LEVEL).equals(clusterLogLevel)); Configuration testGroupConfiguration = requestedConfiguration.get(testGroup); assertNotNull(testGroupConfiguration); assertFalse(testGroupConfiguration.getCacheXmlContent().contains(REGION1)); assertTrue(testGroupConfiguration.getJarNames().isEmpty()); - assertTrue(testGroupConfiguration.getGemfireProperties().getProperty(LOG_LEVEL_NAME).equals(groupLogLevel)); + assertTrue(testGroupConfiguration.getGemfireProperties().getProperty(LOG_LEVEL).equals(groupLogLevel)); GemFireCacheImpl cache = (GemFireCacheImpl) getCache(); Map> locatorsWithSharedConfiguration = cache.getDistributionManager().getAllHostedLocatorsWithSharedConfiguration();