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 <[email protected]> Authored: Tue Sep 13 11:40:37 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> 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
