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 6D76B200B73 for ; Mon, 29 Aug 2016 23:39:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6C0F1160AC9; Mon, 29 Aug 2016 21:39:13 +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 6F44B160ACA for ; Mon, 29 Aug 2016 23:39:12 +0200 (CEST) Received: (qmail 10844 invoked by uid 500); 29 Aug 2016 21:39:11 -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 10816 invoked by uid 99); 29 Aug 2016 21:39:11 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2016 21:39:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 239C7CDB8C for ; Mon, 29 Aug 2016 21:39:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.739 X-Spam-Level: X-Spam-Status: No, score=-3.739 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=-0.519] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id wvaMRADEk1kB for ; Mon, 29 Aug 2016 21:39:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id BBB6160CE1 for ; Mon, 29 Aug 2016 21:39:04 +0000 (UTC) Received: (qmail 6004 invoked by uid 99); 29 Aug 2016 21:39:03 -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; Mon, 29 Aug 2016 21:39:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ACE34E0C09; Mon, 29 Aug 2016 21:39:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hiteshkhamesra@apache.org To: commits@geode.incubator.apache.org Date: Mon, 29 Aug 2016 21:39:15 -0000 Message-Id: <2ab2c3370d784283881e19b94d9b790c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/24] incubator-geode git commit: GEODE-1372 DS property name change and junit fix archived-at: Mon, 29 Aug 2016 21:39:13 -0000 GEODE-1372 DS property name change and junit fix Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f53f5c20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f53f5c20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f53f5c20 Branch: refs/heads/develop Commit: f53f5c209a25d43c98afefd02da17623ff459a9a Parents: 26898ef Author: Hitesh Khamesra Authored: Tue Jun 14 18:01:33 2016 -0700 Committer: Hitesh Khamesra Committed: Mon Aug 29 10:39:18 2016 -0700 ---------------------------------------------------------------------- .../ReconnectWithUDPSecurityDUnitTest.java | 2 +- .../LocatorUDPSecurityDUnitTest.java | 2 +- .../internal/DistributionConfigJUnitTest.java | 4 +- .../membership/MembershipJUnitTest.java | 4 +- .../gms/messenger/GMSEncryptJUnitTest.java | 4 +- .../messenger/JGroupsMessengerJUnitTest.java | 62 ++++++++++---------- 6 files changed, 40 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f53f5c20/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java index 23762a6..bbd35d9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java @@ -3,7 +3,7 @@ package com.gemstone.gemfire.cache30; import java.util.Properties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; +import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; public class ReconnectWithUDPSecurityDUnitTest extends ReconnectDUnitTest{ public ReconnectWithUDPSecurityDUnitTest() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f53f5c20/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java index fe840db..08cf40a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; -import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; +import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest{ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f53f5c20/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java index 6d6f36d..2b8bd14 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java @@ -81,7 +81,7 @@ public class DistributionConfigJUnitTest { @Test public void testGetAttributeNames() { String[] attNames = AbstractDistributionConfig._getAttNames(); - assertEquals(attNames.length, 144); + assertEquals(attNames.length, 145); List boolList = new ArrayList(); List intList = new ArrayList(); @@ -115,7 +115,7 @@ public class DistributionConfigJUnitTest { assertEquals(boolList.size(), 30); assertEquals(intList.size(), 33); - assertEquals(stringList.size(), 73); + assertEquals(stringList.size(), 74); assertEquals(fileList.size(), 5); assertEquals(otherList.size(), 3); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f53f5c20/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java index 14884de..78898ce 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; +import com.gemstone.gemfire.distributed.ConfigurationProperties; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil; @@ -261,7 +261,7 @@ public class MembershipJUnitTest { nonDefault.put(DistributionConfig.GROUPS_NAME, "red, blue"); nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000"); nonDefault.put(DistributionConfig.LOCATORS_NAME, localHost.getHostName()+'['+port+']'); - nonDefault.put(DistributedSystemConfigProperties.SECURITY_CLIENT_DHALGO, "AES:128"); + nonDefault.put(ConfigurationProperties.SECURITY_UDP_DHALGO, "AES:128"); DistributionConfigImpl config = new DistributionConfigImpl(nonDefault); RemoteTransportConfig transport = new RemoteTransportConfig(config, DistributionManager.NORMAL_DM_TYPE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f53f5c20/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java index dc52024..2b1ae26 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java @@ -1,7 +1,7 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.messenger; import static org.mockito.Mockito.*; -import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; +import com.gemstone.gemfire.distributed.ConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.distributed.internal.DistributionManager; @@ -53,7 +53,7 @@ public class GMSEncryptJUnitTest { private void initMocks(String algo) throws Exception { Properties nonDefault = new Properties(); - nonDefault.put(DistributedSystemConfigProperties.SECURITY_UDP_DHALGO, algo); + nonDefault.put(ConfigurationProperties.SECURITY_UDP_DHALGO, algo); DistributionConfigImpl config = new DistributionConfigImpl(nonDefault); RemoteTransportConfig tconfig = new RemoteTransportConfig(config, DistributionManager.NORMAL_DM_TYPE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f53f5c20/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java index 4608f1d..703a241 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java @@ -16,6 +16,34 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms.messenger; +import com.gemstone.gemfire.ForcedDisconnectException; +import com.gemstone.gemfire.GemFireIOException; +import com.gemstone.gemfire.distributed.ConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; +import com.gemstone.gemfire.distributed.internal.*; +import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import com.gemstone.gemfire.distributed.internal.membership.NetView; +import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; +import com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig; +import com.gemstone.gemfire.distributed.internal.membership.gms.Services; +import com.gemstone.gemfire.distributed.internal.membership.gms.Services.Stopper; +import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.HealthMonitor; +import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.JoinLeave; +import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Manager; +import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.MessageHandler; +import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorRequest; +import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse; +import com.gemstone.gemfire.distributed.internal.membership.gms.messages.InstallViewMessage; +import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinRequestMessage; +import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinResponseMessage; +import com.gemstone.gemfire.distributed.internal.membership.gms.messages.LeaveRequestMessage; +import com.gemstone.gemfire.distributed.internal.membership.gms.messenger.JGroupsMessenger.JGroupsReceiver; +import com.gemstone.gemfire.internal.*; +import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import com.gemstone.gemfire.internal.cache.DistributedCacheOperation; +import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; + import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; import static org.junit.Assert.*; import static org.mockito.Matchers.*; @@ -47,44 +75,18 @@ import org.junit.After; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.distributed.internal.DistributionManager; import com.gemstone.gemfire.distributed.internal.DistributionMessage; import com.gemstone.gemfire.distributed.internal.DistributionStats; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.SerialAckedMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; -import com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services.Stopper; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.HealthMonitor; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.JoinLeave; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Manager; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.MessageHandler; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorRequest; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.InstallViewMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinRequestMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinResponseMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.LeaveRequestMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messenger.JGroupsMessenger.JGroupsReceiver; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.DataSerializableFixedID; import com.gemstone.gemfire.internal.HeapDataOutputStream; import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; -import com.gemstone.gemfire.internal.cache.DistributedCacheOperation; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @Category(IntegrationTest.class) public class JGroupsMessengerJUnitTest { @@ -921,7 +923,7 @@ public class JGroupsMessengerJUnitTest { InternalDistributedMember otherMbr = new InternalDistributedMember("localhost", 8888); Properties p = new Properties(); - p.put(DistributedSystemConfigProperties.SECURITY_UDP_DHALGO, "AES:128"); + p.put(ConfigurationProperties.SECURITY_UDP_DHALGO, "AES:128"); initMocks(false, p); NetView v = createView(otherMbr); @@ -956,7 +958,7 @@ public class JGroupsMessengerJUnitTest { InternalDistributedMember otherMbr = new InternalDistributedMember("localhost", 8888); Properties p = new Properties(); - p.put(DistributedSystemConfigProperties.SECURITY_UDP_DHALGO, "AES:128"); + p.put(ConfigurationProperties.SECURITY_UDP_DHALGO, "AES:128"); initMocks(false, p); NetView v = createView(otherMbr); @@ -994,7 +996,7 @@ public class JGroupsMessengerJUnitTest { InternalDistributedMember otherMbr = new InternalDistributedMember("localhost", 8888); Properties p = new Properties(); - p.put(DistributedSystemConfigProperties.SECURITY_UDP_DHALGO, "AES:128"); + p.put(ConfigurationProperties.SECURITY_UDP_DHALGO, "AES:128"); initMocks(false, p); NetView v = createView(otherMbr); @@ -1026,7 +1028,7 @@ public class JGroupsMessengerJUnitTest { InternalDistributedMember otherMbr = new InternalDistributedMember("localhost", 8888); Properties p = new Properties(); - p.put(DistributedSystemConfigProperties.SECURITY_UDP_DHALGO, "AES:128"); + p.put(ConfigurationProperties.SECURITY_UDP_DHALGO, "AES:128"); initMocks(false, p); NetView v = createView(otherMbr);