You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/08/21 21:51:37 UTC
geode git commit: GEODE-3430: fix varargs usage
Repository: geode
Updated Branches:
refs/heads/develop 2924ef1d0 -> c4def6bbb
GEODE-3430: fix varargs usage
Also, general cleanup of ConnectCommandTest.
This closes #727
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c4def6bb
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c4def6bb
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c4def6bb
Branch: refs/heads/develop
Commit: c4def6bbb3d8c438cdc8d4b6d31e3e3875f6ab2b
Parents: 2924ef1
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Aug 21 10:12:08 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Aug 21 14:44:53 2017 -0700
----------------------------------------------------------------------
.../cli/commands/ConnectCommandTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c4def6bb/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
index 3a5c584..80bd705 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
@@ -54,9 +54,7 @@ public class ConnectCommandTest {
public static GfshParserRule gfshParserRule = new GfshParserRule();
private ConnectCommand connectCommand;
-
- private Gfsh gfsh = mock(Gfsh.class);
-
+ private Gfsh gfsh;
private CommandResult result;
private Properties properties;
private ArgumentCaptor<File> fileCaptor;
@@ -64,6 +62,7 @@ public class ConnectCommandTest {
@Before
public void before() throws Exception {
properties = new Properties();
+ gfsh = mock(Gfsh.class);
when(gfsh.getOperationInvoker()).thenReturn(mock(OperationInvoker.class));
// using spy instead of mock because we want to call the real method when we do connect
connectCommand = spy(ConnectCommand.class);
@@ -107,8 +106,8 @@ public class ConnectCommandTest {
}
@Test
- public void notPromptForPasswordIfuserNameisGivenInFile() throws Exception {
- // username specified in property file won't promot for password
+ public void notPromptForPasswordIfuserNameIsGivenInFile() throws Exception {
+ // username specified in property file won't prompt for password
properties.setProperty("security-username", "user");
doReturn(properties).when(connectCommand).loadProperties(any(File.class));
@@ -245,25 +244,25 @@ public class ConnectCommandTest {
@Test
public void containsLegacySSLConfigTest_ssl() throws Exception {
properties.setProperty(SSL_KEYSTORE, "keystore");
- assertThat(connectCommand.containsLegacySSLConfig(properties)).isFalse();
+ assertThat(ConnectCommand.containsLegacySSLConfig(properties)).isFalse();
}
@Test
public void containsLegacySSLConfigTest_cluster() throws Exception {
properties.setProperty(CLUSTER_SSL_KEYSTORE, "cluster-keystore");
- assertThat(connectCommand.containsLegacySSLConfig(properties)).isTrue();
+ assertThat(ConnectCommand.containsLegacySSLConfig(properties)).isTrue();
}
@Test
public void containsLegacySSLConfigTest_jmx() throws Exception {
properties.setProperty(JMX_MANAGER_SSL_KEYSTORE, "jmx-keystore");
- assertThat(connectCommand.containsLegacySSLConfig(properties)).isTrue();
+ assertThat(ConnectCommand.containsLegacySSLConfig(properties)).isTrue();
}
@Test
public void containsLegacySSLConfigTest_http() throws Exception {
properties.setProperty(HTTP_SERVICE_SSL_KEYSTORE, "http-keystore");
- assertThat(connectCommand.containsLegacySSLConfig(properties)).isTrue();
+ assertThat(ConnectCommand.containsLegacySSLConfig(properties)).isTrue();
}
@Test
@@ -274,7 +273,8 @@ public class ConnectCommandTest {
@Test
public void isSslImpliedByOptions() throws Exception {
- assertThat(connectCommand.isSslImpliedBySslOptions(null)).isFalse();
+ assertThat(connectCommand.isSslImpliedBySslOptions((String) null)).isFalse();
+ assertThat(connectCommand.isSslImpliedBySslOptions((String[]) null)).isFalse();
assertThat(connectCommand.isSslImpliedBySslOptions(null, null, null)).isFalse();