geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject incubator-geode git commit: Renambe DUnitTestRule to DistributedTestRule
Date Tue, 22 Dec 2015 19:27:08 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-217 ca1550700 -> 3f6944760


Renambe DUnitTestRule to DistributedTestRule


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

Branch: refs/heads/feature/GEODE-217
Commit: 3f694476099b558a7c8422b479a58828b86f8ed5
Parents: ca15507
Author: Kirk Lund <klund@pivotal.io>
Authored: Tue Dec 22 11:26:31 2015 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Tue Dec 22 11:26:31 2015 -0800

----------------------------------------------------------------------
 .../distributed/DistributedMemberDUnitTest.java |   8 +-
 .../distributed/HostedLocatorsDUnitTest.java    |   6 +-
 .../LocalDistributionManagerDUnitTest.java      |   6 +-
 .../gemfire/test/dunit/DUnitTestRule.java       | 802 -------------------
 .../gemfire/test/dunit/DistributedTestRule.java | 802 +++++++++++++++++++
 .../dunit/rules/DistributedDisconnectRule.java  |   2 +-
 ...ributedRestoreSystemPropertiesDUnitTest.java |   4 +-
 .../test/dunit/tests/BasicDUnitTest.java        |   6 +-
 .../tests/DUnitTestRuleChainDUnitTest.java      |   4 +-
 .../DistributedTestNameWithRuleDUnitTest.java   |   6 +-
 .../tests/LogPerTestClassOneDUnitTest.java      |   6 +-
 .../tests/LogPerTestClassTwoDUnitTest.java      |   6 +-
 .../dunit/tests/LogPerTestMethodDUnitTest.java  |   6 +-
 .../SerializableTemporaryFolderDUnitTest.java   |   4 +-
 .../tests/SerializableTestNameDUnitTest.java    |   4 +-
 .../tests/SerializableTestWatcherDUnitTest.java |   4 +-
 .../gemfire/test/dunit/tests/VMDUnitTest.java   |   4 +-
 .../CatchExceptionExampleDUnitTest.java         |   4 +-
 18 files changed, 842 insertions(+), 842 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 31ef697..0629fff 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -16,8 +16,8 @@
  */
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.disconnectAllFromDS;
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.getSystem;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.disconnectAllFromDS;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.getSystem;
 import static com.googlecode.catchexception.CatchException.catchException;
 import static com.googlecode.catchexception.CatchException.caughtException;
 import static com.jayway.awaitility.Awaitility.with;
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.distributed.internal.DM;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.RMIException;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -80,7 +80,7 @@ import com.gemstone.gemfire.test.junit.categories.MembershipTest;
 public class DistributedMemberDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.build();
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.build();
   
   private Properties config;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
