geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [31/32] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-17-2
Date Fri, 15 Apr 2016 03:08:00 GMT
Merge branch 'develop' into feature/GEODE-17-2

# Conflicts:
#	geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
#	geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
#	geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
#	geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
#	geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
#	geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
#	geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/31c6054f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/31c6054f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/31c6054f

Branch: refs/heads/feature/GEODE-17-2
Commit: 31c6054fd1c9f9436b6764d111f50fd001b88791
Parents: 2322827 f702bcf
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Thu Apr 14 20:05:23 2016 -0700
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Thu Apr 14 20:05:23 2016 -0700

----------------------------------------------------------------------
 .../apache/geode/gradle/PasswordDialog.groovy   |  41 ++
 .../LauncherLifecycleCommandsDUnitTest.java     | 132 ++---
 .../SharedConfigurationEndToEndDUnitTest.java   |   9 +-
 geode-core/build.gradle                         |   8 +-
 .../client/internal/CloseConnectionOp.java      |   0
 .../cache/client/internal/ConnectionImpl.java   |   8 +-
 .../internal/membership/gms/Services.java       |  23 +-
 .../membership/gms/fd/GMSHealthMonitor.java     |  20 +-
 .../gms/messenger/JGroupsMessenger.java         |   2 +-
 .../membership/gms/messenger/StatRecorder.java  |  30 +-
 .../gemfire/internal/SocketCreator.java         |  25 +-
 .../gemfire/internal/SocketIOWithTimeout.java   | 491 -------------------
 .../gemfire/internal/SocketInputStream.java     | 181 -------
 .../gemfire/internal/SocketInputWrapper.java    |  93 ----
 .../gemfire/internal/SocketOutputStream.java    | 174 -------
 .../gemstone/gemfire/internal/SocketUtils.java  | 220 ---------
 .../gemfire/internal/cache/EntryEventImpl.java  |   4 +-
 .../internal/cache/GemFireCacheImpl.java        |  14 +-
 .../cache/SearchLoadAndWriteProcessor.java      |  28 +-
 .../cache/execute/util/CommitFunction.java      | 141 ------
 .../execute/util/NestedTransactionFunction.java | 116 -----
 .../cache/execute/util/RollbackFunction.java    | 136 -----
 .../cache/tier/sockets/AcceptorImpl.java        |   3 +-
 .../cache/tier/sockets/CacheClientNotifier.java | 105 +---
 .../cache/tier/sockets/CacheClientUpdater.java  |   5 +-
 .../internal/cache/tier/sockets/HandShake.java  |  13 +-
 .../internal/cache/tier/sockets/Message.java    |   3 +-
 .../cache/tier/sockets/ServerConnection.java    |   5 +-
 .../tier/sockets/ServerHandShakeProcessor.java  |  26 +-
 .../tier/sockets/command/CloseConnection.java   |   0
 .../serial/SerialSecondaryGatewayListener.java  |  19 +-
 .../gemfire/internal/lang/ThrowableUtils.java   | 101 ++++
 .../gemfire/internal/shared/NativeCalls.java    |   2 +-
 .../gemfire/internal/tcp/Connection.java        |   5 +-
 .../gemfire/management/internal/RestAgent.java  |  51 +-
 .../query/dunit/SelectStarQueryDUnitTest.java   | 216 ++++----
 .../gemfire/cache30/MultiVMRegionTestCase.java  |  13 +-
 .../distributed/DistributedSystemDUnitTest.java |  20 +-
 .../gms/membership/StatRecorderJUnitTest.java   |  67 ++-
 .../gemstone/gemfire/internal/ClassBuilder.java |  13 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |  11 +-
 .../internal/JarClassLoaderJUnitTest.java       |  17 +
 .../cache/ClientServerTransactionDUnitTest.java |   2 -
 .../gemfire/internal/cache/CommitFunction.java  | 142 ++++++
 .../internal/cache/EntryEventImplTest.java      |  71 +++
 .../cache/NestedTransactionFunction.java        | 116 +++++
 .../internal/cache/RollbackFunction.java        | 137 ++++++
 .../cache/SearchLoadAndWriteProcessorTest.java  |  68 +++
 .../cache/partitioned/ShutdownAllDUnitTest.java |  10 +-
 .../PersistentRecoveryOrderDUnitTest.java       |   6 +-
 .../internal/lang/ThrowableUtilsTest.java       | 242 +++++++++
 .../cli/commands/CliCommandTestBase.java        |  34 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |  20 +
 ...eateAlterDestroyRegionCommandsDUnitTest.java |  24 +
 .../cli/commands/DeployCommandsDUnitTest.java   |   3 +
 .../commands/DiskStoreCommandsDUnitTest.java    |  17 +
 .../commands/DiskStoreCommandsJUnitTest.java    |  32 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |  10 +
 .../cli/commands/IndexCommandsDUnitTest.java    |  16 +-
 .../ListAndDescribeRegionDUnitTest.java         |   8 +
 .../MiscellaneousCommandsDUnitTest.java         |  14 +
 ...laneousCommandsExportLogsPart1DUnitTest.java |  11 +
 ...laneousCommandsExportLogsPart2DUnitTest.java |  11 +
 ...laneousCommandsExportLogsPart3DUnitTest.java |  12 +
 ...laneousCommandsExportLogsPart4DUnitTest.java |  11 +
 .../cli/commands/QueueCommandsDUnitTest.java    |  15 +
 .../SharedConfigurationCommandsDUnitTest.java   |  15 +
 .../cli/commands/ShellCommandsDUnitTest.java    |   9 +
 .../cli/commands/ShowMetricsDUnitTest.java      |  13 +
 .../cli/commands/ShowStackTraceDUnitTest.java   |  10 +
 .../cli/commands/UserCommandsDUnitTest.java     |  10 +
 .../com/gemstone/gemfire/test/dunit/VM.java     |  88 ++--
 .../test/dunit/tests/BasicDUnitTest.java        |   3 +
 .../tests/GetDefaultDiskStoreNameDUnitTest.java |   1 -
 .../dunit/tests/GetTestMethodNameDUnitTest.java |   1 -
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |   3 +
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |   3 +
 .../cli/commands/ClientCommandsDUnitTest.java   |  46 +-
 .../DurableClientCommandsDUnitTest.java         |  19 +-
 .../internal/directory/RegionDirectory.java     |  20 +-
 .../lucene/internal/filesystem/FileSystem.java  |   5 +
 .../repository/IndexRepositoryImpl.java         |   2 +-
 .../repository/serializer/SerializerUtil.java   |  16 +-
 .../LuceneIndexRecoveryHAJUnitTest.java         |  20 +-
 .../internal/LuceneServiceImplJUnitTest.java    |  44 +-
 .../IndexRepositoryImplPerformanceTest.java     |   4 +-
 geode-site/website/Rules                        |   6 +
 geode-site/website/layouts/default.html         |   2 +-
 geode-site/website/layouts/header.html          |   2 +-
 geode-site/website/layouts/releases.html        |   1 +
 .../wan/wancommand/WANCommandTestBase.java      |   9 +
 ...anCommandCreateGatewayReceiverDUnitTest.java |  19 +-
 .../WanCommandCreateGatewaySenderDUnitTest.java |  19 +-
 ...WanCommandGatewayReceiverStartDUnitTest.java |  19 +-
 .../WanCommandGatewayReceiverStopDUnitTest.java |  19 +-
 .../WanCommandGatewaySenderStopDUnitTest.java   |  19 +-
 .../WanCommandPauseResumeDUnitTest.java         |  63 ++-
 .../wancommand/WanCommandStatusDUnitTest.java   |  19 +-
 .../ClusterConfigurationDUnitTest.java          |  41 +-
 .../web/swagger/config/RestApiPathProvider.java |  27 +-
 gradle/dependency-versions.properties           |   2 +-
 gradle/publish.gradle                           |  35 ++
 102 files changed, 1974 insertions(+), 2283 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index efbcf94,b394063..b5fa956
