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 111A9200B95 for ; Tue, 13 Sep 2016 03:40:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0FB93160AD6; Tue, 13 Sep 2016 01:40:54 +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 5E7AA160AC8 for ; Tue, 13 Sep 2016 03:40:53 +0200 (CEST) Received: (qmail 31374 invoked by uid 500); 13 Sep 2016 01:40:52 -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 31365 invoked by uid 99); 13 Sep 2016 01:40:52 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2016 01:40:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id F23011A72E3 for ; Tue, 13 Sep 2016 01:40:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id agcQap3RxhIh for ; Tue, 13 Sep 2016 01:40:49 +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 126455F299 for ; Tue, 13 Sep 2016 01:40:47 +0000 (UTC) Received: (qmail 29891 invoked by uid 99); 13 Sep 2016 01:40: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; Tue, 13 Sep 2016 01:40:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1568BE089E; Tue, 13 Sep 2016 01:40: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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-420: Fixing tests after merge Date: Tue, 13 Sep 2016 01:40:47 +0000 (UTC) archived-at: Tue, 13 Sep 2016 01:40:54 -0000 Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-420 0b579cfea -> 79d9b0149 GEODE-420: Fixing tests after merge Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/79d9b014 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/79d9b014 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/79d9b014 Branch: refs/heads/feature/GEODE-420 Commit: 79d9b0149c3f6b9dfce3f6cb7c442ef5faf77e4e Parents: 0b579cf Author: Udo Kohlmeyer Authored: Tue Sep 13 11:40:37 2016 +1000 Committer: Udo Kohlmeyer Committed: Tue Sep 13 11:40:37 2016 +1000 ---------------------------------------------------------------------- .../internal/InternalDistributedSystemJUnitTest.java | 6 ++---- .../com/gemstone/gemfire/codeAnalysis/excludedClasses.txt | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/79d9b014/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java index 6695371..5c70a78 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java @@ -40,7 +40,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; -import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.Locator; @@ -57,8 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; * @since GemFire 2.1 */ @Category(IntegrationTest.class) -public class InternalDistributedSystemJUnitTest -{ +public class InternalDistributedSystemJUnitTest { /** * A connection to a distributed system created by this test @@ -714,7 +712,7 @@ public class InternalDistributedSystemJUnitTest Properties props = getCommonProperties(); props.setProperty(SSL_ENABLED_COMPONENTS, "cluster,server"); Config config1 = new DistributionConfigImpl(props, false); - assertEquals("cluster server", config1.getAttribute(SSL_ENABLED_COMPONENTS)); + assertEquals("cluster,server", config1.getAttribute(SSL_ENABLED_COMPONENTS)); } @Rule http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/79d9b014/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt index 5e5a4c4..4d27e43 100644 --- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt +++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt @@ -154,3 +154,4 @@ org/apache/geode/security/ResourcePermission org/apache/geode/security/ResourcePermission$Operation org/apache/geode/security/ResourcePermission$Resource com/gemstone/gemfire/distributed/internal/tcpserver/LocatorCancelException +com.gemstone.gemfire.internal.security.SecurableCommunicationChannel