Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-773-2 c0552f267 -> b17027b64
Fix up Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b17027b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b17027b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b17027b6 Branch: refs/heads/feature/GEODE-773-2 Commit: b17027b6496381784d43d2172bd974fc1a63f327 Parents: c0552f2 Author: Kirk Lund <[email protected]> Authored: Thu Feb 4 11:01:21 2016 -0800 Committer: Kirk Lund <[email protected]> Committed: Thu Feb 4 11:01:21 2016 -0800 ---------------------------------------------------------------------- .../sockets/InstantiatorPropagationDUnitTest.java | 4 +++- .../gemfire/test/dunit/DistributedTestCase.java | 18 ++++++++++-------- .../tests/GetDefaultDiskStoreNameDUnitTest.java | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b17027b6/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java index cd35846..514a724 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; +import static com.gemstone.gemfire.test.dunit.DistributedTestSupport.*; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -168,7 +170,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { } public static void unregisterInstantiatorsInAllVMs() { - Invoke.invokeInEveryVM(DistributedTestCase.class, "unregisterInstantiatorsInThisVM"); + Invoke.invokeInEveryVM(()->unregisterInstantiatorsInThisVM()); } public static void verifyInstantiators(final int numOfInstantiators) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b17027b6/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java index 4474132..8d6e63f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java @@ -324,16 +324,18 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se * Do not override this method. */ private final void setUpDistributedTestCase() { - final String testMethodName = getName(); + final String className = getClass().getCanonicalName(); + final String methodName = getName(); + logTestHistory(); - setUpVM(testMethodName, getDefaultDiskStoreName(0, -1)); + setUpVM(methodName, getDefaultDiskStoreName(0, -1, className, methodName)); for (int hostIndex = 0; hostIndex < Host.getHostCount(); hostIndex++) { Host host = Host.getHost(hostIndex); for (int vmIndex = 0; vmIndex < host.getVMCount(); vmIndex++) { - final String vmDefaultDiskStoreName = getDefaultDiskStoreName(hostIndex, vmIndex); - host.getVM(vmIndex).invoke(()->setUpVM(testMethodName, vmDefaultDiskStoreName)); + final String vmDefaultDiskStoreName = getDefaultDiskStoreName(hostIndex, vmIndex, className, methodName); + host.getVM(vmIndex).invoke(()->setUpVM(methodName, vmDefaultDiskStoreName)); } } @@ -356,12 +358,12 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se protected void postSetUp() throws Exception { } - private String getDefaultDiskStoreName(final int hostIndex, final int vmIndex) { - return "DiskStore-" + String.valueOf(hostIndex) + "-" + String.valueOf(vmIndex) + "-" + getClass().getCanonicalName() + "." + getTestMethodName(); // used to be getDeclaringClass() + private static String getDefaultDiskStoreName(final int hostIndex, final int vmIndex, final String className, final String methodName) { + return "DiskStore-" + String.valueOf(hostIndex) + "-" + String.valueOf(vmIndex) + "-" + className + "." + methodName; // used to be getDeclaringClass() } - private static void setUpVM(final String testMethodName, final String defaultDiskStoreName) { - setTestMethodName(testMethodName); + private static void setUpVM(final String methodName, final String defaultDiskStoreName) { + setTestMethodName(methodName); GemFireCacheImpl.setDefaultDiskStoreName(defaultDiskStoreName); System.setProperty(HoplogConfig.ALLOW_LOCAL_HDFS_PROP, "true"); setUpCreationStackGenerator(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b17027b6/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java index 2138d78..99dcc29 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java @@ -57,8 +57,8 @@ public class GetDefaultDiskStoreNameDUnitTest extends DistributedTestCase { assertThat(getDefaultDiskStoreName()).isEqualTo(expected); } - private String createDefaultDiskStoreName(final int hostIndex, final int vmIndex, final String testMethodName) { - return "DiskStore-" + hostIndex + "-" + vmIndex + "-" + getClass().getCanonicalName() + "." + testMethodName; + private String createDefaultDiskStoreName(final int hostIndex, final int vmIndex, final String methodName) { + return "DiskStore-" + hostIndex + "-" + vmIndex + "-" + getClass().getCanonicalName() + "." + methodName; } private String getDefaultDiskStoreName() {