--- 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
@@@ -45,43 -82,7 +82,10 @@@ import com.gemstone.gemfire.management.
  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
   * functionality of the GemFire launcher lifecycle commands inside Gfsh.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index cdf19b5,6a761b4..7d65ce7
--- 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
@@@ -236,31 -215,12 +251,25 @@@ public abstract class CliCommandTestBas
     * @param shell   Shell to connect
     */
    protected void shellConnect(final String host, final int jmxPort, final int httpPort, HeadlessGfsh shell) {
 -    assert (host != null);
 -    assert (shell != null);
 +    assertTrue(host != null);
 +    assertTrue(shell != null);
  
-     CommandResult result = connect(host, jmxPort, httpPort, shell);
-     if (!shell.isConnectedAndReady()) {
-       throw new AssertionError(
-           "Connect command failed to connect to manager, result=" + commandResultToString(result));
-     }
-     info("Successfully connected to managing node using " + (useHttpOnConnect ? "HTTP" : "JMX"));
-     assertEquals(true, shell.isConnectedAndReady());
++    connect(host, jmxPort, httpPort, shell);
 +  }
 +
 +  protected CommandResult shellConnect(){
 +    return connect(this.jmxHost, this.jmxPort, this.httpPort, getDefaultShell());
 +  }
 +
 +  protected CommandResult connect(final String host, final int jmxPort, final int httpPort, HeadlessGfsh shell){
      final CommandStringBuilder command = new CommandStringBuilder(CliStrings.CONNECT);
 -    String endpoint;
  
 +    if(enableAuth) {
 +      command.addOption(CliStrings.CONNECT__USERNAME, username);
 +      command.addOption(CliStrings.CONNECT__PASSWORD, password);
 +    }
 +
 +    String endpoint;
      if (useHttpOnConnect) {
        endpoint = "http://" + host + ":" + httpPort + "/gemfire/v1";
        command.addOption(CliStrings.CONNECT__USE_HTTP, Boolean.TRUE.toString());
@@@ -269,9 -229,16 +278,18 @@@
        endpoint = host + "[" + jmxPort + "]";
        command.addOption(CliStrings.CONNECT__JMX_MANAGER, endpoint);
      }
 +    System.out.println(getClass().getSimpleName()+" using endpoint: "+endpoint);
  
-     return executeCommand(shell, command.toString());
+     CommandResult result = executeCommand(shell, command.toString());
+ 
+     if (!shell.isConnectedAndReady()) {
 -      throw new AssertionError(
++      throw new TestException(
+           "Connect command failed to connect to manager " + endpoint + " result=" + commandResultToString(result));
+     }
+ 
+     info("Successfully connected to managing node using " + (useHttpOnConnect ? "HTTP" : "JMX"));
+     assertEquals(true, shell.isConnectedAndReady());
++    return result;
    }
  
    /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index b81b080,fee3978..a314681
--- 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
@@@ -36,18 -47,6 +36,19 @@@ import com.gemstone.gemfire.test.dunit.
  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.DistributedTest;
 +import org.junit.Test;
 +import org.junit.experimental.categories.Category;
 +import org.junit.runner.RunWith;
 +import org.junit.runners.Parameterized;
 +
 +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
@@@ -56,7 -55,6 +57,9 @@@
   */
  @Category(DistributedTest.class)
  @SuppressWarnings("serial")
++@Category(DistributedTest.class)
++@SuppressWarnings("serial")
 +@RunWith(Parameterized.class)
  public class DeployCommandsDUnitTest extends CliCommandTestBase {
  
    File newDeployableJarFile = new File("DeployCommandsDUnit1.jar");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index a6f616c,788e9eb..775c8d0
--- 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
@@@ -30,23 -47,7 +47,8 @@@ import com.gemstone.gemfire.management.
  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
   * DiskStoreCommands class implementing commands in the GemFire shell (gfsh) that access and modify disk stores in

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index e2c8e2e,123c3bc..ab8097c
--- 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
@@@ -139,7 -133,7 +139,6 @@@ public class IndexCommandsDUnitTest ext
      return regionFactory.create(regionName);
    }
  
--  @Test
    public void testCreateKeyIndexOnRegionWithPersistence() {
      setupSystemPersist();
  
@@@ -169,7 -163,7 +168,6 @@@
      assertTrue(Status.OK.equals(commandResult.getStatus()));
    }
  
--  @Test
    public void testCreateAndDestroyIndex() {
      setupSystem();
      /***
@@@ -211,7 -205,7 +209,6 @@@
      assertFalse(resultAsString.contains(indexName));
    }
  
--  @Test
    public void testCreateIndexMultipleIterators() {
      setupSystem();
  
@@@ -236,7 -230,7 +233,6 @@@
      assertTrue(resultAsString.contains(indexName));
    }
  
--  @Test
    public void testCreateMultipleIndexes() {
      setupSystem();
      CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DEFINE_INDEX);
@@@ -270,7 -264,7 +266,6 @@@
      assertTrue(resultAsString.contains(indexName));
    }
  
--  @Test
    public void testClearMultipleIndexes() {
      setupSystem();
      CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DEFINE_INDEX);
@@@ -304,7 -298,7 +299,6 @@@
      assertTrue(!resultAsString.contains(indexName));
    }
  
--  @Test
    public void testCreateAndDestroyIndexOnMember() {
      setupSystem();
      /***
@@@ -354,7 -348,7 +348,6 @@@
      assertFalse(resultAsString.contains(VM1Name));
    }
  
--  @Test
    public void testCreateAndDestroyIndexOnGroup() {
      setupSystem();
      /***
@@@ -422,7 -416,7 +415,6 @@@
      }
    }
  
--  @Test
    public void testCreateAndDestroyIndexWithIncorrectInput() {
      setupSystem();
      CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_INDEX);
@@@ -541,7 -535,7 +533,6 @@@
      assertTrue(commandResult.getStatus().equals(Status.ERROR));
    }
  
--  @Test
    public void testDestroyIndexWithoutIndexName() {
      setupSystem();
      CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_INDEX);
@@@ -603,7 -597,7 +594,6 @@@
    /**
     * Asserts that creating and destroying indexes correctly updates the shared configuration.
     */
--  @Test
    public void testCreateDestroyUpdatesSharedConfig() {
      disconnectAllFromDS();
  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
index 40006d2,eb52ffc..8391ffa
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
@@@ -72,9 -72,9 +72,9 @@@ public class VM implements Serializabl
    }
  
    /**
--   * Creates a new {@code VM} that runs on a given host with a given process 
++   * Creates a new {@code VM} that runs on a given host with a given process
     * id.
--   * 
++   *
     * TODO: change pid to reflect value from {@link ProcessUtils#identifyPid()}
     */
    public VM(final Host host, final int pid, final RemoteDUnitVMIF client) {
@@@ -99,7 -99,7 +99,7 @@@
    }
  
    /**
--   * Invokes a static zero-arg method  with an {@link Object} or {@code void} 
++   * Invokes a static zero-arg method  with an {@link Object} or {@code void}
     * return type in this {@code VM}.  If the return type of the method is
     * {@code void}, {@code null} is returned.
     *
@@@ -107,12 -107,12 +107,12 @@@
     *         The class on which to invoke the method
     * @param  methodName
     *         The name of the method to invoke
--   *         
++   *
     * @throws RMIException
     *         Wraps any underlying exception thrown while invoking the method in
     *         this VM
--   *         
--   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead        
++   *
++   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead
     */
    public Object invoke(final Class targetClass, final String methodName) {
      return invoke(targetClass, methodName, new Object[0]);
@@@ -127,8 -127,8 +127,8 @@@
     *         The class on which to invoke the method
     * @param  methodName
     *         The name of the method to invoke
--   *         
--   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead       
++   *
++   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead
     */
    public AsyncInvocation invokeAsync(final Class targetClass, final String methodName) {
      return invokeAsync(targetClass, methodName, null);
@@@ -146,12 -146,12 +146,12 @@@
     * @param  args
     *         Arguments passed to the method call (must be
     *         {@link java.io.Serializable}).
--   *         
++   *
     * @throws RMIException
     *         Wraps any underlying exception thrown while invoking the method in
     *         this {@code VM}
--   *         
--   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead        
++   *
++   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead
     */
    public Object invoke(final Class targetClass, final String methodName, final Object[] args) {
      if (!this.available) {
@@@ -164,12 -164,12 +164,12 @@@
        return result.getResult();
  
      } else {
--      throw new RMIException(this, targetClass.getName(), methodName, result.getException(), result.getStackTrace()); 
++      throw new RMIException(this, targetClass.getName(), methodName, result.getException(), result.getStackTrace());
      }
    }
  
    /**
--   * Asynchronously invokes an instance method with an {@link Object} or 
++   * Asynchronously invokes an instance method with an {@link Object} or
     * {@code void} return type in this {@code VM}.  If the return type of the
     * method is {@code void}, {@code null} is returned.
     *
@@@ -180,7 -180,7 +180,7 @@@
     * @param  args
     *         Arguments passed to the method call (must be {@link
     *         java.io.Serializable}).
--   *         
++   *
     * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead
     */
    public AsyncInvocation invokeAsync(final Object targetObject, final String methodName, final Object[] args) {
@@@ -212,7 -212,7 +212,7 @@@
     *
     * @param  runnable
     *         The {@code Runnable} to be run
--   *         
++   *
     * @see SerializableRunnable
     */
    public AsyncInvocation invokeAsync(final SerializableRunnableIF runnable) {
@@@ -220,15 -220,15 +220,15 @@@
    }
    
    /**
--   * Invokes the {@code run} method of a {@link Runnable} in this VM.  Recall 
--   * that {@code run} takes no arguments and has no return value.  The 
--   * {@code Runnable} is wrapped in a {@link NamedRunnable} having the given 
++   * Invokes the {@code run} method of a {@link Runnable} in this VM.  Recall
++   * that {@code run} takes no arguments and has no return value.  The
++   * {@code Runnable} is wrapped in a {@link NamedRunnable} having the given
     * name so it shows up in DUnit logs.
     *
     * @param  runnable
     *         The {@code Runnable} to be run
--   * @param  name 
--   *         The name of the {@code Runnable}, which will be logged in DUnit 
++   * @param  name
++   *         The name of the {@code Runnable}, which will be logged in DUnit
     *         output
     *
     * @see SerializableRunnable
@@@ -238,12 -238,12 +238,12 @@@
    }
    
    /**
--   * Invokes the {@code call} method of a {@link Callable} in this {@code VM}.  
++   * Invokes the {@code call} method of a {@link Callable} in this {@code VM}.
     *
     * @param  callable
     *         The {@code Callable} to be run
--   * @param  name 
--   *         The name of the {@code Callable}, which will be logged in dunit 
++   * @param  name
++   *         The name of the {@code Callable}, which will be logged in dunit
     *         output
     *
     * @see SerializableCallable
@@@ -270,8 -270,8 +270,8 @@@
     *
     * @param  runnable
     *         The {@code Runnable} to be run
--   * @param  name 
--   *         The name of the {@code Runnable}, which will be logged in DUnit 
++   * @param  name
++   *         The name of the {@code Runnable}, which will be logged in DUnit
     *         output
     *
     * @see SerializableRunnable
@@@ -298,8 -298,8 +298,8 @@@
     *
     * @param  callable
     *         The {@code Callable} to be run
--   * @param  name 
--   *         The name of the {@code Callable}, which will be logged in DUnit 
++   * @param  name
++   *         The name of the {@code Callable}, which will be logged in DUnit
     *         output
     *
     * @see SerializableCallable
@@@ -309,7 -309,7 +309,7 @@@
    }
    
    /**
--   * Invokes the {@code call} method of a {@link Callable} in this {@code VM}. 
++   * Invokes the {@code call} method of a {@link Callable} in this {@code VM}.
     *
     * @param  callable
     *         The {@code Callable} to be run
@@@ -335,7 -335,7 +335,7 @@@
    }
  
    /**
--   * Invokes an instance method with no arguments on an object that is 
++   * Invokes an instance method with no arguments on an object that is
     * serialized into this {@code VM}.  The return type of the method can be
     * either {@link Object} or {@code void}.  If the return type of the method
     * is {@code void}, {@code null} is returned.
@@@ -348,8 -348,8 +348,8 @@@
     * @throws RMIException
     *         Wraps any underlying exception thrown while invoking the method in
     *         this {@code VM}
--   *         
--   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead.        
++   *
++   * @deprecated Please use {@link #invoke(SerializableCallableIF)} instead.
     */
    public Object invoke(final Object targetObject, final String methodName) {
      return invoke(targetObject, methodName, new Object[0]);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 6abac09,6fef000..ee823d7
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@@ -376,15 -377,15 +376,15 @@@ public void waitForListClientMbean2()
      
      commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId1 + "\"" ;
      
--    getLogWriter().info("testDescribeClientWithServers commandStr clientId1 ="+commandString);    
++    getLogWriter().info("testDescribeClientWithServers commandStr clientId1 ="+commandString);
      
      
      CommandResult commandResultForClient1 = executeCommand(commandString);
--    getLogWriter().info("testDescribeClientWithServers commandStr clientId1="+commandResultForClient1);    
++    getLogWriter().info("testDescribeClientWithServers commandStr clientId1="+commandResultForClient1);
      
      
      String resultAsString = commandResultToString(commandResultForClient1);
--    getLogWriter().info("testDescribeClientWithServers commandStr clientId1 ="+resultAsString);   
++    getLogWriter().info("testDescribeClientWithServers commandStr clientId1 ="+resultAsString);
      assertTrue(Status.OK.equals(commandResultForClient1.getStatus()));
      
      verifyClientStats(commandResultForClient1, serverName1);
@@@ -393,15 -394,15 +393,15 @@@
      
      commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId2 + "\"" ;
      
--    getLogWriter().info("testDescribeClientWithServers commandStr1="+commandString);    
++    getLogWriter().info("testDescribeClientWithServers commandStr1="+commandString);
      
      
      CommandResult commandResultForClient2 = executeCommand(commandString);
--    getLogWriter().info("testDescribeClientWithServers commandResult1="+commandResultForClient2);    
++    getLogWriter().info("testDescribeClientWithServers commandResult1="+commandResultForClient2);
      
      
      resultAsString = commandResultToString(commandResultForClient2);
--    getLogWriter().info("testDescribeClientWithServers resultAsString1="+resultAsString);   
++    getLogWriter().info("testDescribeClientWithServers resultAsString1="+resultAsString);
      assertTrue(Status.OK.equals(commandResultForClient2.getStatus()));
      
      verifyClientStats(commandResultForClient2, serverName2);
@@@ -461,7 -462,7 +461,7 @@@
    public void testDescribeClient() throws Exception {
      setupSystem();
      
--    getLogWriter().info("testDescribeClient clientId="+clientId);    
++    getLogWriter().info("testDescribeClient clientId="+clientId);
      assertNotNull(clientId);
      
      String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
@@@ -479,11 -480,11 +479,11 @@@
      
      
      CommandResult commandResult = executeCommand(commandString);
--    getLogWriter().info("testDescribeClient commandResult="+commandResult);    
++    getLogWriter().info("testDescribeClient commandResult="+commandResult);
      
      
      String resultAsString = commandResultToString(commandResult);
--    getLogWriter().info("testDescribeClient resultAsString="+resultAsString);   
++    getLogWriter().info("testDescribeClient resultAsString="+resultAsString);
      assertTrue(Status.OK.equals(commandResult.getStatus()));
      
      CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
@@@ -533,7 -534,7 +533,7 @@@
      setupSystem2();
      
      String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
--    getLogWriter().info("testDescribeClientWithServers commandStr="+commandString);    
++    getLogWriter().info("testDescribeClientWithServers commandStr="+commandString);
      
      
      final VM server1 = Host.getHost(0).getVM(1);
@@@ -547,11 -548,11 +547,11 @@@
      
      
      CommandResult commandResult = executeCommand(commandString);
--    getLogWriter().info("testDescribeClientWithServers commandResult="+commandResult);    
++    getLogWriter().info("testDescribeClientWithServers commandResult="+commandResult);
      
      
      String resultAsString = commandResultToString(commandResult);
--    getLogWriter().info("testDescribeClientWithServers resultAsString="+resultAsString);   
++    getLogWriter().info("testDescribeClientWithServers resultAsString="+resultAsString);
      assertTrue(Status.OK.equals(commandResult.getStatus()));
      
      CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
@@@ -632,11 -633,11 +632,11 @@@
      });
      
      CommandResult commandResult = executeCommand(commandString);
--    getLogWriter().info("testListClient commandResult="+commandResult);    
++    getLogWriter().info("testListClient commandResult="+commandResult);
      
      
      String resultAsString = commandResultToString(commandResult);
--    getLogWriter().info("testListClient resultAsString="+resultAsString);   
++    getLogWriter().info("testListClient resultAsString="+resultAsString);
      assertTrue(Status.OK.equals(commandResult.getStatus()));
      
      
@@@ -650,8 -651,8 +650,8 @@@
      List<String> clientNames = tableRsultData.retrieveAllValues(CliStrings.LIST_CLIENT_COLUMN_Clients);
      
      
--    getLogWriter().info("testListClients serverNames : " + serverNames);    
--    getLogWriter().info("testListClients clientNames : " + clientNames);  
++    getLogWriter().info("testListClients serverNames : " + serverNames);
++    getLogWriter().info("testListClients clientNames : " + clientNames);
      assertEquals(2, serverNames.size());
      assertEquals(2, clientNames.size());    
      assertTrue(clientNames.contains(clientIds[0]));
@@@ -716,11 -717,11 +716,11 @@@
      });
      
      CommandResult commandResult = executeCommand(commandString);
--    getLogWriter().info("testListClientForServers commandResult="+commandResult);    
++    getLogWriter().info("testListClientForServers commandResult="+commandResult);
      
      
      String resultAsString = commandResultToString(commandResult);
--    getLogWriter().info("testListClientForServers resultAsString="+resultAsString);   
++    getLogWriter().info("testListClientForServers resultAsString="+resultAsString);
      assertTrue(Status.OK.equals(commandResult.getStatus()));
      
      
@@@ -1158,7 -1159,7 +1158,7 @@@ public void waitForMixedClients()
    public void testDescribeClientForNonSubscribedClient() throws Exception {
      setUpNonSubscribedClient();
      
--    getLogWriter().info("testDescribeClientForNonSubscribedClient clientId="+clientId);    
++    getLogWriter().info("testDescribeClientForNonSubscribedClient clientId="+clientId);
      assertNotNull(clientId);
      
      String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
@@@ -1175,11 -1176,11 +1175,11 @@@
      
      
      CommandResult commandResult = executeCommand(commandString);
--    getLogWriter().info("testDescribeClientForNonSubscribedClient commandResult="+commandResult);    
++    getLogWriter().info("testDescribeClientForNonSubscribedClient commandResult="+commandResult);
      
      
      String resultAsString = commandResultToString(commandResult);
--    getLogWriter().info("testDescribeClientForNonSubscribedClient resultAsString="+resultAsString);   
++    getLogWriter().info("testDescribeClientForNonSubscribedClient resultAsString="+resultAsString);
      assertTrue(Status.OK.equals(commandResult.getStatus()));
      
      CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
@@@ -1249,7 -1250,7 +1249,7 @@@
      executeAndVerifyResultsForMixedClients(commandString, serverName );    
      
      String commandString2 = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientIds[1] + "\"" ;
--    getLogWriter().info("testDescribeMixClientWithServers commandString2="+commandString2);   
++    getLogWriter().info("testDescribeMixClientWithServers commandString2="+commandString2);
      
      
      executeAndVerifyResultsForMixedClients(commandString2,serverName );
@@@ -1262,7 -1263,7 +1262,7 @@@
    
  void executeAndVerifyResultsForMixedClients(String commandString, String serverName){
    CommandResult commandResult = executeCommand(commandString);
--  getLogWriter().info("testDescribeMixClientWithServers commandResult="+commandResult);    
++  getLogWriter().info("testDescribeMixClientWithServers commandResult="+commandResult);
    
    
    String resultAsString = commandResultToString(commandResult);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 1ee5c33,719fd92..49a978c
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@@ -16,6 -16,16 +16,15 @@@
   */
  package com.gemstone.gemfire.internal.cache.wan.wancommand;
  
 -import static com.gemstone.gemfire.test.dunit.Assert.*;
 -
+ import java.io.File;
+ import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Properties;
+ import java.util.Set;
++
+ import javax.management.remote.JMXConnectorServer;
+ 
  import com.gemstone.gemfire.cache.Cache;
  import com.gemstone.gemfire.cache.CacheFactory;
  import com.gemstone.gemfire.cache.DiskStore;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 8462a37,b54b27f..5a352c1
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@@ -128,29 -129,29 +129,27 @@@ public class WanCommandPauseResumeDUnit
      props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
      props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
      props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]");
 -    createDefaultSetup(props);
 +    setUpJmxManagerOnVm0ThenConnect(props);
  
 -    Integer nyPort = (Integer) vm2.invoke(() -> WANCommandTestBase.createFirstRemoteLocator( 2, punePort ));
 +    Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort ));
  
-     vm3.invoke(() -> createCache( punePort ));
-     vm3.invoke(() -> createSender( "ln",
+     vm3.invoke(() -> WANCommandTestBase.createCache( punePort ));
+     vm3.invoke(() -> WANCommandTestBase.createSender( "ln",
              2, false, 100, 400, false, false, null, true ));
-     vm4.invoke(() -> createCache( punePort ));
-     vm4.invoke(() -> createSender( "ln",
+     vm4.invoke(() -> WANCommandTestBase.createCache( punePort ));
+     vm4.invoke(() -> WANCommandTestBase.createSender( "ln",
              2, false, 100, 400, false, false, null, true ));
-     vm5.invoke(() -> createCache( punePort ));
-     vm5.invoke(() -> createSender( "ln",
+     vm5.invoke(() -> WANCommandTestBase.createCache( punePort ));
+     vm5.invoke(() -> WANCommandTestBase.createSender( "ln",
              2, false, 100, 400, false, false, null, true ));
  
 -    vm3.invoke(() -> WANCommandTestBase.startSender( "ln" ));
 -    vm4.invoke(() -> WANCommandTestBase.startSender( "ln" ));
 -    vm5.invoke(() -> WANCommandTestBase.startSender( "ln" ));
 +    vm3.invoke(() -> startSender( "ln" ));
-     vm4.invoke(() -> startSender( "ln" ));
-     vm5.invoke(() -> startSender( "ln" ));
  
-     vm3.invoke(() -> verifySenderState(
+     vm3.invoke(() -> WANCommandTestBase.verifySenderState(
              "ln", true, false ));
-     vm4.invoke(() -> verifySenderState(
+     vm4.invoke(() -> WANCommandTestBase.verifySenderState(
              "ln", true, false ));
-     vm5.invoke(() -> verifySenderState(
+     vm5.invoke(() -> WANCommandTestBase.verifySenderState(
              "ln", true, false ));
  
      pause(10000);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31c6054f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------


Mime
View raw message