[geode] branch feature/GEODE-4451-2 updated: GEODE-4451: Refactored test to use ConfigurationProperties

[boglesby]

This is an automated email from the ASF dual-hosted git repository.

boglesby pushed a commit to branch feature/GEODE-4451-2
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-4451-2 by this 
push:
     new e01da7a  GEODE-4451: Refactored test to use ConfigurationProperties
e01da7a is described below

commit e01da7a402828e2eea4eaabf2e67afbd2d0064cc
Author: Barry Oglesby <bogle...@pivotal.io>
AuthorDate: Wed Mar 21 11:21:49 2018 -0700

    GEODE-4451: Refactored test to use ConfigurationProperties
---
 .../cache/wan/WANRollingUpgradeDUnitTest.java      | 35 +++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git 
a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
 
b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
index 570c3b6..cf7c7b1 100644
--- 
a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
+++ 
b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
@@ -14,6 +14,15 @@
  */
 package org.apache.geode.cache.wan;
 
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -42,7 +51,6 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.AvailablePortHelper;
@@ -572,9 +580,9 @@ public class WANRollingUpgradeDUnitTest extends 
JUnit4CacheTestCase {
       String remoteLocators) throws IOException {
     Properties props = getLocatorProperties(distributedSystemId, locators, 
remoteLocators);
     int jmxPort = AvailablePortHelper.getRandomAvailableTCPPort();
-    props.put(DistributionConfig.JMX_MANAGER_PORT_NAME, 
String.valueOf(jmxPort));
-    props.put(DistributionConfig.JMX_MANAGER_NAME, "true");
-    props.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
+    props.put(JMX_MANAGER_PORT, String.valueOf(jmxPort));
+    props.put(JMX_MANAGER, "true");
+    props.put(JMX_MANAGER_START, "true");
     Locator.startLocatorAndDS(port, null, props);
     return jmxPort;
   }
@@ -582,13 +590,12 @@ public class WANRollingUpgradeDUnitTest extends 
JUnit4CacheTestCase {
   private Properties getLocatorProperties(int distributedSystemId, String 
locators,
       String remoteLocators) {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME,
-        String.valueOf(distributedSystemId));
-    props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
-    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, remoteLocators);
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, 
DUnitLauncher.logLevel);
-    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, 
"false");
+    props.setProperty(MCAST_PORT, "0");
+    props.setProperty(DISTRIBUTED_SYSTEM_ID, 
String.valueOf(distributedSystemId));
+    props.setProperty(LOCATORS, locators);
+    props.setProperty(REMOTE_LOCATORS, remoteLocators);
+    props.setProperty(LOG_LEVEL, DUnitLauncher.logLevel);
+    props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
     return props;
   }
 
@@ -810,9 +817,9 @@ public class WANRollingUpgradeDUnitTest extends 
JUnit4CacheTestCase {
 
   private void createCache(String locators) {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, 
DUnitLauncher.logLevel);
+    props.setProperty(MCAST_PORT, "0");
+    props.setProperty(LOCATORS, locators);
+    props.setProperty(LOG_LEVEL, DUnitLauncher.logLevel);
     getCache(props);
   }
 

-- 
To stop receiving notification emails like this one, please contact
bogle...@apache.org.