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/abb26af6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/abb26af6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/abb26af6 Branch: refs/heads/feature/GEODE-1050 Commit: abb26af6587fd4eaddc6b314ac739bed5e719370 Parents: a762856 Author: Kirk Lund <[email protected]> Authored: Fri Mar 18 09:20:08 2016 -0700 Committer: Kirk Lund <[email protected]> Committed: Fri Mar 18 09:20:08 2016 -0700 ---------------------------------------------------------------------- .../web/controllers/RestAPIsAndInterOpsDUnitTest.java | 2 +- .../internal/web/controllers/RestAPIsWithSSLDUnitTest.java | 2 +- .../gemfire/cache/CacheRegionClearStatsDUnitTest.java | 1 + .../cache/client/internal/SSLNoClientAuthDUnitTest.java | 2 +- .../cache/query/dunit/QueryDataInconsistencyDUnitTest.java | 8 ++------ .../query/dunit/QueryUsingFunctionContextDUnitTest.java | 4 ++-- ...currentIndexUpdateWithInplaceObjectModFalseDUnitTest.java | 2 +- .../index/ConcurrentIndexUpdateWithoutWLDUnitTest.java | 4 ++-- .../query/internal/index/MultiIndexCreationDUnitTest.java | 4 ++-- 9 files changed, 13 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java index d1ec00f..fcdf5aa 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java @@ -171,7 +171,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase { } @Override - public final void postSetUp() throws Exception { + public final void preSetUp() throws Exception { disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java index 24224c6..852591f 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java @@ -90,7 +90,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { } @Override - public final void postSetUp() throws Exception { + public final void preSetUp() throws Exception { disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java index 18e7505..73edcd2 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java @@ -61,6 +61,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase { super(name); } + @Override public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java index 321cde0..dd146a6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java @@ -55,7 +55,7 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase { private static SSLNoClientAuthDUnitTest instance = new SSLNoClientAuthDUnitTest("SSLNoClientAuthDUnitTest"); @Override - public final void postSetUp() throws Exception { + public final void preSetUp() throws Exception { disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java index a11c5de..5c4f982 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java @@ -95,13 +95,9 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase { } @Override - public final void preTearDownCacheTestCase() throws Exception { - Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS"); - } - - @Override public final void postTearDownCacheTestCase() throws Exception { - Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset"); + Invoke.invokeInEveryVM(() -> disconnectFromDS()); + Invoke.invokeInEveryVM(() -> QueryObserverHolder.reset()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java index 0b76efd..f19e7f0 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java @@ -136,12 +136,12 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase { @Override public final void preTearDownCacheTestCase() throws Exception { - Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS"); + Invoke.invokeInEveryVM(() -> disconnectFromDS()); } @Override public final void postTearDownCacheTestCase() throws Exception { - Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset"); + Invoke.invokeInEveryVM(() -> QueryObserverHolder.reset()); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java index 88326bd..c6c103f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java @@ -91,7 +91,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends } @Override - public final void postSetUp() throws Exception { + public final void preSetUp() throws Exception { Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java index 1036106..4cf42de 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java @@ -94,8 +94,8 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends */ @Override public final void preTearDown() throws Exception { - Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithoutWLDUnitTest.class, "destroyRegions"); - Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache"); + Invoke.invokeInEveryVM(() -> ConcurrentIndexUpdateWithoutWLDUnitTest.destroyRegions()); + Invoke.invokeInEveryVM(() -> CacheTestCase.closeCache()); } public static synchronized void destroyRegions() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abb26af6/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java index 90d5171..e18e720 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java @@ -174,12 +174,12 @@ public class MultiIndexCreationDUnitTest extends CacheTestCase { @Override public final void preTearDownCacheTestCase() throws Exception { hooked = false; - Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS"); + Invoke.invokeInEveryVM(() -> disconnectFromDS()); } @Override public final void postTearDownCacheTestCase() throws Exception { - Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset"); + Invoke.invokeInEveryVM(() -> QueryObserverHolder.reset()); } private static class MultiIndexCreationTestHook implements TestHook {