index 0b5048a..c212a88 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static com.gemstone.gemfire.test.dunit.Invoke.*;
 import static com.jayway.awaitility.Awaitility.*;
 import static java.util.concurrent.TimeUnit.*;
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.util.StopWatch;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -73,7 +73,7 @@ public class HostedLocatorsDUnitTest implements Serializable {
   protected transient volatile LocatorLauncher launcher;
   
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.builder()
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.builder()
       .disconnectBefore(true)
       .disconnectAfter(true)
       .innerRule(new DistributedRestoreSystemProperties())

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
index 1e681f7..bfca8b1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LocalDistributionManagerDUnitTest.java
@@ -7,7 +7,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static com.gemstone.gemfire.test.dunit.Threads.*;
 import static com.gemstone.gemfire.test.dunit.Wait.*;
 import static org.assertj.core.api.Assertions.*;
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.MembershipTest;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 public class LocalDistributionManagerDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.build();
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.build();
 
   @Before
   public void before() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DUnitTestRule.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DUnitTestRule.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DUnitTestRule.java
deleted file mode 100755
index 6fd135f..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DUnitTestRule.java
+++ /dev/null
@@ -1,802 +0,0 @@
-package com.gemstone.gemfire.test.dunit;
-
-import static com.gemstone.gemfire.test.dunit.DUnitEnv.getAllDistributedSystemProperties;
-import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
-import static com.gemstone.gemfire.test.dunit.Invoke.invokeInLocator;
-import static org.junit.Assert.assertEquals;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.logging.log4j.Logger;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
-import com.gemstone.gemfire.cache.hdfs.internal.hoplog.HoplogConfig;
-import com.gemstone.gemfire.cache.query.QueryTestUtils;
-import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
-import com.gemstone.gemfire.cache30.ClientServerTestCase;
-import com.gemstone.gemfire.cache30.GlobalLockingDUnitTest;
-import com.gemstone.gemfire.cache30.MultiVMRegionTestCase;
-import com.gemstone.gemfire.cache30.RegionTestCase;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.CreationStackGenerator;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.InternalDataSerializer;
-import com.gemstone.gemfire.internal.InternalInstantiator;
-import com.gemstone.gemfire.internal.SocketCreator;
-import com.gemstone.gemfire.internal.admin.ClientStatsManager;
-import com.gemstone.gemfire.internal.cache.DiskStoreObserver;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.InitialImageOperation;
-import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.cache.tier.sockets.DataSerializerPropogationDUnitTest;
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.management.internal.cli.LogWrapper;
-import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher;
-import com.gemstone.gemfire.test.junit.rules.SerializableTestRule;
-
-/**
- * TestRule for DistributedTest. Use this for DUnit tests using JUnit 4.x 
- * syntax instead of extending DistributedTestCase. 
- *
- * @author Kirk Lund
- */
-@SuppressWarnings("serial")
-public class DUnitTestRule implements SerializableTestRule {
-  private static final Logger logger = LogService.getLogger();
-
-  private static final String LOG_PER_TEST_CLASS_PROPERTY = "dunitLogPerTest";
-
-  private volatile String className;
-  private volatile String methodName;
-  
-  private final boolean disconnectBeforeClass;
-  private final boolean disconnectAfterClass;
-  private final boolean disconnectBefore;
-  private final boolean disconnectAfter;
-  
-  private final transient RuleChain ruleChain;
-  
-  private static class StaticContext {
-    private static volatile boolean logPerTestClass;
-    private static volatile boolean logPerTestMethod;
-
-    private static volatile InternalDistributedSystem system;
-    private static volatile String previousSystemCreatedInTestClass;
-    private static volatile Properties previousProperties;
-    
-    private static volatile String testClassName;
-    private static volatile String testMethodName;
-  }
-  
-  public static Builder builder() {
-    return new Builder();
-  }
-  
-  public static DUnitTestRule build() {
-    return new Builder().build();
-  }
-  
-  protected DUnitTestRule(final Builder builder) {
-    StaticContext.logPerTestClass = builder.logPerTestClass;
-    StaticContext.logPerTestMethod = builder.logPerTestMethod;
-    this.disconnectBeforeClass = builder.disconnectBeforeClass;
-    this.disconnectAfterClass = builder.disconnectAfterClass;
-    this.disconnectBefore = builder.disconnectBefore;
-    this.disconnectAfter = builder.disconnectAfter;
-    this.ruleChain = buildRuleChain(builder, new ThisRule());
-  }
-  
-  private static RuleChain buildRuleChain(final Builder builder, final ThisRule thisRule) {
-    final List<TestRule> rules = new ArrayList<TestRule>();
-    
-    for (TestRule testRule : builder.outerRule) {
-      rules.add(testRule);
-    }
-    rules.add(thisRule);
-    for (TestRule testRule : builder.innerRule) {
-      rules.add(testRule);
-    }
-
-    RuleChain ruleChain = RuleChain.outerRule(rules.get(0));
-    for (int i = 1; i < rules.size(); i++) {
-      ruleChain = ruleChain.around(rules.get(i));
-    }
-    
-    return ruleChain;
-  }
-  
-  public DUnitTestRule() {
-    StaticContext.logPerTestClass = Boolean.getBoolean(LOG_PER_TEST_CLASS_PROPERTY);
-    this.disconnectBeforeClass = false;
-    this.disconnectAfterClass = false;
-    this.disconnectBefore = false;
-    this.disconnectAfter = false;
-    this.ruleChain = RuleChain.outerRule(new ThisRule());
-  }
-  
-  private class ThisRule implements TestRule, Serializable {
-    @Override
-    public Statement apply(final Statement base, final Description description) {
-      if (description.isTest()) {
-        starting(description);
-        return statement(base, description);
-      } else if (description.isSuite()) {
-        startingSuite(description);
-        return statementSuite(base, description);
-      }
-      return base;
-    }
-  }
-  
-  @Override
-  public Statement apply(final Statement base, final Description description) {
-    return this.ruleChain.apply(base, description);
-  }
-  
-  /**
-   * Invoked when a suite is about to start
-   */
-  protected void startingSuite(final Description description) {
-    this.className = description.getClassName();
-
-    boolean newTestClass = false;
-    if (StaticContext.testClassName != null && !this.className.equals(StaticContext.testClassName)) {
-      // new test class detected
-      newTestClass = true;
-    }
-    
-    if (newTestClass && StaticContext.logPerTestClass) {
-      disconnectAllFromDS();
-    }
-    
-    StaticContext.testClassName = this.className;
-  }
-  
-  protected void beforeSuite() throws Throwable {
-    DUnitLauncher.launchIfNeeded();
-    
-    setUpDistributedTestCase();
-    
-    if (this.disconnectBeforeClass) {
-      disconnectAllFromDS();
-    }
-  }
-
-  protected void afterSuite() throws Throwable {
-    if (this.disconnectAfterClass) {
-      disconnectAllFromDS();
-    }
-  }
-  
-  /**
-   * Invoked when a test is about to start
-   */
-  protected void starting(final Description description) {
-    this.className = description.getClassName();
-    this.methodName = description.getMethodName();
-    
-    boolean newTestClass = false;
-    if (StaticContext.testClassName != null && !this.className.equals(StaticContext.testClassName)) {
-      // new test class detected
-      newTestClass = true;
-    }
-    
-    if (newTestClass && StaticContext.logPerTestClass) {
-      disconnectAllFromDS();
-    }
-    
-    StaticContext.testClassName = this.className;
-    StaticContext.testMethodName = this.methodName;
-  }
-  
-  protected void before() throws Throwable {
-    DUnitLauncher.launchIfNeeded();
-    
-    setUpDistributedTestCase();
-    
-    if (this.disconnectBefore) {
-      disconnectAllFromDS();
-    }
-  }
-
-  protected void after() throws Throwable {
-    if (this.disconnectAfter) {
-      disconnectAllFromDS();
-    }
-
-    tearDownDistributedTestCase();
-  }
-  
-  public String getClassName() {
-    return this.className;
-  }
-  
-  public String getMethodName() {
-    return this.methodName;
-  }
-  
-  public static String getUniqueName() {
-    return StaticContext.testClassName + "_" + StaticContext.testMethodName;
-  }
-  
-  public static String getTestClassName() {
-    return StaticContext.testClassName;
-  }
-  
-  public static String getTestMethodName() {
-    return StaticContext.testMethodName;
-  }
-  
-  private Statement statementSuite(final Statement base, final Description description) {
-    return new Statement() {
-      @Override
-      public void evaluate() throws Throwable {
-        beforeSuite();
-        try {
-          base.evaluate();
-        } finally {
-          afterSuite();
-        }
-      }
-    };
-  }
-  
-  private Statement statement(final Statement base, final Description description) {
-    return new Statement() {
-      @Override
-      public void evaluate() throws Throwable {
-        before();
-        try {
-          base.evaluate();
-        } finally {
-          after();
-        }
-      }
-    };
-  }
-  
-  //---------------------------------------------------------------------------
-  // customization methods
-  //---------------------------------------------------------------------------
-  
-  /**
-   * Returns a <code>Properties</code> object used to configure a
-   * connection to a {@link
-   * com.gemstone.gemfire.distributed.DistributedSystem}.
-   * Unless overridden, this method will return an empty
-   * <code>Properties</code> object.
-   *
-   * @since 3.0
-   */
-  public static Properties getDistributedSystemProperties() {
-    // TODO: extension point
-    return new Properties();
-  }
-
-  /**
-   * Tears down the test. This method is called by the final {@link #tearDown()} method and should be overridden to
-   * perform actual test cleanup and release resources used by the test.  The tasks executed by this method are
-   * performed before the DUnit test framework using Hydra cleans up the client VMs.
-   * <p/>
-   * @throws Exception if the tear down process and test cleanup fails.
-   * @see #tearDown
-   * @see #tearDownAfter()
-   */
-  protected void tearDownBefore() throws Exception {
-    // TODO: extension point
-  }
-
-  /**
-   * Tears down the test.  Performs additional tear down tasks after the DUnit tests framework using Hydra cleans up
-   * the client VMs.  This method is called by the final {@link #tearDown()} method and should be overridden to perform
-   * post tear down activities.
-   * <p/>
-   * @throws Exception if the test tear down process fails.
-   * @see #tearDown()
-   * @see #tearDownBefore()
-   */
-  protected void tearDownAfter() throws Exception {
-    // TODO: extension point
-  }
-
-  //---------------------------------------------------------------------------
-  // public getSystem methods
-  //---------------------------------------------------------------------------
-  
-  /**
-   * Returns this VM's connection to the distributed system.  If
-   * necessary, the connection will be lazily created using the given
-   * <code>Properties</code>.  Note that this method uses hydra's
-   * configuration to determine the location of log files, etc.
-   * Note: "final" was removed so that WANTestBase can override this method.
-   * This was part of the xd offheap merge.
-   *
-   * @see hydra.DistributedConnectionMgr#connect
-   * @since 3.0
-   */
-  public static InternalDistributedSystem getSystem(final Properties properties) {
-    if (!hasPreviousSystem()) {
-      final Properties newProperties = getAllDistributedSystemProperties(properties);
-      
-      if (StaticContext.logPerTestMethod) {
-        newProperties.put(DistributionConfig.LOG_FILE_NAME, getUniqueName() + ".log");
-        newProperties.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getUniqueName() + ".gfs");
-      } else if (StaticContext.logPerTestClass) {
-        newProperties.put(DistributionConfig.LOG_FILE_NAME, getTestClassName() + ".log");
-        newProperties.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getTestClassName() + ".gfs");
-      }
-      
-      StaticContext.system = (InternalDistributedSystem)DistributedSystem.connect(newProperties);
-
-      StaticContext.previousSystemCreatedInTestClass = getTestClassName();
-      StaticContext.previousProperties = newProperties;
-      
-    } else {
-      boolean needNewSystem = previousPropertiesAreDifferentThan(properties);
-        
-      needNewSystem = needNewSystem || propertiesAreDifferentThanCurrentSystem(properties);
-      
-      if (needNewSystem) {
-        // the current system does not meet our needs to disconnect and
-        // call recursively to get a new system.
-        logger.info("Disconnecting from current DS in order to make a new one");
-        disconnectFromDS();
-        getSystem(properties);
-      }
-    }
-    return StaticContext.system;
-  }
-  
-  private static boolean hasPreviousSystem() {
-    if (StaticContext.system == null) {
-      StaticContext.system = InternalDistributedSystem.getAnyInstance();
-    }
-    
-    return StaticContext.system != null && StaticContext.system.isConnected();
-  }
-  
-  private static boolean previousPropertiesAreDifferentThan(final Properties properties) {
-    boolean needNewSystem = false;
-    if (!getTestClassName().equals(StaticContext.previousSystemCreatedInTestClass)) {
-      // previous system was created in a previous test class
-      final Properties newProperties = getAllDistributedSystemProperties(properties);
-      needNewSystem = !newProperties.equals(StaticContext.previousProperties);
-      if (needNewSystem) {
-        logger.info(
-            "Test class has changed and the new DS properties are not an exact match. "
-                + "Forcing DS disconnect. Old props = "
-                + StaticContext.previousProperties + "new props=" + newProperties);
-      }
-    }
-    return needNewSystem;
-  }
-  
-  private static boolean propertiesAreDifferentThanCurrentSystem(final Properties properties) {
-    // previous system was created in this test class
-    final Properties currentProperties = StaticContext.system.getProperties();
-    for (Iterator<Map.Entry<Object,Object>> iter = properties.entrySet().iterator(); iter.hasNext(); ) {
-      final Map.Entry<Object,Object> entry = iter.next();
-      final String key = (String) entry.getKey();
-      final String value = (String) entry.getValue();
-      if (!value.equals(currentProperties.getProperty(key))) {
-        logger.info("Forcing DS disconnect. For property " + key
-                            + " old value = " + currentProperties.getProperty(key)
-                            + " new value = " + value);
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  /**
-   * Returns this VM's connection to the distributed system.  If
-   * necessary, the connection will be lazily created using the
-   * <code>Properties</code> returned by {@link
-   * #getDistributedSystemProperties}.
-   *
-   * @see #getSystem(Properties)
-   *
-   * @since 3.0
-   */
-  public static InternalDistributedSystem getSystem() {
-    return getSystem(getDistributedSystemProperties());
-  }
-
-  /**
-   * Returns a loner distributed system that isn't connected to other
-   * vms
-   * 
-   * @since 6.5
-   */
-  public static InternalDistributedSystem getLonerSystem() {
-    Properties props = getDistributedSystemProperties();
-    props.put(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.put(DistributionConfig.LOCATORS_NAME, "");
-    return getSystem(props);
-  }
-  
-  /**
-   * Returns a loner distributed system in combination with enforceUniqueHost
-   * and redundancyZone properties.
-   * Added specifically to test scenario of defect #47181.
-   */
-  public static InternalDistributedSystem getLonerSystemWithEnforceUniqueHost() {
-    Properties props = getDistributedSystemProperties();
-    props.put(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.put(DistributionConfig.LOCATORS_NAME, "");
-    props.put(DistributionConfig.ENFORCE_UNIQUE_HOST_NAME, "true");
-    props.put(DistributionConfig.REDUNDANCY_ZONE_NAME, "zone1");
-    return getSystem(props);
-  }
-
-  /**
-   * Returns an mcast distributed system that is connected to other
-   * vms using a random mcast port.
-   */
-  public static InternalDistributedSystem getMcastSystem() {
-    Properties props = getDistributedSystemProperties();
-    int port = AvailablePort.getRandomAvailablePort(AvailablePort.MULTICAST);
-    props.put(DistributionConfig.MCAST_PORT_NAME, ""+port);
-    props.put(DistributionConfig.MCAST_TTL_NAME, "0");
-    props.put(DistributionConfig.LOCATORS_NAME, "");
-    return getSystem(props);
-  }
-
-  /**
-   * Returns an mcast distributed system that is connected to other
-   * vms using the given mcast port.
-   */
-  public static InternalDistributedSystem getMcastSystem(int jgroupsPort) {
-    Properties props = getDistributedSystemProperties();
-    props.put(DistributionConfig.MCAST_PORT_NAME, ""+jgroupsPort);
-    props.put(DistributionConfig.MCAST_TTL_NAME, "0");
-    props.put(DistributionConfig.LOCATORS_NAME, "");
-    return getSystem(props);
-  }
-
-  /**
-   * Returns whether or this VM is connected to a {@link
-   * DistributedSystem}.
-   */
-  public static boolean isConnectedToDS() {
-    return StaticContext.system != null && StaticContext.system.isConnected();
-  }
-
-  //---------------------------------------------------------------------------
-  // public cleanup methods
-  //---------------------------------------------------------------------------
-  
-  public static void cleanupAllVms() {
-    cleanupThisVM();
-
-    invokeInEveryVM(new SerializableRunnable() {
-      @Override
-      public void run() {
-        cleanupThisVM();
-      }
-    });
-    
-    invokeInLocator(new SerializableRunnable() {
-      @Override
-      public void run() {
-        DistributionMessageObserver.setInstance(null);
-        unregisterInstantiatorsInThisVM();
-      }
-    });
-    
-    DUnitLauncher.closeAndCheckForSuspects();
-  }
-
-  public static void unregisterAllDataSerializersFromAllVms() {
-    unregisterDataSerializerInThisVM();
-    
-    invokeInEveryVM(new SerializableRunnable() {
-      @Override
-      public void run() {
-        unregisterDataSerializerInThisVM();
-      }
-    });
-    
-    invokeInLocator(new SerializableRunnable() {
-      @Override
-      public void run() {
-        unregisterDataSerializerInThisVM();
-      }
-    });
-  }
-
-  public static void unregisterInstantiatorsInThisVM() {
-    // unregister all the instantiators
-    InternalInstantiator.reinitialize();
-    assertEquals(0, InternalInstantiator.getInstantiators().length);
-  }
-  
-  public static void unregisterDataSerializerInThisVM() {
-    DataSerializerPropogationDUnitTest.successfullyLoadedTestDataSerializer = false;
-    // unregister all the Dataserializers
-    InternalDataSerializer.reinitialize();
-    // ensure that all are unregistered
-    assertEquals(0, InternalDataSerializer.getSerializers().length);
-  }
-
-  public static void disconnectAllFromDS() {
-    disconnectFromDS();
-    invokeInEveryVM(new SerializableRunnable() {
-      @Override
-      public void run() { 
-        disconnectFromDS();
-      }
-    });
-  }
-
-  /**
-   * Disconnects this VM from the distributed system
-   */
-  public static void disconnectFromDS() {
-    GemFireCacheImpl.testCacheXml = null;
-    
-    if (StaticContext.system != null) {
-      StaticContext.system.disconnect();
-      StaticContext.system = null;
-    }
-    
-    for (;;) {
-      DistributedSystem ds = InternalDistributedSystem.getConnectedInstance();
-      if (ds == null) {
-        break;
-      }
-      try {
-        ds.disconnect();
-      }
-      catch (Exception e) {
-        // ignore
-      }
-    }
-    
-    AdminDistributedSystemImpl ads = AdminDistributedSystemImpl.getConnectedInstance();
-    if (ads != null) {
-      ads.disconnect();
-    }
-  }
-
-  //---------------------------------------------------------------------------
-  // private static methods
-  //---------------------------------------------------------------------------
-  
-  private static void setUpDistributedTestCase() throws Exception {
-    setUpCreationStackGenerator();
-    
-    System.setProperty(HoplogConfig.ALLOW_LOCAL_HDFS_PROP, "true");
-
-    final String vmid = System.getProperty("vmid");
-    final String defaultDiskStoreName = "DiskStore-"  + vmid + "-"+ StaticContext.testClassName + "." + getTestMethodName();
-    GemFireCacheImpl.setDefaultDiskStoreName(defaultDiskStoreName); // TODO: not thread safe
-    
-    for (int h = 0; h < Host.getHostCount(); h++) {
-      Host host = Host.getHost(h);
-      for (int v = 0; v < host.getVMCount(); v++) {
-        VM vm = host.getVM(v);
-        final String vmDefaultDiskStoreName = "DiskStore-" + h + "-" + v + "-" + StaticContext.testClassName + "." + StaticContext.testMethodName;
-        setUpInVM(vm, StaticContext.testClassName, StaticContext.testMethodName, vmDefaultDiskStoreName);
-      }
-    }
-    //System.out.println("\n\n[setup] START TEST " + getClass().getSimpleName()+"."+testName+"\n\n");
-  }
-  
-  private static void setUpInVM(final VM vm, final String testClassNameToUse, final String testMethodNameToUse, final String diskStoreNameToUse) {
-    vm.invoke(new SerializableRunnable() {
-      @Override
-      public void run() {
-        setUpCreationStackGenerator();
-        StaticContext.testClassName = testClassNameToUse;
-        StaticContext.testMethodName = testMethodNameToUse;
-        System.setProperty(HoplogConfig.ALLOW_LOCAL_HDFS_PROP, "true");    
-        GemFireCacheImpl.setDefaultDiskStoreName(diskStoreNameToUse); // TODO: not thread safe
-      }
-    });
-  }
-    
-  /**
-   * For logPerTest to work, we have to disconnect from the DS, but all
-   * subclasses do not call super.tearDown(). To prevent this scenario
-   * this method has been declared final. Subclasses must now override
-   * {@link #tearDownBefore()} instead.
-   * @throws Exception
-   */
-  private final void tearDownDistributedTestCase() throws Exception {
-    tearDownBefore();
-    realTearDown();
-    tearDownAfter();
-    
-    tearDownCreationStackGenerator();
-
-    tearDownInEveryVM();
-  }
-
-  private static void realTearDown() throws Exception {
-    if (StaticContext.logPerTestMethod) {
-      disconnectAllFromDS();
-    }
-    cleanupAllVms();
-  }
-    
-  private static void tearDownInEveryVM() {
-    invokeInEveryVM(new SerializableRunnable() {
-      @Override
-      public void run() {    
-        tearDownCreationStackGenerator();
-        StaticContext.testClassName = null;
-        StaticContext.testMethodName = null;
-      }
-    });
-  }
-  
-  private static void setUpCreationStackGenerator() {
-    // the following is moved from InternalDistributedSystem to fix #51058
-    InternalDistributedSystem.TEST_CREATION_STACK_GENERATOR.set(
-    new CreationStackGenerator() {
-      @Override
-      public Throwable generateCreationStack(final DistributionConfig config) {
-        final StringBuilder sb = new StringBuilder();
-        final String[] validAttributeNames = config.getAttributeNames();
-        for (int i = 0; i < validAttributeNames.length; i++) {
-          final String attName = validAttributeNames[i];
-          final Object actualAtt = config.getAttributeObject(attName);
-          String actualAttStr = actualAtt.toString();
-          sb.append("  ");
-          sb.append(attName);
-          sb.append("=\"");
-          if (actualAtt.getClass().isArray()) {
-            actualAttStr = InternalDistributedSystem.arrayToString(actualAtt);
-          }
-          sb.append(actualAttStr);
-          sb.append("\"");
-          sb.append("\n");
-        }
-        return new Throwable("Creating distributed system with the following configuration:\n" + sb.toString());
-      }
-    });
-  }
-  
-  private static void tearDownCreationStackGenerator() {
-    InternalDistributedSystem.TEST_CREATION_STACK_GENERATOR.set(InternalDistributedSystem.DEFAULT_CREATION_STACK_GENERATOR);
-  }
-  
-  private static void cleanupThisVM() {
-    SocketCreator.resolve_dns = true;
-    CacheCreation.clearThreadLocals();
-    System.clearProperty("gemfire.log-level");
-    System.clearProperty("jgroups.resolve_dns");
-    InitialImageOperation.slowImageProcessing = 0;
-    DistributionMessageObserver.setInstance(null);
-    QueryTestUtils.setCache(null);
-    CacheServerTestUtil.clearCacheReference();
-    RegionTestCase.preSnapshotRegion = null;
-    GlobalLockingDUnitTest.region_testBug32356 = null;
-    LogWrapper.close();
-    ClientProxyMembershipID.system = null;
-    MultiVMRegionTestCase.CCRegion = null;
-    InternalClientMembership.unregisterAllListeners();
-    ClientStatsManager.cleanupForTests();
-    ClientServerTestCase.AUTO_LOAD_BALANCE = false;
-    unregisterInstantiatorsInThisVM();
-    DistributionMessageObserver.setInstance(null);
-    QueryObserverHolder.reset();
-    DiskStoreObserver.setInstance(null);
-    System.clearProperty("gemfire.log-level");
-    System.clearProperty("jgroups.resolve_dns");
-    
-    if (InternalDistributedSystem.systemAttemptingReconnect != null) {
-      InternalDistributedSystem.systemAttemptingReconnect.stopReconnecting();
-    }
-    ExpectedExceptionString ex;
-    while((ex = ExpectedExceptionString.poll()) != null) {
-      ex.remove();
-    }
-  }
-
-  /**
-   * Builds an instance of DUnitTestRule
-   * 
-   * @author Kirk Lund
-   */
-  public static class Builder {
-    private boolean logPerTestMethod;
-    private boolean logPerTestClass;
-    private boolean disconnectBeforeClass;
-    private boolean disconnectAfterClass;
-    private boolean disconnectBefore;
-    private boolean disconnectAfter;
-    private final List<TestRule> outerRule = new ArrayList<TestRule>();
-    private final List<TestRule> innerRule = new ArrayList<TestRule>();
-    
-    protected Builder() {}
-
-    public Builder vmCount(final int vmCount) {
-      return this;
-    }
-    
-    /**
-     * A new DistributedSystem with .log and .gfs will be created for each test method
-     */
-    public Builder logPerTestMethod(final boolean logPerTestMethod) {
-      this.logPerTestMethod = logPerTestMethod;
-      return this;
-    }
-    
-    /**
-     * A new DistributedSystem with .log and .gfs will be created for each test class
-     */
-    public Builder logPerTestClass(final boolean logPerTestClass) {
-      this.logPerTestClass = logPerTestClass;
-      return this;
-    }
-
-    /**
-     * DistributedSystem will be disconnected before each test class
-     */
-    public Builder disconnectBeforeClass(final boolean disconnectBeforeClass) {
-      this.disconnectBeforeClass = disconnectBeforeClass;
-      return this;
-    }
-    
-    /**
-     * DistributedSystem will be disconnected before each test method
-     */
-    public Builder disconnectBefore(final boolean disconnectBefore) {
-      this.disconnectBefore = disconnectBefore;
-      return this;
-    }
-    
-    /**
-     * DistributedSystem will be disconnected after each test class
-     */
-    public Builder disconnectAfterClass(final boolean disconnectAfterClass) {
-      this.disconnectAfterClass = disconnectAfterClass;
-      return this;
-    }
-    
-    /**
-     * DistributedSystem will be disconnected after each test method
-     */
-    public Builder disconnectAfter(final boolean disconnectAfter) {
-      this.disconnectAfter = disconnectAfter;
-      return this;
-    }
-    
-    /**
-     * Chain the specified TestRule around the DUnitTestRule
-     */
-    public Builder outerRule(final TestRule testRule) {
-      this.outerRule.add(testRule);
-      return this;
-    }
-    
-    /**
-     * Chain the specified TestRule within the DUnitTestRule
-     */
-    public Builder innerRule(final TestRule testRule) {
-      this.innerRule.add(testRule);
-      return this;
-    }
-    
-    public DUnitTestRule build() {
-      return new DUnitTestRule(this);
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestRule.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestRule.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestRule.java
new file mode 100755
index 0000000..f6a5210
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestRule.java
@@ -0,0 +1,802 @@
+package com.gemstone.gemfire.test.dunit;
+
+import static com.gemstone.gemfire.test.dunit.DUnitEnv.getAllDistributedSystemProperties;
+import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
+import static com.gemstone.gemfire.test.dunit.Invoke.invokeInLocator;
+import static org.junit.Assert.assertEquals;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.logging.log4j.Logger;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
+import com.gemstone.gemfire.cache.hdfs.internal.hoplog.HoplogConfig;
+import com.gemstone.gemfire.cache.query.QueryTestUtils;
+import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.GlobalLockingDUnitTest;
+import com.gemstone.gemfire.cache30.MultiVMRegionTestCase;
+import com.gemstone.gemfire.cache30.RegionTestCase;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.CreationStackGenerator;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.InternalDataSerializer;
+import com.gemstone.gemfire.internal.InternalInstantiator;
+import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.admin.ClientStatsManager;
+import com.gemstone.gemfire.internal.cache.DiskStoreObserver;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.InitialImageOperation;
+import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.cache.tier.sockets.DataSerializerPropogationDUnitTest;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.management.internal.cli.LogWrapper;
+import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher;
+import com.gemstone.gemfire.test.junit.rules.SerializableTestRule;
+
+/**
+ * TestRule for DistributedTest. Use this for DUnit tests using JUnit 4.x 
+ * syntax instead of extending DistributedTestCase. 
+ *
+ * @author Kirk Lund
+ */
+@SuppressWarnings("serial")
+public class DistributedTestRule implements SerializableTestRule {
+  private static final Logger logger = LogService.getLogger();
+
+  private static final String LOG_PER_TEST_CLASS_PROPERTY = "dunitLogPerTest";
+
+  private volatile String className;
+  private volatile String methodName;
+  
+  private final boolean disconnectBeforeClass;
+  private final boolean disconnectAfterClass;
+  private final boolean disconnectBefore;
+  private final boolean disconnectAfter;
+  
+  private final transient RuleChain ruleChain;
+  
+  private static class StaticContext {
+    private static volatile boolean logPerTestClass;
+    private static volatile boolean logPerTestMethod;
+
+    private static volatile InternalDistributedSystem system;
+    private static volatile String previousSystemCreatedInTestClass;
+    private static volatile Properties previousProperties;
+    
+    private static volatile String testClassName;
+    private static volatile String testMethodName;
+  }
+  
+  public static Builder builder() {
+    return new Builder();
+  }
+  
+  public static DistributedTestRule build() {
+    return new Builder().build();
+  }
+  
+  protected DistributedTestRule(final Builder builder) {
+    StaticContext.logPerTestClass = builder.logPerTestClass;
+    StaticContext.logPerTestMethod = builder.logPerTestMethod;
+    this.disconnectBeforeClass = builder.disconnectBeforeClass;
+    this.disconnectAfterClass = builder.disconnectAfterClass;
+    this.disconnectBefore = builder.disconnectBefore;
+    this.disconnectAfter = builder.disconnectAfter;
+    this.ruleChain = buildRuleChain(builder, new ThisRule());
+  }
+  
+  private static RuleChain buildRuleChain(final Builder builder, final ThisRule thisRule) {
+    final List<TestRule> rules = new ArrayList<TestRule>();
+    
+    for (TestRule testRule : builder.outerRule) {
+      rules.add(testRule);
+    }
+    rules.add(thisRule);
+    for (TestRule testRule : builder.innerRule) {
+      rules.add(testRule);
+    }
+
+    RuleChain ruleChain = RuleChain.outerRule(rules.get(0));
+    for (int i = 1; i < rules.size(); i++) {
+      ruleChain = ruleChain.around(rules.get(i));
+    }
+    
+    return ruleChain;
+  }
+  
+  public DistributedTestRule() {
+    StaticContext.logPerTestClass = Boolean.getBoolean(LOG_PER_TEST_CLASS_PROPERTY);
+    this.disconnectBeforeClass = false;
+    this.disconnectAfterClass = false;
+    this.disconnectBefore = false;
+    this.disconnectAfter = false;
+    this.ruleChain = RuleChain.outerRule(new ThisRule());
+  }
+  
+  private class ThisRule implements TestRule, Serializable {
+    @Override
+    public Statement apply(final Statement base, final Description description) {
+      if (description.isTest()) {
+        starting(description);
+        return statement(base, description);
+      } else if (description.isSuite()) {
+        startingSuite(description);
+        return statementSuite(base, description);
+      }
+      return base;
+    }
+  }
+  
+  @Override
+  public Statement apply(final Statement base, final Description description) {
+    return this.ruleChain.apply(base, description);
+  }
+  
+  /**
+   * Invoked when a suite is about to start
+   */
+  protected void startingSuite(final Description description) {
+    this.className = description.getClassName();
+
+    boolean newTestClass = false;
+    if (StaticContext.testClassName != null && !this.className.equals(StaticContext.testClassName)) {
+      // new test class detected
+      newTestClass = true;
+    }
+    
+    if (newTestClass && StaticContext.logPerTestClass) {
+      disconnectAllFromDS();
+    }
+    
+    StaticContext.testClassName = this.className;
+  }
+  
+  protected void beforeSuite() throws Throwable {
+    DUnitLauncher.launchIfNeeded();
+    
+    setUpDistributedTestCase();
+    
+    if (this.disconnectBeforeClass) {
+      disconnectAllFromDS();
+    }
+  }
+
+  protected void afterSuite() throws Throwable {
+    if (this.disconnectAfterClass) {
+      disconnectAllFromDS();
+    }
+  }
+  
+  /**
+   * Invoked when a test is about to start
+   */
+  protected void starting(final Description description) {
+    this.className = description.getClassName();
+    this.methodName = description.getMethodName();
+    
+    boolean newTestClass = false;
+    if (StaticContext.testClassName != null && !this.className.equals(StaticContext.testClassName)) {
+      // new test class detected
+      newTestClass = true;
+    }
+    
+    if (newTestClass && StaticContext.logPerTestClass) {
+      disconnectAllFromDS();
+    }
+    
+    StaticContext.testClassName = this.className;
+    StaticContext.testMethodName = this.methodName;
+  }
+  
+  protected void before() throws Throwable {
+    DUnitLauncher.launchIfNeeded();
+    
+    setUpDistributedTestCase();
+    
+    if (this.disconnectBefore) {
+      disconnectAllFromDS();
+    }
+  }
+
+  protected void after() throws Throwable {
+    if (this.disconnectAfter) {
+      disconnectAllFromDS();
+    }
+
+    tearDownDistributedTestCase();
+  }
+  
+  public String getClassName() {
+    return this.className;
+  }
+  
+  public String getMethodName() {
+    return this.methodName;
+  }
+  
+  public static String getUniqueName() {
+    return StaticContext.testClassName + "_" + StaticContext.testMethodName;
+  }
+  
+  public static String getTestClassName() {
+    return StaticContext.testClassName;
+  }
+  
+  public static String getTestMethodName() {
+    return StaticContext.testMethodName;
+  }
+  
+  private Statement statementSuite(final Statement base, final Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        beforeSuite();
+        try {
+          base.evaluate();
+        } finally {
+          afterSuite();
+        }
+      }
+    };
+  }
+  
+  private Statement statement(final Statement base, final Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        before();
+        try {
+          base.evaluate();
+        } finally {
+          after();
+        }
+      }
+    };
+  }
+  
+  //---------------------------------------------------------------------------
+  // customization methods
+  //---------------------------------------------------------------------------
+  
+  /**
+   * Returns a <code>Properties</code> object used to configure a
+   * connection to a {@link
+   * com.gemstone.gemfire.distributed.DistributedSystem}.
+   * Unless overridden, this method will return an empty
+   * <code>Properties</code> object.
+   *
+   * @since 3.0
+   */
+  public static Properties getDistributedSystemProperties() {
+    // TODO: extension point
+    return new Properties();
+  }
+
+  /**
+   * Tears down the test. This method is called by the final {@link #tearDown()} method and should be overridden to
+   * perform actual test cleanup and release resources used by the test.  The tasks executed by this method are
+   * performed before the DUnit test framework using Hydra cleans up the client VMs.
+   * <p/>
+   * @throws Exception if the tear down process and test cleanup fails.
+   * @see #tearDown
+   * @see #tearDownAfter()
+   */
+  protected void tearDownBefore() throws Exception {
+    // TODO: extension point
+  }
+
+  /**
+   * Tears down the test.  Performs additional tear down tasks after the DUnit tests framework using Hydra cleans up
+   * the client VMs.  This method is called by the final {@link #tearDown()} method and should be overridden to perform
+   * post tear down activities.
+   * <p/>
+   * @throws Exception if the test tear down process fails.
+   * @see #tearDown()
+   * @see #tearDownBefore()
+   */
+  protected void tearDownAfter() throws Exception {
+    // TODO: extension point
+  }
+
+  //---------------------------------------------------------------------------
+  // public getSystem methods
+  //---------------------------------------------------------------------------
+  
+  /**
+   * Returns this VM's connection to the distributed system.  If
+   * necessary, the connection will be lazily created using the given
+   * <code>Properties</code>.  Note that this method uses hydra's
+   * configuration to determine the location of log files, etc.
+   * Note: "final" was removed so that WANTestBase can override this method.
+   * This was part of the xd offheap merge.
+   *
+   * @see hydra.DistributedConnectionMgr#connect
+   * @since 3.0
+   */
+  public static InternalDistributedSystem getSystem(final Properties properties) {
+    if (!hasPreviousSystem()) {
+      final Properties newProperties = getAllDistributedSystemProperties(properties);
+      
+      if (StaticContext.logPerTestMethod) {
+        newProperties.put(DistributionConfig.LOG_FILE_NAME, getUniqueName() + ".log");
+        newProperties.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getUniqueName() + ".gfs");
+      } else if (StaticContext.logPerTestClass) {
+        newProperties.put(DistributionConfig.LOG_FILE_NAME, getTestClassName() + ".log");
+        newProperties.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getTestClassName() + ".gfs");
+      }
+      
+      StaticContext.system = (InternalDistributedSystem)DistributedSystem.connect(newProperties);
+
+      StaticContext.previousSystemCreatedInTestClass = getTestClassName();
+      StaticContext.previousProperties = newProperties;
+      
+    } else {
+      boolean needNewSystem = previousPropertiesAreDifferentThan(properties);
+        
+      needNewSystem = needNewSystem || propertiesAreDifferentThanCurrentSystem(properties);
+      
+      if (needNewSystem) {
+        // the current system does not meet our needs to disconnect and
+        // call recursively to get a new system.
+        logger.info("Disconnecting from current DS in order to make a new one");
+        disconnectFromDS();
+        getSystem(properties);
+      }
+    }
+    return StaticContext.system;
+  }
+  
+  private static boolean hasPreviousSystem() {
+    if (StaticContext.system == null) {
+      StaticContext.system = InternalDistributedSystem.getAnyInstance();
+    }
+    
+    return StaticContext.system != null && StaticContext.system.isConnected();
+  }
+  
+  private static boolean previousPropertiesAreDifferentThan(final Properties properties) {
+    boolean needNewSystem = false;
+    if (!getTestClassName().equals(StaticContext.previousSystemCreatedInTestClass)) {
+      // previous system was created in a previous test class
+      final Properties newProperties = getAllDistributedSystemProperties(properties);
+      needNewSystem = !newProperties.equals(StaticContext.previousProperties);
+      if (needNewSystem) {
+        logger.info(
+            "Test class has changed and the new DS properties are not an exact match. "
+                + "Forcing DS disconnect. Old props = "
+                + StaticContext.previousProperties + "new props=" + newProperties);
+      }
+    }
+    return needNewSystem;
+  }
+  
+  private static boolean propertiesAreDifferentThanCurrentSystem(final Properties properties) {
+    // previous system was created in this test class
+    final Properties currentProperties = StaticContext.system.getProperties();
+    for (Iterator<Map.Entry<Object,Object>> iter = properties.entrySet().iterator(); iter.hasNext(); ) {
+      final Map.Entry<Object,Object> entry = iter.next();
+      final String key = (String) entry.getKey();
+      final String value = (String) entry.getValue();
+      if (!value.equals(currentProperties.getProperty(key))) {
+        logger.info("Forcing DS disconnect. For property " + key
+                            + " old value = " + currentProperties.getProperty(key)
+                            + " new value = " + value);
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  /**
+   * Returns this VM's connection to the distributed system.  If
+   * necessary, the connection will be lazily created using the
+   * <code>Properties</code> returned by {@link
+   * #getDistributedSystemProperties}.
+   *
+   * @see #getSystem(Properties)
+   *
+   * @since 3.0
+   */
+  public static InternalDistributedSystem getSystem() {
+    return getSystem(getDistributedSystemProperties());
+  }
+
+  /**
+   * Returns a loner distributed system that isn't connected to other
+   * vms
+   * 
+   * @since 6.5
+   */
+  public static InternalDistributedSystem getLonerSystem() {
+    Properties props = getDistributedSystemProperties();
+    props.put(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.put(DistributionConfig.LOCATORS_NAME, "");
+    return getSystem(props);
+  }
+  
+  /**
+   * Returns a loner distributed system in combination with enforceUniqueHost
+   * and redundancyZone properties.
+   * Added specifically to test scenario of defect #47181.
+   */
+  public static InternalDistributedSystem getLonerSystemWithEnforceUniqueHost() {
+    Properties props = getDistributedSystemProperties();
+    props.put(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.put(DistributionConfig.LOCATORS_NAME, "");
+    props.put(DistributionConfig.ENFORCE_UNIQUE_HOST_NAME, "true");
+    props.put(DistributionConfig.REDUNDANCY_ZONE_NAME, "zone1");
+    return getSystem(props);
+  }
+
+  /**
+   * Returns an mcast distributed system that is connected to other
+   * vms using a random mcast port.
+   */
+  public static InternalDistributedSystem getMcastSystem() {
+    Properties props = getDistributedSystemProperties();
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.MULTICAST);
+    props.put(DistributionConfig.MCAST_PORT_NAME, ""+port);
+    props.put(DistributionConfig.MCAST_TTL_NAME, "0");
+    props.put(DistributionConfig.LOCATORS_NAME, "");
+    return getSystem(props);
+  }
+
+  /**
+   * Returns an mcast distributed system that is connected to other
+   * vms using the given mcast port.
+   */
+  public static InternalDistributedSystem getMcastSystem(int jgroupsPort) {
+    Properties props = getDistributedSystemProperties();
+    props.put(DistributionConfig.MCAST_PORT_NAME, ""+jgroupsPort);
+    props.put(DistributionConfig.MCAST_TTL_NAME, "0");
+    props.put(DistributionConfig.LOCATORS_NAME, "");
+    return getSystem(props);
+  }
+
+  /**
+   * Returns whether or this VM is connected to a {@link
+   * DistributedSystem}.
+   */
+  public static boolean isConnectedToDS() {
+    return StaticContext.system != null && StaticContext.system.isConnected();
+  }
+
+  //---------------------------------------------------------------------------
+  // public cleanup methods
+  //---------------------------------------------------------------------------
+  
+  public static void cleanupAllVms() {
+    cleanupThisVM();
+
+    invokeInEveryVM(new SerializableRunnable() {
+      @Override
+      public void run() {
+        cleanupThisVM();
+      }
+    });
+    
+    invokeInLocator(new SerializableRunnable() {
+      @Override
+      public void run() {
+        DistributionMessageObserver.setInstance(null);
+        unregisterInstantiatorsInThisVM();
+      }
+    });
+    
+    DUnitLauncher.closeAndCheckForSuspects();
+  }
+
+  public static void unregisterAllDataSerializersFromAllVms() {
+    unregisterDataSerializerInThisVM();
+    
+    invokeInEveryVM(new SerializableRunnable() {
+      @Override
+      public void run() {
+        unregisterDataSerializerInThisVM();
+      }
+    });
+    
+    invokeInLocator(new SerializableRunnable() {
+      @Override
+      public void run() {
+        unregisterDataSerializerInThisVM();
+      }
+    });
+  }
+
+  public static void unregisterInstantiatorsInThisVM() {
+    // unregister all the instantiators
+    InternalInstantiator.reinitialize();
+    assertEquals(0, InternalInstantiator.getInstantiators().length);
+  }
+  
+  public static void unregisterDataSerializerInThisVM() {
+    DataSerializerPropogationDUnitTest.successfullyLoadedTestDataSerializer = false;
+    // unregister all the Dataserializers
+    InternalDataSerializer.reinitialize();
+    // ensure that all are unregistered
+    assertEquals(0, InternalDataSerializer.getSerializers().length);
+  }
+
+  public static void disconnectAllFromDS() {
+    disconnectFromDS();
+    invokeInEveryVM(new SerializableRunnable() {
+      @Override
+      public void run() { 
+        disconnectFromDS();
+      }
+    });
+  }
+
+  /**
+   * Disconnects this VM from the distributed system
+   */
+  public static void disconnectFromDS() {
+    GemFireCacheImpl.testCacheXml = null;
+    
+    if (StaticContext.system != null) {
+      StaticContext.system.disconnect();
+      StaticContext.system = null;
+    }
+    
+    for (;;) {
+      DistributedSystem ds = InternalDistributedSystem.getConnectedInstance();
+      if (ds == null) {
+        break;
+      }
+      try {
+        ds.disconnect();
+      }
+      catch (Exception e) {
+        // ignore
+      }
+    }
+    
+    AdminDistributedSystemImpl ads = AdminDistributedSystemImpl.getConnectedInstance();
+    if (ads != null) {
+      ads.disconnect();
+    }
+  }
+
+  //---------------------------------------------------------------------------
+  // private static methods
+  //---------------------------------------------------------------------------
+  
+  private static void setUpDistributedTestCase() throws Exception {
+    setUpCreationStackGenerator();
+    
+    System.setProperty(HoplogConfig.ALLOW_LOCAL_HDFS_PROP, "true");
+
+    final String vmid = System.getProperty("vmid");
+    final String defaultDiskStoreName = "DiskStore-"  + vmid + "-"+ StaticContext.testClassName + "." + getTestMethodName();
+    GemFireCacheImpl.setDefaultDiskStoreName(defaultDiskStoreName); // TODO: not thread safe
+    
+    for (int h = 0; h < Host.getHostCount(); h++) {
+      Host host = Host.getHost(h);
+      for (int v = 0; v < host.getVMCount(); v++) {
+        VM vm = host.getVM(v);
+        final String vmDefaultDiskStoreName = "DiskStore-" + h + "-" + v + "-" + StaticContext.testClassName + "." + StaticContext.testMethodName;
+        setUpInVM(vm, StaticContext.testClassName, StaticContext.testMethodName, vmDefaultDiskStoreName);
+      }
+    }
+    //System.out.println("\n\n[setup] START TEST " + getClass().getSimpleName()+"."+testName+"\n\n");
+  }
+  
+  private static void setUpInVM(final VM vm, final String testClassNameToUse, final String testMethodNameToUse, final String diskStoreNameToUse) {
+    vm.invoke(new SerializableRunnable() {
+      @Override
+      public void run() {
+        setUpCreationStackGenerator();
+        StaticContext.testClassName = testClassNameToUse;
+        StaticContext.testMethodName = testMethodNameToUse;
+        System.setProperty(HoplogConfig.ALLOW_LOCAL_HDFS_PROP, "true");    
+        GemFireCacheImpl.setDefaultDiskStoreName(diskStoreNameToUse); // TODO: not thread safe
+      }
+    });
+  }
+    
+  /**
+   * For logPerTest to work, we have to disconnect from the DS, but all
+   * subclasses do not call super.tearDown(). To prevent this scenario
+   * this method has been declared final. Subclasses must now override
+   * {@link #tearDownBefore()} instead.
+   * @throws Exception
+   */
+  private final void tearDownDistributedTestCase() throws Exception {
+    tearDownBefore();
+    realTearDown();
+    tearDownAfter();
+    
+    tearDownCreationStackGenerator();
+
+    tearDownInEveryVM();
+  }
+
+  private static void realTearDown() throws Exception {
+    if (StaticContext.logPerTestMethod) {
+      disconnectAllFromDS();
+    }
+    cleanupAllVms();
+  }
+    
+  private static void tearDownInEveryVM() {
+    invokeInEveryVM(new SerializableRunnable() {
+      @Override
+      public void run() {    
+        tearDownCreationStackGenerator();
+        StaticContext.testClassName = null;
+        StaticContext.testMethodName = null;
+      }
+    });
+  }
+  
+  private static void setUpCreationStackGenerator() {
+    // the following is moved from InternalDistributedSystem to fix #51058
+    InternalDistributedSystem.TEST_CREATION_STACK_GENERATOR.set(
+    new CreationStackGenerator() {
+      @Override
+      public Throwable generateCreationStack(final DistributionConfig config) {
+        final StringBuilder sb = new StringBuilder();
+        final String[] validAttributeNames = config.getAttributeNames();
+        for (int i = 0; i < validAttributeNames.length; i++) {
+          final String attName = validAttributeNames[i];
+          final Object actualAtt = config.getAttributeObject(attName);
+          String actualAttStr = actualAtt.toString();
+          sb.append("  ");
+          sb.append(attName);
+          sb.append("=\"");
+          if (actualAtt.getClass().isArray()) {
+            actualAttStr = InternalDistributedSystem.arrayToString(actualAtt);
+          }
+          sb.append(actualAttStr);
+          sb.append("\"");
+          sb.append("\n");
+        }
+        return new Throwable("Creating distributed system with the following configuration:\n" + sb.toString());
+      }
+    });
+  }
+  
+  private static void tearDownCreationStackGenerator() {
+    InternalDistributedSystem.TEST_CREATION_STACK_GENERATOR.set(InternalDistributedSystem.DEFAULT_CREATION_STACK_GENERATOR);
+  }
+  
+  private static void cleanupThisVM() {
+    SocketCreator.resolve_dns = true;
+    CacheCreation.clearThreadLocals();
+    System.clearProperty("gemfire.log-level");
+    System.clearProperty("jgroups.resolve_dns");
+    InitialImageOperation.slowImageProcessing = 0;
+    DistributionMessageObserver.setInstance(null);
+    QueryTestUtils.setCache(null);
+    CacheServerTestUtil.clearCacheReference();
+    RegionTestCase.preSnapshotRegion = null;
+    GlobalLockingDUnitTest.region_testBug32356 = null;
+    LogWrapper.close();
+    ClientProxyMembershipID.system = null;
+    MultiVMRegionTestCase.CCRegion = null;
+    InternalClientMembership.unregisterAllListeners();
+    ClientStatsManager.cleanupForTests();
+    ClientServerTestCase.AUTO_LOAD_BALANCE = false;
+    unregisterInstantiatorsInThisVM();
+    DistributionMessageObserver.setInstance(null);
+    QueryObserverHolder.reset();
+    DiskStoreObserver.setInstance(null);
+    System.clearProperty("gemfire.log-level");
+    System.clearProperty("jgroups.resolve_dns");
+    
+    if (InternalDistributedSystem.systemAttemptingReconnect != null) {
+      InternalDistributedSystem.systemAttemptingReconnect.stopReconnecting();
+    }
+    ExpectedExceptionString ex;
+    while((ex = ExpectedExceptionString.poll()) != null) {
+      ex.remove();
+    }
+  }
+
+  /**
+   * Builds an instance of DUnitTestRule
+   * 
+   * @author Kirk Lund
+   */
+  public static class Builder {
+    private boolean logPerTestMethod;
+    private boolean logPerTestClass;
+    private boolean disconnectBeforeClass;
+    private boolean disconnectAfterClass;
+    private boolean disconnectBefore;
+    private boolean disconnectAfter;
+    private final List<TestRule> outerRule = new ArrayList<TestRule>();
+    private final List<TestRule> innerRule = new ArrayList<TestRule>();
+    
+    protected Builder() {}
+
+    public Builder vmCount(final int vmCount) {
+      return this;
+    }
+    
+    /**
+     * A new DistributedSystem with .log and .gfs will be created for each test method
+     */
+    public Builder logPerTestMethod(final boolean logPerTestMethod) {
+      this.logPerTestMethod = logPerTestMethod;
+      return this;
+    }
+    
+    /**
+     * A new DistributedSystem with .log and .gfs will be created for each test class
+     */
+    public Builder logPerTestClass(final boolean logPerTestClass) {
+      this.logPerTestClass = logPerTestClass;
+      return this;
+    }
+
+    /**
+     * DistributedSystem will be disconnected before each test class
+     */
+    public Builder disconnectBeforeClass(final boolean disconnectBeforeClass) {
+      this.disconnectBeforeClass = disconnectBeforeClass;
+      return this;
+    }
+    
+    /**
+     * DistributedSystem will be disconnected before each test method
+     */
+    public Builder disconnectBefore(final boolean disconnectBefore) {
+      this.disconnectBefore = disconnectBefore;
+      return this;
+    }
+    
+    /**
+     * DistributedSystem will be disconnected after each test class
+     */
+    public Builder disconnectAfterClass(final boolean disconnectAfterClass) {
+      this.disconnectAfterClass = disconnectAfterClass;
+      return this;
+    }
+    
+    /**
+     * DistributedSystem will be disconnected after each test method
+     */
+    public Builder disconnectAfter(final boolean disconnectAfter) {
+      this.disconnectAfter = disconnectAfter;
+      return this;
+    }
+    
+    /**
+     * Chain the specified TestRule around the DUnitTestRule
+     */
+    public Builder outerRule(final TestRule testRule) {
+      this.outerRule.add(testRule);
+      return this;
+    }
+    
+    /**
+     * Chain the specified TestRule within the DUnitTestRule
+     */
+    public Builder innerRule(final TestRule testRule) {
+      this.innerRule.add(testRule);
+      return this;
+    }
+    
+    public DistributedTestRule build() {
+      return new DistributedTestRule(this);
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
index fdb7990..992d663 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/DistributedDisconnectRule.java
@@ -1,6 +1,6 @@
 package com.gemstone.gemfire.test.dunit.rules;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDUnitTest.java
index c85a731..5ba6518 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDUnitTest.java
@@ -11,7 +11,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.rules.DistributedRestoreSystemProperties;
@@ -32,7 +32,7 @@ public class DistributedRestoreSystemPropertiesDUnitTest implements Serializable
   private static final String NEW_VALUE = "NEW_VALUE"; 
 
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.builder()
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.builder()
       .innerRule(new SetUp())
       .innerRule(new Restore())
       .innerRule(new Verify())

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
index 510fea4..8990e07 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
@@ -7,7 +7,7 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static org.hamcrest.Matchers.*;
 
@@ -20,7 +20,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.RMIException;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -39,7 +39,7 @@ public class BasicDUnitTest implements Serializable {
   private static Properties bindings = new Properties();
   
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
 
   /**
    * Tests how the DUnit framework handles an error

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DUnitTestRuleChainDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DUnitTestRuleChainDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DUnitTestRuleChainDUnitTest.java
index fa84c8d..a54d9e5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DUnitTestRuleChainDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DUnitTestRuleChainDUnitTest.java
@@ -13,7 +13,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.Result;
 
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.rules.SerializableExternalResource;
 
@@ -44,7 +44,7 @@ public class DUnitTestRuleChainDUnitTest implements Serializable {
   public static class DUnitTestWithChainedRules implements Serializable {
     
     @Rule
-    public final DUnitTestRule dunitTestRule = DUnitTestRule.builder()
+    public final DistributedTestRule dunitTestRule = DistributedTestRule.builder()
         .outerRule(new BeforeOne())
         .outerRule(new BeforeTwo())
         .innerRule(new AfterOne())

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DistributedTestNameWithRuleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DistributedTestNameWithRuleDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DistributedTestNameWithRuleDUnitTest.java
index 341396e..fec00c2 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DistributedTestNameWithRuleDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/DistributedTestNameWithRuleDUnitTest.java
@@ -1,6 +1,6 @@
 package com.gemstone.gemfire.test.dunit.tests;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -13,7 +13,7 @@ import org.junit.experimental.categories.Category;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 public class DistributedTestNameWithRuleDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
   
   @Rule
   public transient TestWatcher watchman = new TestWatcher() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassOneDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassOneDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassOneDUnitTest.java
index e4a6057..6f08b2e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassOneDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassOneDUnitTest.java
@@ -1,6 +1,6 @@
 package com.gemstone.gemfire.test.dunit.tests;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static org.assertj.core.api.Assertions.*;
 
 import java.io.Serializable;
@@ -11,7 +11,7 @@ import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 @Category(DistributedTest.class)
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 public class LogPerTestClassOneDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.builder().logPerTestClass(true).build();
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.builder().logPerTestClass(true).build();
 
   @Test
   public void getTestClassNameShouldReturnThisClassName() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassTwoDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassTwoDUnitTest.java
index 30fe24e..6afaf2a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassTwoDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestClassTwoDUnitTest.java
@@ -1,6 +1,6 @@
 package com.gemstone.gemfire.test.dunit.tests;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static org.assertj.core.api.Assertions.*;
 
 import java.io.Serializable;
@@ -11,7 +11,7 @@ import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 @Category(DistributedTest.class)
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 public class LogPerTestClassTwoDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.builder().logPerTestClass(true).build();
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.builder().logPerTestClass(true).build();
 
   @Test
   public void logFileNameShouldEqualThisClassName() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestMethodDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestMethodDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestMethodDUnitTest.java
index 9d54f6b..a876085 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestMethodDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/LogPerTestMethodDUnitTest.java
@@ -1,6 +1,6 @@
 package com.gemstone.gemfire.test.dunit.tests;
 
-import static com.gemstone.gemfire.test.dunit.DUnitTestRule.*;
+import static com.gemstone.gemfire.test.dunit.DistributedTestRule.*;
 import static org.assertj.core.api.Assertions.*;
 
 import java.io.Serializable;
@@ -11,7 +11,7 @@ import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 @Category(DistributedTest.class)
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 public class LogPerTestMethodDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = DUnitTestRule.builder().logPerTestMethod(true).build();
+  public final DistributedTestRule dunitTestRule = DistributedTestRule.builder().logPerTestMethod(true).build();
 
   @Test
   public void getTestClassNameShouldReturnThisClass() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTemporaryFolderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTemporaryFolderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTemporaryFolderDUnitTest.java
index 0fe0e3c..118325c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTemporaryFolderDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTemporaryFolderDUnitTest.java
@@ -12,7 +12,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.internal.lang.reflect.ReflectionUtils;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.test.junit.rules.SerializableTemporaryFolder;
 public class SerializableTemporaryFolderDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
   
   @Rule 
   public final SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestNameDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestNameDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestNameDUnitTest.java
index 19c00c3..10d3155 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestNameDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestNameDUnitTest.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.internal.lang.reflect.ReflectionUtils;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.test.junit.rules.SerializableTestName;
 public class SerializableTestNameDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
   
   @Rule
   public final SerializableTestName testName = new SerializableTestName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestWatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestWatcherDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestWatcherDUnitTest.java
index c574aaf..d69ff9d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestWatcherDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/SerializableTestWatcherDUnitTest.java
@@ -12,7 +12,7 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.Description;
 
 import com.gemstone.gemfire.internal.lang.reflect.ReflectionUtils;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.test.junit.rules.SerializableTestWatcher;
 public class SerializableTestWatcherDUnitTest implements Serializable {
 
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
   
   @Rule
   public final SerializableTestWatcher watchman = new SerializableTestWatcher() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
index 9bfc9d2..0024df3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.RMIException;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -40,7 +40,7 @@ public class VMDUnitTest implements Serializable {
   private static final AtomicInteger COUNTER = new AtomicInteger();
   
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
 
   @Test
   public void testInvokeNonExistentMethod() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f694476/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
index fa92f03..4d0c7d8 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/examples/CatchExceptionExampleDUnitTest.java
@@ -9,7 +9,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.test.dunit.DUnitTestRule;
+import com.gemstone.gemfire.test.dunit.DistributedTestRule;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.RMIException;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -27,7 +27,7 @@ public class CatchExceptionExampleDUnitTest implements Serializable {
   private static final String REMOTE_THROW_EXCEPTION_MESSAGE = "Throwing remoteThrowException";
 
   @Rule
-  public final DUnitTestRule dunitTestRule = new DUnitTestRule();
+  public final DistributedTestRule dunitTestRule = new DistributedTestRule();
   
   @Test
   public void testRemoteInvocationWithException() {


Mime
View raw message