You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/14 16:57:09 UTC
[4/4] incubator-geode git commit: GEODE-17: refactor
CliCommandTestBase to use Parameterized Junit runs to do all combinations of
http/non-http and security/non-security runs
GEODE-17: refactor CliCommandTestBase to use Parameterized Junit runs to do all combinations of http/non-http and security/non-security runs
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e08fd9fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e08fd9fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e08fd9fd
Branch: refs/heads/feature/GEODE-17-2
Commit: e08fd9fd9040416448f3d4c14f3672b99c976f7f
Parents: 9734aa8
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Thu Apr 14 07:56:17 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Apr 14 07:56:17 2016 -0700
----------------------------------------------------------------------
.../LauncherLifecycleCommandsDUnitTest.java | 77 ++--
.../SharedConfigurationEndToEndDUnitTest.java | 14 +-
.../security/ManagementInterceptor.java | 95 +++--
.../cli/commands/CliCommandTestBase.java | 42 ++-
.../cli/commands/CommandOverHttpDunitTest.java | 56 ---
.../CommandOverHttpSecurityDUnitTest.java | 60 ---
.../cli/commands/ConfigCommandsDUnitTest.java | 43 ++-
...eateAlterDestroyRegionCommandsDUnitTest.java | 51 +--
.../cli/commands/DeployCommandsDUnitTest.java | 25 +-
.../commands/DiskStoreCommandsDUnitTest.java | 37 +-
.../commands/DiskStoreCommandsJUnitTest.java | 33 +-
.../cli/commands/FunctionCommandsDUnitTest.java | 31 +-
.../commands/GemfireDataCommandsDUnitTest.java | 51 +--
...WithCacheLoaderDuringCacheMissDUnitTest.java | 28 +-
.../cli/commands/IndexCommandsDUnitTest.java | 21 +-
...stAndDescribeDiskStoreCommandsDUnitTest.java | 23 +-
.../ListAndDescribeRegionDUnitTest.java | 18 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 40 +-
.../MiscellaneousCommandsDUnitTest.java | 41 ++-
...laneousCommandsExportLogsPart1DUnitTest.java | 27 +-
...laneousCommandsExportLogsPart2DUnitTest.java | 28 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 34 +-
...laneousCommandsExportLogsPart4DUnitTest.java | 27 +-
.../cli/commands/QueueCommandsDUnitTest.java | 33 +-
.../SharedConfigurationCommandsDUnitTest.java | 33 +-
.../cli/commands/ShellCommandsDUnitTest.java | 21 +-
.../cli/commands/ShowMetricsDUnitTest.java | 30 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 24 +-
.../cli/commands/UserCommandsDUnitTest.java | 23 +-
.../cli/commands/ClientCommandsDUnitTest.java | 39 +-
.../DurableClientCommandsDUnitTest.java | 23 +-
.../wan/wancommand/WANCommandTestBase.java | 115 +++---
...anCommandCreateGatewayReceiverDUnitTest.java | 177 ++++-----
.../WanCommandCreateGatewaySenderDUnitTest.java | 195 +++++-----
...WanCommandGatewayReceiverStartDUnitTest.java | 133 +++----
.../WanCommandGatewayReceiverStopDUnitTest.java | 133 +++----
.../WanCommandGatewaySenderStartDUnitTest.java | 169 ++++-----
.../WanCommandGatewaySenderStopDUnitTest.java | 171 ++++-----
.../wan/wancommand/WanCommandListDUnitTest.java | 129 +++----
.../WanCommandPauseResumeDUnitTest.java | 367 ++++++++++---------
.../wancommand/WanCommandStatusDUnitTest.java | 185 +++++-----
.../ClusterConfigurationDUnitTest.java | 45 +--
42 files changed, 1465 insertions(+), 1482 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index a78e0ea..e857ce7 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -16,43 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.nio.charset.Charset;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.TimeUnit;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.Query;
-import javax.management.QueryExp;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import org.junit.FixMethodOrder;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.MethodSorters;
-
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -82,6 +45,42 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.FixMethodOrder;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.Query;
+import javax.management.QueryExp;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.nio.charset.Charset;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.TimeUnit;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the contract and
@@ -109,6 +108,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
private final Queue<Integer> processIds = new ConcurrentLinkedDeque<>();
+ public LauncherLifecycleCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
protected static String getMemberId(final int jmxManagerPort, final String memberName) throws Exception {
return getMemberId(InetAddress.getLocalHost().getHostName(), jmxManagerPort, memberName);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index e1093a2..2583649 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -16,14 +16,9 @@
*/
package com.gemstone.gemfire.management.internal.configuration;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
-
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -48,7 +43,6 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -62,6 +56,10 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ExecutionException;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
+
@Category(DistributedTest.class)
public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
private static final int TIMEOUT = 10000;
@@ -75,6 +73,10 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = -2276690105585944041L;
+ public SharedConfigurationEndToEndDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
public Set<String> startServers(HeadlessGfsh gfsh, String locatorString, int numServers, String serverNamePrefix, int startNum) throws ClassNotFoundException, IOException {
Set<String> serverNames = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ManagementInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ManagementInterceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ManagementInterceptor.java
index 639677b..6ee9da5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ManagementInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/ManagementInterceptor.java
@@ -51,21 +51,20 @@ import static com.gemstone.gemfire.management.internal.security.ResourceConstant
import static com.gemstone.gemfire.management.internal.security.ResourceConstants.WRONGE_CREDENTIALS_MESSAGE;
/**
- *
* ManagementInterceptor is central go-to place for all M&M Clients Authentication and Authorization
* requests
- * @since 9.0
*
+ * @since 9.0
*/
public class ManagementInterceptor implements JMXAuthenticator {
// FIXME: Merged from GEODE-17. Are they necessary?
- public static final String USER_NAME = "security-username";
- public static final String PASSWORD = "security-password";
- public static final String OBJECT_NAME_ACCESSCONTROL = "GemFire:service=AccessControl,type=Distributed";
+ public static final String USER_NAME = "security-username";
+ public static final String PASSWORD = "security-password";
+ public static final String OBJECT_NAME_ACCESSCONTROL = "GemFire:service=AccessControl,type=Distributed";
- private static final Logger logger = LogManager.getLogger(ManagementInterceptor.class);
-// private Cache cache;
+ private static final Logger logger = LogManager.getLogger(ManagementInterceptor.class);
+ // private Cache cache;
private String authzFactoryName;
private String postAuthzFactoryName;
private String authenticatorFactoryName;
@@ -80,34 +79,34 @@ public class ManagementInterceptor implements JMXAuthenticator {
this.authenticatorFactoryName = sysProps.getProperty(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME);
this.cachedAuthZCallback = new ConcurrentHashMap<>();
this.cachedPostAuthZCallback = new ConcurrentHashMap<>();
- registerAccessControlMBean();
+ registerAccessControlMBean();
logger.info("Started Management interceptor on JMX connector");
- }
+ }
/**
* This method registers an AccessControlMBean which allows any remote JMX Client (for example Pulse) to check for
* access allowed for given Operation Code.
*/
- private void registerAccessControlMBean() {
+ private void registerAccessControlMBean() {
try {
AccessControlMBean acc = new AccessControlMBean(this);
ObjectName accessControlMBeanON = new ObjectName(ResourceConstants.OBJECT_NAME_ACCESSCONTROL);
MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> names = platformMBeanServer.queryNames(accessControlMBeanON, null);
- if(names.isEmpty()) {
+ if (names.isEmpty()) {
try {
platformMBeanServer.registerMBean(acc, accessControlMBeanON);
logger.info("Registered AccessContorlMBean on " + accessControlMBeanON);
} catch (InstanceAlreadyExistsException e) {
- throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource",e);
+ throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource", e);
} catch (MBeanRegistrationException e) {
- throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource",e);
+ throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource", e);
} catch (NotCompliantMBeanException e) {
- throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource",e);
+ throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource", e);
}
}
- } catch (MalformedObjectNameException e) {
+ } catch (MalformedObjectNameException e) {
throw new GemFireConfigException("Error while configuring accesscontrol for jmx resource", e);
}
}
@@ -115,19 +114,18 @@ public class ManagementInterceptor implements JMXAuthenticator {
/**
* Delegates authentication to GemFire Authenticator
*
- * @throws SecurityException
- * if authentication fails
+ * @throws SecurityException if authentication fails
*/
@Override
- public Subject authenticate(Object credentials) {
- String username = null, password = null;
+ public Subject authenticate(Object credentials) {
+ String username = null, password = null;
Properties pr = new Properties();
if (credentials instanceof String[]) {
- final String[] aCredentials = (String[]) credentials;
- username = aCredentials[0];
- password = aCredentials[1];
- pr.put(USER_NAME, username);
- pr.put(PASSWORD, password);
+ final String[] aCredentials = (String[]) credentials;
+ username = aCredentials[0];
+ password = aCredentials[1];
+ pr.put(USER_NAME, username);
+ pr.put(PASSWORD, password);
} else if (credentials instanceof Properties) {
pr = (Properties) credentials;
} else {
@@ -137,12 +135,12 @@ public class ManagementInterceptor implements JMXAuthenticator {
try {
Principal principal = getAuthenticator(sysProps).authenticate(pr);
return new Subject(true, Collections.singleton(new JMXPrincipal(principal.getName())), Collections.EMPTY_SET,
- Collections.EMPTY_SET);
+ Collections.EMPTY_SET);
} catch (AuthenticationFailedException e) {
//wrap inside Security exception. AuthenticationFailedException is gemfire class
//which generic JMX client can't serialize
throw new SecurityException("Authentication Failed " + e.getMessage());
- }
+ }
}
@@ -150,11 +148,10 @@ public class ManagementInterceptor implements JMXAuthenticator {
* Builds ResourceOperationContext for the given JMX MBean Request for delegates Authorization to
* gemfire AccessControl plugin with context as parameter
*
- * @throws SecurityException
- * if access is not granted
+ * @throws SecurityException if access is not granted
*/
public void authorize(ResourceOperationContext context) {
- if (StringUtils.isBlank(authzFactoryName)){
+ if (StringUtils.isBlank(authzFactoryName)) {
return;
}
@@ -164,14 +161,14 @@ public class ManagementInterceptor implements JMXAuthenticator {
if (principals == null || principals.isEmpty()) {
throw new SecurityException(ACCESS_DENIED_MESSAGE + ": No principal found.");
- }
+ }
- Principal principal = principals.iterator().next();
+ Principal principal = principals.iterator().next();
AccessControl accessControl = getAccessControl(principal, false);
if (!accessControl.authorizeOperation(null, context)) {
- throw new SecurityException(ACCESS_DENIED_MESSAGE + ": Not authorized for "+context);
+ throw new SecurityException(ACCESS_DENIED_MESSAGE + ": Not authorized for " + context);
}
}
@@ -180,56 +177,54 @@ public class ManagementInterceptor implements JMXAuthenticator {
if (cachedAuthZCallback.containsKey(principal)) {
return cachedAuthZCallback.get(principal);
} else if (!StringUtils.isBlank(authzFactoryName)) {
- try {
+ try {
Method authzMethod = ClassLoadUtil.methodFromName(authzFactoryName);
AccessControl authzCallback = (AccessControl) authzMethod.invoke(null, (Object[]) null);
- authzCallback.init(principal, null);
+ authzCallback.init(principal);
cachedAuthZCallback.put(principal, authzCallback);
return authzCallback;
} catch (Exception ex) {
- throw new AuthenticationFailedException(
- LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT.toLocalizedString(), ex);
- }
- }
+ throw new AuthenticationFailedException(LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT.toLocalizedString(), ex);
+ }
+ }
} else {
if (cachedPostAuthZCallback.containsKey(principal)) {
return cachedPostAuthZCallback.get(principal);
} else if (!StringUtils.isBlank(postAuthzFactoryName)) {
- try {
+ try {
Method authzMethod = ClassLoadUtil.methodFromName(postAuthzFactoryName);
AccessControl postAuthzCallback = (AccessControl) authzMethod.invoke(null, (Object[]) null);
- postAuthzCallback.init(principal, null);
+ postAuthzCallback.init(principal);
cachedPostAuthZCallback.put(principal, postAuthzCallback);
return postAuthzCallback;
} catch (Exception ex) {
- throw new AuthenticationFailedException(
- LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT.toLocalizedString(), ex);
- }
- }
+ throw new AuthenticationFailedException(LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT.toLocalizedString(), ex);
+ }
+ }
}
return null;
}
private Authenticator getAuthenticator(Properties gfSecurityProperties) throws AuthenticationFailedException {
Authenticator auth;
- try {
+ try {
Method instanceGetter = ClassLoadUtil.methodFromName(this.authenticatorFactoryName);
auth = (Authenticator) instanceGetter.invoke(null, (Object[]) null);
} catch (Exception ex) {
throw new AuthenticationFailedException(
LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT.toLocalizedString(), ex);
- }
+ }
if (auth == null) {
throw new AuthenticationFailedException(
LocalizedStrings.HandShake_AUTHENTICATOR_INSTANCE_COULD_NOT_BE_OBTAINED.toLocalizedString());
- }
+ }
auth.init(gfSecurityProperties);
return auth;
- }
+ }
public void postAuthorize(ResourceOperationContext context) {
- if (StringUtils.isBlank(postAuthzFactoryName)){
- return ;
+ if (StringUtils.isBlank(postAuthzFactoryName)) {
+ return;
}
AccessControlContext acc = AccessController.getContext();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index 6d2b3be..02cf8b7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -31,7 +31,8 @@ import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.json.JSONException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import java.io.IOException;
import java.io.PrintStream;
@@ -39,6 +40,8 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -51,25 +54,38 @@ import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* Base class for all the CLI/gfsh command dunit tests.
*/
-public class CliCommandTestBase extends JUnit4CacheTestCase {
+@RunWith(Parameterized.class)
+public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
private static final long serialVersionUID = 1L;
- public static final String USE_HTTP_SYSTEM_PROPERTY = "useHTTP";
- public static final String JSON_AUTHORIZATION_SYSTEM_PROPERTY = "jsonAuthorization";
-
private ManagementService managementService;
private transient HeadlessGfsh shell;
- private boolean useHttpOnConnect = Boolean.getBoolean(USE_HTTP_SYSTEM_PROPERTY);
- private String jsonAuthorization = System.getProperty(JSON_AUTHORIZATION_SYSTEM_PROPERTY);
+ protected boolean useHttpOnConnect;
+ protected String jsonAuthorization;
private int httpPort;
private int jmxPort;
private String jmxHost;
+ public CliCommandTestBase(boolean useHttpOnConnect, String jsonAuthorization){
+ this.useHttpOnConnect = useHttpOnConnect;
+ this.jsonAuthorization = jsonAuthorization;
+ }
+
+ @Parameterized.Parameters
+ public static Collection parameters() {
+ return Arrays.asList(new Object[][] {
+ { false, null },
+ { true, null },
+ { false, "cacheServer.json" },
+ { true, "cacheServer.json" }
+ });
+ }
+
@Override
public final void preTearDownCacheTestCase() throws Exception {
preTearDownCliCommandTestBase();
@@ -92,7 +108,6 @@ public class CliCommandTestBase extends JUnit4CacheTestCase {
*/
@SuppressWarnings("serial")
protected HeadlessGfsh createDefaultSetup(final Properties props) {
- final String json = System.getProperty("jsonAuthorization");
Object[] result = (Object[]) Host.getHost(0).getVM(0).invoke( "createDefaultSetup", () -> {
final Object[] results = new Object[3];
final Properties localProps = (props != null ? props : new Properties());
@@ -118,18 +133,12 @@ public class CliCommandTestBase extends JUnit4CacheTestCase {
localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort));
localProps.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
- if(json!=null){
+ if(jsonAuthorization!=null){
localProps.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME,
JSONAuthorization.class.getName() + ".create");
localProps.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
- try {
- JSONAuthorization.setUpWithJsonFile(json);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ JSONAuthorization.setUpWithJsonFile(jsonAuthorization);
}
getSystem(localProps);
@@ -246,6 +255,7 @@ public class CliCommandTestBase extends JUnit4CacheTestCase {
endpoint = host + "[" + jmxPort + "]";
command.addOption(CliStrings.CONNECT__JMX_MANAGER, endpoint);
}
+ System.out.println(getClass().getSimpleName()+" using endpoint: "+endpoint);
CommandResult result = executeCommand(shell, command.toString());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDunitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDunitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDunitTest.java
deleted file mode 100644
index 6baf19c..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpDunitTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.cli.commands;
-
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import org.junit.ClassRule;
-import org.junit.contrib.java.lang.system.ProvideSystemProperty;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@Category(DistributedTest.class)
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- ConfigCommandsDUnitTest.class,
- DeployCommandsDUnitTest.class,
- DiskStoreCommandsDUnitTest.class,
- FunctionCommandsDUnitTest.class,
- GemfireDataCommandsDUnitTest.class,
- GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.class,
- IndexCommandsDUnitTest.class,
- ListAndDescribeDiskStoreCommandsDUnitTest.class,
- ListIndexCommandDUnitTest.class,
- MemberCommandsDUnitTest.class,
- MiscellaneousCommandsDUnitTest.class,
- MiscellaneousCommandsExportLogsPart1DUnitTest.class,
- MiscellaneousCommandsExportLogsPart2DUnitTest.class,
- MiscellaneousCommandsExportLogsPart3DUnitTest.class,
- MiscellaneousCommandsExportLogsPart4DUnitTest.class,
- QueueCommandsDUnitTest.class,
- SharedConfigurationCommandsDUnitTest.class,
- ShellCommandsDUnitTest.class,
- ShowDeadlockDUnitTest.class,
- ShowMetricsDUnitTest.class,
- ShowStackTraceDUnitTest.class,
- UserCommandsDUnitTest.class
-})
-public class CommandOverHttpDunitTest {
- @ClassRule
- public static ProvideSystemProperty provideSystemProperty = new ProvideSystemProperty(CliCommandTestBase.USE_HTTP_SYSTEM_PROPERTY, "true");
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpSecurityDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpSecurityDUnitTest.java
deleted file mode 100644
index b3de388..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CommandOverHttpSecurityDUnitTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.cli.commands;
-
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import org.junit.ClassRule;
-import org.junit.contrib.java.lang.system.ProvideSystemProperty;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@Category(DistributedTest.class)
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- ConfigCommandsDUnitTest.class,
- DeployCommandsDUnitTest.class,
- DiskStoreCommandsDUnitTest.class,
- FunctionCommandsDUnitTest.class,
- GemfireDataCommandsDUnitTest.class,
- GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.class,
- IndexCommandsDUnitTest.class,
- ListAndDescribeDiskStoreCommandsDUnitTest.class,
- ListIndexCommandDUnitTest.class,
- MemberCommandsDUnitTest.class,
- MiscellaneousCommandsDUnitTest.class,
- MiscellaneousCommandsExportLogsPart1DUnitTest.class,
- MiscellaneousCommandsExportLogsPart2DUnitTest.class,
- MiscellaneousCommandsExportLogsPart3DUnitTest.class,
- MiscellaneousCommandsExportLogsPart4DUnitTest.class,
- QueueCommandsDUnitTest.class,
- SharedConfigurationCommandsDUnitTest.class,
- ShellCommandsDUnitTest.class,
- ShowDeadlockDUnitTest.class,
- ShowMetricsDUnitTest.class,
- ShowStackTraceDUnitTest.class,
- UserCommandsDUnitTest.class
-})
-public class CommandOverHttpSecurityDUnitTest {
- @ClassRule
- public static ProvideSystemProperty systemProperty = new ProvideSystemProperty(CliCommandTestBase.USE_HTTP_SYSTEM_PROPERTY, "true");
-
- @ClassRule
- public static ProvideSystemProperty securityRule = new ProvideSystemProperty(CliCommandTestBase.JSON_AUTHORIZATION_SYSTEM_PROPERTY, "cacheServer.json");
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 9844d90..8481688 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -16,26 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.Invoke.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.Locator;
@@ -61,6 +41,25 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* Dunit class for testing GemFire config commands : export config
@@ -82,6 +81,10 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
File subDir = new File("ConfigCommandsDUnitTestSubDir");
File subManagerConfigFile = new File(subDir, managerConfigFile.getName());
+ public ConfigCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Override
protected void preTearDownCliCommandTestBase() throws Exception {
deleteTestFiles();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index b6692c7..0718f53 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -16,30 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.jayway.awaitility.Awaitility.*;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
@@ -72,6 +48,29 @@ import com.gemstone.gemfire.test.junit.Retry;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
import com.gemstone.gemfire.test.junit.rules.RetryRule;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.jayway.awaitility.Awaitility.waitAtMost;
@Category({ DistributedTest.class, FlakyTest.class }) // GEODE-973
public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBase {
@@ -96,6 +95,10 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
@Rule
public RetryRule retryRule = new RetryRule();
+ public CreateAlterDestroyRegionCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization){
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
/**
* Asserts that the "compressor" option for the "create region" command succeeds for a recognized compressor.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index fee3978..1888872 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -16,17 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
@@ -47,6 +36,16 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
/**
* Unit tests for the DeployCommands class
@@ -62,6 +61,10 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
transient private ClassBuilder classBuilder = new ClassBuilder();
transient private CommandProcessor commandProcessor;
+ public DeployCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization){
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Override
public final void postSetUp() throws Exception {
this.commandProcessor = new CommandProcessor();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index e8ee713..a8e667b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -16,23 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DataPolicy;
@@ -69,6 +52,22 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* The DiskStoreCommandsDUnitTest class is a distributed test suite of test cases for testing the disk store commands
@@ -85,6 +84,10 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
+ public DiskStoreCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization){
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Test
public void testMissingDiskStore() {
final String regionName = "testShowMissingDiskStoreRegion";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index 788e9eb..a6f616c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -16,23 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.execute.Execution;
import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException;
@@ -47,6 +30,22 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.util.DiskStoreNotFoundException;
import com.gemstone.gemfire.management.internal.cli.util.MemberNotFoundException;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.*;
/**
* The DiskStoreCommandsJUnitTest class is a test suite of test cases testing the contract and functionality of the
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index b4d4df1..6c89247 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -16,16 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
@@ -47,6 +37,15 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.List;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* Dunit class for testing gemfire function commands : execute function, destroy function, list function
@@ -59,6 +58,10 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
private static final String REGION_ONE = "RegionOne";
private static final String REGION_TWO = "RegionTwo";
+ public FunctionCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization){
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
void setupWith2Regions() {
final VM vm1 = Host.getHost(0).getVM(1);
final VM vm2 = Host.getHost(0).getVM(2);
@@ -130,8 +133,8 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
}
- public static String getMemberId() {
- Cache cache = new FunctionCommandsDUnitTest().getCache(); // TODO: get rid of this kind of stuff
+ public String getMemberId() {
+ Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
@@ -250,7 +253,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> FunctionCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
public void run() {
@@ -407,7 +410,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> FunctionCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
String command = "destroy function --id=" + function.getId() + " --member=" + vm1MemberId;
getLogWriter().info("testDestroyOnMember command=" + command);
CommandResult cmdResult = executeCommand(command);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 1b0c9cf..d07b33e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -16,26 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.IgnoredException.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DataPolicy;
@@ -81,6 +61,25 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
@@ -119,8 +118,12 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final static int COUNT = 5;
- public static String getMemberId() {
- Cache cache = new GemfireDataCommandsDUnitTest().getCache();
+ public GemfireDataCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization){
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
+ public String getMemberId() {
+ Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
@@ -200,8 +203,8 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
});
- final String vm1MemberId = (String) vm1.invoke(() -> GemfireDataCommandsDUnitTest.getMemberId());
- final String vm2MemberId = (String) vm2.invoke(() -> GemfireDataCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
+ final String vm2MemberId = (String) vm2.invoke(() -> getMemberId());
getLogWriter().info("Vm1 ID : " + vm1MemberId);
getLogWriter().info("Vm2 ID : " + vm2MemberId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index 19a354e..b2e98b5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -16,18 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheLoader;
import com.gemstone.gemfire.cache.CacheLoaderException;
@@ -52,6 +40,17 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* The GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest class is test suite of test cases testing the Gfsh
@@ -71,6 +70,11 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C
private static final String GEMFIRE_LOG_LEVEL = System.getProperty("logLevel", "config");
private static final String USERS_REGION_NAME = "Users";
+
+ public GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest(boolean useHttpOnConnect, String jsonAuthorization){
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
protected static String getRegionPath(final String regionName) {
return (regionName.startsWith(Region.SEPARATOR) ? regionName : String.format("%1$s%2$s", Region.SEPARATOR,
regionName));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 123c3bc..fbe9323 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -16,15 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.DiskStoreFactory;
@@ -54,6 +45,14 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
@Category({ DistributedTest.class, FlakyTest.class }) // see GEODE-689, GEODE-1048
public class IndexCommandsDUnitTest extends CliCommandTestBase {
@@ -65,6 +64,10 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
private static final String parRegPersName = "ParRegPers";
private static final String repRegPersName = "RepRegPer";
+ public IndexCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
Region<?, ?> createParReg(String regionName, Cache cache, Class keyConstraint, Class valueConstraint) {
RegionFactory regionFactory = cache.createRegionFactory();
regionFactory.setDataPolicy(DataPolicy.PARTITION);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index 6466033..0224982 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -16,15 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.DiskStore;
@@ -39,6 +30,16 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.assertNotNull;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper
@@ -51,6 +52,10 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@Category(DistributedTest.class)
public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBase {
+ public ListAndDescribeDiskStoreCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
protected static String toString(final Result result) {
assert result != null : "The Result object from the command execution cannot be null!";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index f495944..bf8e913 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -16,14 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.EvictionAction;
import com.gemstone.gemfire.cache.EvictionAttributes;
@@ -46,6 +38,13 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
@Category(DistributedTest.class)
public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
@@ -59,6 +58,9 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
private static final String PR1 = "PR1";
private static final String LOCALREGIONONMANAGER = "LocalRegionOnManager";
+ public ListAndDescribeRegionDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
static class CacheListener2 extends CacheListenerAdapter {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index deb8860..356445d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -16,24 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
@@ -55,6 +37,24 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell
@@ -72,6 +72,10 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
private final AtomicLong idGenerator = new AtomicLong(0l);
+ public ListIndexCommandDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
protected static String toString(final Result result) {
assert result != null : "The Result object from the command execution cannot be null!";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index 1c6f141..b9dcc41 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -16,20 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.IgnoredException.*;
-import static com.gemstone.gemfire.test.dunit.Invoke.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -56,6 +42,19 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
+import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* Dunit class for testing gemfire function commands : GC, Shutdown
@@ -66,6 +65,10 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
private static String cachedLogLevel;
+ public MiscellaneousCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Override
protected final void preTearDownCliCommandTestBase() throws Exception {
invokeInEveryVM(new SerializableRunnable("reset log level") {
@@ -103,8 +106,8 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
}
}
- public static String getMemberId() {
- Cache cache = new GemfireDataCommandsDUnitTest().getCache();
+ public String getMemberId() {
+ Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
@@ -112,7 +115,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
public void testGCForMemberID() {
createDefaultSetup(null);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
String command = "gc --member=" + vm1MemberId;
CommandResult cmdResult = executeCommand(command);
cmdResult.resetToFirstLine();
@@ -139,7 +142,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
props.setProperty("log-file", "testShowLogDefault.log");
createDefaultSetup(props);
final VM vm1 = Host.getHost(0).getVM(0);
- final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
String command = "show log --member=" + vm1MemberId;
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
@@ -162,7 +165,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
try {
createDefaultSetup(props);
final VM vm1 = Host.getHost(0).getVM(0);
- final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
String command = "show log --member=" + vm1MemberId + " --lines=50";
CommandResult cmdResult = executeCommand(command);
if (cmdResult != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
index 60c5ded..0ce955d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
@@ -16,17 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
@@ -39,6 +28,17 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.fail;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* Dunit class for testing gemfire function commands : export logs
@@ -48,9 +48,8 @@ public class MiscellaneousCommandsExportLogsPart1DUnitTest extends CliCommandTes
private static final long serialVersionUID = 1L;
- public static String getMemberId() {
- Cache cache = new GemfireDataCommandsDUnitTest().getCache();
- return cache.getDistributedSystem().getDistributedMember().getId();
+ public MiscellaneousCommandsExportLogsPart1DUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
}
void setupForExportLogs() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
index fbe156a..55d8b06 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
@@ -16,17 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
@@ -39,6 +28,17 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.fail;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* Dunit class for testing gemfire function commands : export logs
@@ -48,11 +48,11 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
private static final long serialVersionUID = 1L;
- public static String getMemberId() {
- Cache cache = new GemfireDataCommandsDUnitTest().getCache();
- return cache.getDistributedSystem().getDistributedMember().getId();
+ public MiscellaneousCommandsExportLogsPart2DUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
}
+
void setupForExportLogs() {
final VM vm1 = Host.getHost(0).getVM(1);
createDefaultSetup(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 5c159e8..63f3ceb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -16,18 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
@@ -41,6 +29,18 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.fail;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* Dunit class for testing gemfire function commands : export logs
@@ -50,8 +50,12 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
private static final long serialVersionUID = 1L;
- public static String getMemberId() {
- Cache cache = new GemfireDataCommandsDUnitTest().getCache();
+ public MiscellaneousCommandsExportLogsPart3DUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
+ public String getMemberId() {
+ Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
@@ -128,7 +132,7 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
String end = sf.format(enddate);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> MiscellaneousCommandsDUnitTest.getMemberId());
+ final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
String dir = getCurrentTimeString();
String logLevel = LogWriterImpl.levelToString(LogWriterImpl.INFO_LEVEL);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
index cf19659..4015033 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
@@ -16,17 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
@@ -39,6 +28,17 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
+import static com.gemstone.gemfire.test.dunit.Assert.fail;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
/**
* Dunit class for testing gemfire function commands : export logs
@@ -48,9 +48,8 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
private static final long serialVersionUID = 1L;
- public static String getMemberId() {
- Cache cache = new GemfireDataCommandsDUnitTest().getCache();
- return cache.getDistributedSystem().getDistributedMember().getId();
+ public MiscellaneousCommandsExportLogsPart4DUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
}
void setupForExportLogs() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index f61ff57..4d23535 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -16,21 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.distributed.Locator;
@@ -49,6 +34,20 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/**
* A distributed test suite of test cases for testing the queue commands that are part of Gfsh.
@@ -62,6 +61,10 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
+ public QueueCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Override
public final void preSetUp() throws Exception {
disconnectAllFromDS();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e08fd9fd/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index d3e004b..6407897 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -16,21 +16,6 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -55,6 +40,20 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Properties;
+import java.util.Set;
+
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
/***
* DUnit test to test export and import of shared configuration.
@@ -70,6 +69,10 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
File newDeployableJarFile = new File("DeployCommandsDUnit1.jar");
private transient ClassBuilder classBuilder = new ClassBuilder();
+ public SharedConfigurationCommandsDUnitTest(boolean useHttpOnConnect, String jsonAuthorization) {
+ super(useHttpOnConnect, jsonAuthorization);
+ }
+
@Test
public void testExportImportSharedConfiguration() {
disconnectAllFromDS();