http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java index 6a0ffba..be41318 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java @@ -51,7 +51,7 @@ public class InterruptsDUnitTest extends CacheTestCase { @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(new SerializableCallable() { @Override @@ -179,7 +179,7 @@ public class InterruptsDUnitTest extends CacheTestCase { return vm.invoke(new SerializableCallable() { @Override public Object call() throws Exception { - assertFalse(cache.isClosed()); + assertFalse(basicGetCache().isClosed()); Region<Object, Object> region = getCache().getRegion("region"); return region.get(0); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java index 708b983..43a824a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java @@ -43,7 +43,7 @@ public class OffHeapEvictionDUnitTest extends EvictionDUnitTest { } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { SerializableRunnable checkOrphans = new SerializableRunnable() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java index f574e99..f64374c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java @@ -39,7 +39,7 @@ public class OffHeapEvictionStatsDUnitTest extends EvictionStatsDUnitTest { } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { SerializableRunnable checkOrphans = new SerializableRunnable() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java index 4889f0f..21f5c05 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java @@ -399,10 +399,9 @@ public class P2PDeltaPropagationDUnitTest extends DistributedTestCase { assertFalse(check); } - - public void setUp() throws Exception - { - super.setUp(); + + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -496,7 +495,7 @@ public class P2PDeltaPropagationDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); server1.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache()); server2.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java index 466dfa4..a23baf6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIDUnitTest.java @@ -16,12 +16,6 @@ */ package com.gemstone.gemfire.internal.cache; -/** - * This is a dunit test for PartitionedRegion creation and Region API's - * functionality. This test is performed for different region scopes - D_ACK and - * D_NO_ACK for PartitionedRegion. - */ - import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Properties; @@ -51,8 +45,12 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; -public class PartitionedRegionAPIDUnitTest extends - PartitionedRegionDUnitTestCase { +/** + * This is a dunit test for PartitionedRegion creation and Region API's + * functionality. This test is performed for different region scopes - D_ACK and + * D_NO_ACK for PartitionedRegion. + */ +public class PartitionedRegionAPIDUnitTest extends PartitionedRegionDUnitTestCase { public PartitionedRegionAPIDUnitTest(String name) { super(name); @@ -1431,34 +1429,7 @@ public class PartitionedRegionAPIDUnitTest extends }); } - protected CacheSerializableRunnable addExceptionTag1(final String expectedException) { - CacheSerializableRunnable addExceptionTag = new CacheSerializableRunnable( - "addExceptionTag") { - public void run2() - { - getCache().getLogger().info( - "<ExpectedException action=add>" + expectedException - + "</ExpectedException>"); - } - }; - - return addExceptionTag; - } - - protected CacheSerializableRunnable removeExceptionTag1(final String expectedException) { - CacheSerializableRunnable removeExceptionTag = new CacheSerializableRunnable( - "removeExceptionTag") { - public void run2() throws CacheException { - getCache().getLogger().info( - "<ExpectedException action=remove>" + expectedException - + "</ExpectedException>"); - } - }; - return removeExceptionTag; - } - - - public void testCacherLoaderHelper() throws Exception + public void testCacherLoaderHelper() throws Exception { final String rName = getUniqueName(); Host host = Host.getHost(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java index 79669b2..f59c832 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java @@ -21,11 +21,14 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import java.util.Properties; import java.util.Set; import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheException; +import com.gemstone.gemfire.cache.CacheExistsException; +import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.MirrorType; import com.gemstone.gemfire.cache.PartitionAttributes; import com.gemstone.gemfire.cache.PartitionAttributesFactory; @@ -34,6 +37,8 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore.BucketVisitor; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; @@ -465,20 +470,70 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends * redundancy-zone = "zone" */ public void testEnforceUniqueHostForLonerDistributedSystem() { - Cache cache = createLonerCacheWithEnforceUniqueHost(); - - AttributesFactory attr = new AttributesFactory(); + Cache myCache = createLonerCacheWithEnforceUniqueHost(); + try { + AttributesFactory attr = new AttributesFactory(); PartitionAttributesFactory paf = new PartitionAttributesFactory(); PartitionAttributes prAttr = paf.create(); attr.setPartitionAttributes(prAttr); RegionAttributes regionAttribs = attr.create(); - Region region = cache.createRegion("PR1", regionAttribs); - + Region region = myCache.createRegion("PR1", regionAttribs); + for (int i = 0; i < 113; i++) { - region.put("Key_" + i, new Integer(i)); + region.put("Key_" + i, new Integer(i)); } //verify region size assertEquals(113, region.size()); + } finally { + myCache.close(); + myCache.getDistributedSystem().disconnect(); + } + } + + /** + * Creates the <code>Cache</code> for this test that is not connected + * to other members. + * + * <p>Used by test {@link #testEnforceUniqueHostForLonerDistributedSystem()}. + * Moved from DistributedTestCase to this test is the exclusive caller. + * + * <p>Added specifically to test scenario of defect #47181. + */ + private final Cache createLonerCacheWithEnforceUniqueHost() { + Cache myCache = null; + try { + System.setProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true"); + myCache = CacheFactory.create(getLonerSystemWithEnforceUniqueHost()); + } catch (CacheExistsException e) { + Assert.fail("the cache already exists", e); + + } catch (RuntimeException ex) { + throw ex; + + } catch (Exception ex) { + Assert.fail("Checked exception while initializing cache??", ex); + } finally { + System.clearProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE"); + } + return myCache; + } + + /** + * Returns a loner distributed system in combination with enforceUniqueHost + * and redundancyZone properties. + * + * <p>Used by test {@link #testEnforceUniqueHostForLonerDistributedSystem()}. + * Moved from DistributedTestCase to this test is the exclusive caller. + * + * <p>Added specifically to test scenario of defect #47181. + */ + private final 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); } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java index cd6e980..f401e0d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java @@ -93,7 +93,7 @@ public class PartitionedRegionDUnitTestCase extends CacheTestCase * because we want to destroy any existing PartitionedRegions) */ @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { preTearDownPartitionedRegionDUnitTest(); closeCache(); Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java index 337e6ce..23709ad 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java @@ -45,7 +45,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { InternalResourceManager.setResourceObserver(null); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java index 002a5f6..046d787 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java @@ -34,7 +34,7 @@ public class PartitionedRegionOffHeapEvictionDUnitTest extends } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { SerializableRunnable checkOrphans = new SerializableRunnable() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java index c112539..027ae30 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java @@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.dunit.VM; public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase { @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { // this makes sure we don't leave anything for the next tests // Tests that set redundancy zones causes other jvms connected // to the ds to have "enforce-unique-hosts" set to true. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java index 558dd0b..636075c 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java @@ -108,8 +108,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { IgnoredException.addIgnoredException("Connection refused"); Host host = Host.getHost(0); member0 = host.getVM(0); @@ -119,9 +119,9 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { try { - closeCache(); + closeCacheAndDisconnect(); member0 = null; member1 = null; @@ -134,7 +134,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { } } - public static void closeCache() { + public static void closeCacheAndDisconnect() { if (cache != null && !cache.isClosed()) { cache.close(); cache.getDistributedSystem().disconnect(); @@ -913,8 +913,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap)); - member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); - member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect()); // member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerOnPort(3,4,port0 )); // member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerOnPort(3,4,port1 )); @@ -1114,10 +1114,10 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase { createClient(port0, port1, port2, port3); fetchAndValidateMetadata(); - member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); - member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); - member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); - member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCache()); + member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect()); + member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect()); + member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect()); + member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect()); Wait.pause(1000); //let client detect that servers are dead through ping AsyncInvocation m3 = member3.invokeAsync(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServerOnPort( 3, 4,port3 )); AsyncInvocation m2 = member2.invokeAsync(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServerOnPort( 3, 4,port2 )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java index 5c9e643..4508b25 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java @@ -114,9 +114,8 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes super(name); } - - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); member0 = host.getVM(0); member1 = host.getVM(1); @@ -126,17 +125,17 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { // close the clients first - member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); - member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); - member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); - member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCache()); - closeCache(); + member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCacheAndDisconnect()); + member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCacheAndDisconnect()); + member2.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCacheAndDisconnect()); + member3.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCacheAndDisconnect()); + closeCacheAndDisconnect(); } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { try { member0 = null; member1 = null; @@ -161,7 +160,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes } } - public static void closeCache() { + public static void closeCacheAndDisconnect() { resetHonourServerGroupsInPRSingleHop(); if (cache != null && !cache.isClosed()) { cache.close(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java index ba8fd66..1611272 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java @@ -66,8 +66,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase { static boolean flag = false; @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -77,7 +76,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java index 8326ec5..a41e4a9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java @@ -82,8 +82,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { static boolean flag = false; @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -93,7 +92,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java index 81b2a73..07c6fd1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java @@ -152,7 +152,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { try { Invoke.invokeInEveryVM(verifyNoTxState); } finally { @@ -2421,7 +2421,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { FunctionService.onRegion(custRegion).execute(TXFunction.id).getResult(); break; case OnMember: - FunctionService.onMembers(system).execute(TXFunction.id).getResult(); + FunctionService.onMembers(basicGetSystem()).execute(TXFunction.id).getResult(); break; } fail("Expected exception not thrown"); @@ -2440,7 +2440,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { break; case OnMember: DistributedMember owner = custRegion.getOwnerForKey(custRegion.getKeyInfo(expectedCustId)); - FunctionService.onMember(system, owner).execute(TXFunction.id).getResult(); + FunctionService.onMember(basicGetSystem(), owner).execute(TXFunction.id).getResult(); break; } TXStateProxy tx = mgr.internalSuspend(); @@ -2484,7 +2484,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { break; case OnMember: DistributedMember owner = custRegion.getOwnerForKey(custRegion.getKeyInfo(expectedCustId)); - FunctionService.onMember(system, owner).execute(TXFunction.id).getResult(); + FunctionService.onMember(basicGetSystem(), owner).execute(TXFunction.id).getResult(); break; } TXStateProxy tx = mgr.internalSuspend(); @@ -2738,11 +2738,11 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { Set<DistributedMember> members = new HashSet<DistributedMember>(); members.add(ds1);members.add(ds2); try { - FunctionService.onMembers(system, members).execute(TXFunction.id).getResult(); + FunctionService.onMembers(basicGetSystem(), members).execute(TXFunction.id).getResult(); fail("expected exception not thrown"); } catch (TransactionException expected) { } - FunctionService.onMember(system, owner).execute(TXFunction.id).getResult(); + FunctionService.onMember(basicGetSystem(), owner).execute(TXFunction.id).getResult(); assertEquals(expectedCustomer, pr.get(expectedCustId)); TXStateProxy tx = mgr.internalSuspend(); assertNull(pr.get(expectedCustId)); @@ -2831,7 +2831,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase { } catch (TransactionDataRebalancedException expected) { } try { - FunctionService.onMember(system, ds2).execute(TXFunction.id).getResult(); + FunctionService.onMember(basicGetSystem(), ds2).execute(TXFunction.id).getResult(); fail("expected exception not thrown"); } catch (TransactionDataNotColocatedException expected) { } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java index 5f51cbd..9b9543b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java @@ -63,8 +63,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase { static boolean flag = false; @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -74,7 +73,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java index 5f60779..4a9eb03 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java @@ -59,8 +59,7 @@ public class RemoveDAckDUnitTest extends DistributedTestCase { static boolean flag = false; @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); @@ -70,7 +69,7 @@ public class RemoveDAckDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java index c25c24d..9bce9c4 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java @@ -64,8 +64,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase { static VM vm1 = null; @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -74,7 +73,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { vm0.invoke(() -> RemoveGlobalDUnitTest.resetFlag()); vm1.invoke(() -> RemoveGlobalDUnitTest.resetFlag()); vm0.invoke(() -> RemoveGlobalDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java index 01522bf..c702d9f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java @@ -102,8 +102,8 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ // TODO Auto-generated constructor stub } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); member0 = host.getVM(0); member1 = host.getVM(1); @@ -112,17 +112,17 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { // close the clients first - member0.invoke(() -> SingleHopStatsDUnitTest.closeCache()); - member1.invoke(() -> SingleHopStatsDUnitTest.closeCache()); - member2.invoke(() -> SingleHopStatsDUnitTest.closeCache()); - member3.invoke(() -> SingleHopStatsDUnitTest.closeCache()); - closeCache(); + member0.invoke(() -> SingleHopStatsDUnitTest.closeCacheAndDisconnect()); + member1.invoke(() -> SingleHopStatsDUnitTest.closeCacheAndDisconnect()); + member2.invoke(() -> SingleHopStatsDUnitTest.closeCacheAndDisconnect()); + member3.invoke(() -> SingleHopStatsDUnitTest.closeCacheAndDisconnect()); + closeCacheAndDisconnect(); } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { try { member0 = null; member1 = null; @@ -137,7 +137,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{ } } - public static void closeCache() { + public static void closeCacheAndDisconnect() { if (cache != null && !cache.isClosed()) { cache.close(); cache.getDistributedSystem().disconnect(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java index 43fc6a5..8bd9fcc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java @@ -396,7 +396,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { return ((Boolean)o).booleanValue(); } - protected static Boolean verifyConnected() { + protected Boolean verifyConnected() { if (SystemFailure.getFailure() != null) { com.gemstone.gemfire.test.dunit.Assert.fail("System failure present!", SystemFailure.getFailure()); return Boolean.FALSE; @@ -409,11 +409,11 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase { // Let's inspect the distributed system. It should also // be connected. - if (system.getCancelCriterion().cancelInProgress() != null) { + if (basicGetSystem().getCancelCriterion().cancelInProgress() != null) { fail("distributed system cancel in progress"); return Boolean.FALSE; } - if (!system.isConnected()) { + if (!basicGetSystem().isConnected()) { fail("distributed system not connected"); return Boolean.FALSE; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java index f7275b7..6b7216e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java @@ -94,7 +94,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase { private static final long MAX_WAIT = 60; @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { InternalResourceManager.setResourceObserver(null); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java index de58569..9a7fb8b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java @@ -62,16 +62,14 @@ public class Bug51193DUnitTest extends DistributedTestCase { private VM client0; @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); server0 = host.getVM(0); client0 = host.getVM(1); - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); server0.invoke(() -> Bug51193DUnitTest.closeCache()); client0.invoke(() -> Bug51193DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java index 821407f..67d66b7 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java @@ -62,12 +62,11 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + protected final void postSetUpPRClientServerTestBase() throws Exception { IgnoredException.addIgnoredException("java.net.ConnectException"); } - public void test_Bug_43126_Function_Not_Registered() throws InterruptedException { createScenario(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java index 089c301..11eefd0 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java @@ -77,8 +77,8 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); dataStore1 = host.getVM(0); dataStore2 = host.getVM(1); @@ -469,7 +469,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index 56d94e0..8205765 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -91,8 +91,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); replicate1 = host.getVM(0); replicate2 = host.getVM(1); @@ -101,7 +100,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // this test creates a cache that is incompatible with CacheTestCase, // so we need to close it and null out the cache variable disconnectAllFromDS(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java index 9edb736..6db487b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java @@ -118,8 +118,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{ super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + protected final void postSetUpPRClientServerTestBase() throws Exception { //Make sure stats to linger from a previous test disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java index f55970f..850f925 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java @@ -74,8 +74,8 @@ public class LocalDataSetDUnitTest extends CacheTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); dataStore1 = host.getVM(0); dataStore2 = host.getVM(1); @@ -103,7 +103,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { SerializableCallable installHook = new SerializableCallable() { public Object call() throws Exception { - PartitionedRegion pr = (PartitionedRegion)cache.getRegion("CustomerPR"); + PartitionedRegion pr = (PartitionedRegion)basicGetCache().getRegion("CustomerPR"); Runnable r = new ReadHook(); pr.getDataStore().setBucketReadHook(r); return null; @@ -112,7 +112,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { invokeInAllDataStores(installHook); accessor.invoke(new SerializableCallable() { public Object call() throws Exception { - Region region = cache.getRegion("CustomerPR"); + Region region = basicGetCache().getRegion("CustomerPR"); Set filter = new HashSet(); filter.add("1"); FunctionService.onRegion(region).withFilter(filter).execute(IterateFunction.id, true, false, true).getResult(); @@ -248,7 +248,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { public void createCache() { try { getCache(); - assertNotNull(cache); + assertNotNull(basicGetCache()); } catch (Exception e) { Assert.fail("Failed while creating the cache", e); @@ -299,10 +299,10 @@ public class LocalDataSetDUnitTest extends CacheTestCase { .setPartitionResolver(new LDSPartitionResolver()).create(); AttributesFactory attr = new AttributesFactory(); attr.setPartitionAttributes(prAttr); - assertNotNull(cache); + assertNotNull(basicGetCache()); if (partitionedRegionName.equals("CustomerPR")) { - customerPR = cache.createRegion(partitionedRegionName, attr.create()); + customerPR = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(customerPR); LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName @@ -310,7 +310,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { } if (partitionedRegionName.equals("OrderPR")) { - orderPR = cache.createRegion(partitionedRegionName, attr.create()); + orderPR = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(orderPR); LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName @@ -319,7 +319,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase { } if (partitionedRegionName.equals("ShipmentPR")) { - shipmentPR = cache.createRegion(partitionedRegionName, attr.create()); + shipmentPR = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(shipmentPR); LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java index 1d933e3..27aeae6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java @@ -86,8 +86,7 @@ public class LocalDataSetIndexingDUnitTest extends CacheTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); dataStore1 = host.getVM(0); dataStore2 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java index e36aacd..1c47ffd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java @@ -55,13 +55,12 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{ super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); dataStore1 = host.getVM(0); } - - + public void testLocalDataSetPR(){ dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.createCacheInVm()); Object args[] = new Object[] { "testRegion", new Integer(1), new Integer(50), @@ -158,8 +157,8 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{ try { Function function1 = new TestFunction(true,TestFunction.TEST_FUNCTION_EXCEPTION); FunctionService.registerFunction(function1); - DistributedMember localmember = system.getDistributedMember(); - ResultCollector rc = FunctionService.onMember(system, localmember).withArgs(Boolean.TRUE).execute(function1.getId()); + DistributedMember localmember = getSystemStatic().getDistributedMember(); + ResultCollector rc = FunctionService.onMember(getSystemStatic(), localmember).withArgs(Boolean.TRUE).execute(function1.getId()); rc.getResult(); Assert.fail("Exception should occur",new Exception("Test Failed")); } @@ -170,7 +169,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{ } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { if(cache != null) { cache.close(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java index abad8d8..ada68c9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java @@ -73,8 +73,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); member1 = host.getVM(0); member2 = host.getVM(1); @@ -658,7 +657,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { List<VM> members = new ArrayList<VM>(4); members.add(member1); members.add(member2); members.add(member3); members.add(member4); for (VM member: members) { @@ -667,7 +666,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { disconnectAllFromDS(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java index 7f9d918..a129af9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java @@ -61,9 +61,8 @@ public class MultiRegionFunctionExecutionDUnitTest extends CacheTestCase { super(name); } - public void setUp() throws Exception { - - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -72,7 +71,7 @@ public class MultiRegionFunctionExecutionDUnitTest extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java index 3cc34d8..c77a201 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java @@ -64,7 +64,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { Invoke.invokeInEveryVM(new SerializableCallable() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java index 80d59ed..0c33b5f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java @@ -51,9 +51,6 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe super(name); } - public void setUp() throws Exception { - super.setUp(); - } /* * Execution of the function on server using the name of the function */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java index 0104e7a..ed61274 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java @@ -81,11 +81,6 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ super(name); } - @Override - public void setUp() throws Exception { - super.setUp(); - } - public void test_Bug_43126_Function_Not_Registered() throws InterruptedException { createScenario(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java index 1164543..d139bbf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java @@ -67,8 +67,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends } @Override - public void setUp() throws Exception { - super.setUp(); + protected void postSetUpPRClientServerTestBase() throws Exception { IgnoredException.addIgnoredException("Connection reset"); IgnoredException.addIgnoredException("SocketTimeoutException"); IgnoredException.addIgnoredException("ServerConnectivityException"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java index ffcac65..cd54be6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java @@ -69,10 +69,6 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends super(name); } - public void setUp() throws Exception { - super.setUp(); - } - /* * Execution of the function on server with */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java index 5a17f4d..482ab9a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java @@ -69,10 +69,6 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e super(name); } - public void setUp() throws Exception { - super.setUp(); - } - /* * Execution of the function on server with */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java index 84da524..1f65ad2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java @@ -67,11 +67,10 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; } @Override - public void setUp() throws Exception { + public final void preSetUp() throws Exception { //Workaround for bug #52004 IgnoredException.addIgnoredException("InternalFunctionInvocationTargetException"); IgnoredException.addIgnoredException("Connection refused"); - super.setUp(); } /* http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java index 560d305..88d0222 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java @@ -110,13 +110,17 @@ public class PRClientServerTestBase extends CacheTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); server3 = host.getVM(2); client = host.getVM(3); + postSetUpPRClientServerTestBase(); + } + + protected void postSetUpPRClientServerTestBase() throws Exception { } public ArrayList createCommonServerAttributes(String regionName, @@ -682,15 +686,15 @@ public class PRClientServerTestBase extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { - closeCache(); - client.invoke(() -> PRClientServerTestBase.closeCache()); - server1.invoke(() -> PRClientServerTestBase.closeCache()); - server2.invoke(() -> PRClientServerTestBase.closeCache()); - server3.invoke(() -> PRClientServerTestBase.closeCache()); + public final void postTearDownCacheTestCase() throws Exception { + closeCacheAndDisconnect(); + client.invoke(() -> PRClientServerTestBase.closeCacheAndDisconnect()); + server1.invoke(() -> PRClientServerTestBase.closeCacheAndDisconnect()); + server2.invoke(() -> PRClientServerTestBase.closeCacheAndDisconnect()); + server3.invoke(() -> PRClientServerTestBase.closeCacheAndDisconnect()); } - public static void closeCache() { + public static void closeCacheAndDisconnect() { if (cache != null && !cache.isClosed()) { cache.close(); cache.getDistributedSystem().disconnect(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java index 839d78c..6c5dc9f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java @@ -118,8 +118,7 @@ public class PRColocationDUnitTest extends CacheTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { disconnectAllFromDS(); // isolate this test from others to avoid periodic CacheExistsExceptions Host host = Host.getHost(0); dataStore1 = host.getVM(0); @@ -2556,7 +2555,7 @@ public class PRColocationDUnitTest extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { InternalResourceManager.setResourceObserver(null); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java index 15cf753..102d52d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java @@ -665,7 +665,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(verifyNoTxState); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java index 863e260..f2ab3e2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java @@ -45,11 +45,6 @@ public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase{ } - @Override - public void setUp() throws Exception { - super.setUp(); - } - /* * Do a getAll from client and see if all the values are returned. * Will also have to see if the function was routed from client to all the servers http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java index cee0304..714fe49 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java @@ -102,10 +102,13 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase * @throws Exception - * thrown in any problem occurs in setUp */ - public void setUp() throws Exception - { + @Override + public final void preSetUp() throws Exception { disconnectAllFromDS(); - super.setUp(); + } + + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server = host.getVM(0); client = host.getVM(1); @@ -113,7 +116,6 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase int PORT2 = ((Integer)server.invoke(() -> Bug36853EventsExpiryDUnitTest.createServerCache())).intValue(); client.invoke(() -> Bug36853EventsExpiryDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT2) )); - } /** @@ -279,9 +281,9 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase * Closes the cache * */ - public static void closeCache() + public static void unSetExpiryTimeAndCloseCache() { - System.setProperty(HARegionQueue.REGION_ENTRY_EXPIRY_TIME, ""); + System.clearProperty(HARegionQueue.REGION_ENTRY_EXPIRY_TIME); CacheTestCase.closeCache(); } @@ -292,12 +294,12 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase * thrown if any problem occurs in closing client and server caches. */ @Override - protected final void preTearDownCacheTestCase() throws Exception + public final void preTearDownCacheTestCase() throws Exception { // close client - client.invoke(() -> Bug36853EventsExpiryDUnitTest.closeCache()); + client.invoke(() -> Bug36853EventsExpiryDUnitTest.unSetExpiryTimeAndCloseCache()); // close server - server.invoke(() -> Bug36853EventsExpiryDUnitTest.closeCache()); + server.invoke(() -> Bug36853EventsExpiryDUnitTest.unSetExpiryTimeAndCloseCache()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java index e5acf27..09ed9a5 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java @@ -62,15 +62,15 @@ public class Bug48571DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server = host.getVM(0); client = host.getVM(1); } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { reset(); server.invoke(() -> Bug48571DUnitTest.reset()); client.invoke(() -> Bug48571DUnitTest.reset()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java index 636333a..fef1ef9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java @@ -52,8 +52,8 @@ public class Bug48879DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); Host host = Host.getHost(0); vm0 = host.getVM(0); // server1 @@ -66,7 +66,7 @@ public class Bug48879DUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); vm0.invoke(() -> Bug48879DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java index b4fbc58..89a385c 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java @@ -159,8 +159,8 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase * @throws Exception - * thrown in any problem occurs in setUp */ - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); @@ -174,7 +174,6 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase client1.invoke(() -> EventIdOptimizationDUnitTest.createClientCache1( NetworkUtils.getServerHostName(host), new Integer(PORT1) )); client2.invoke(() -> EventIdOptimizationDUnitTest.createClientCache2( NetworkUtils.getServerHostName(host), new Integer(PORT2) )); - } /** @@ -499,7 +498,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase * Closes the caches on clients and servers */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close client client1.invoke(() -> EventIdOptimizationDUnitTest.closeCache()); client2.invoke(() -> EventIdOptimizationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java index 90e9703..ac14478 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java @@ -76,9 +76,8 @@ public class FailoverDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -325,7 +324,7 @@ public class FailoverDUnitTest extends DistributedTestCase @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java index 4adb2a8..53dc338 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java @@ -70,10 +70,9 @@ public class HABugInPutDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); - final Host host = Host.getHost(0); + @Override + public final void postSetUp() throws Exception { + final Host host = Host.getHost(0); // Server1 VM server1 = host.getVM(0); @@ -96,12 +95,10 @@ public class HABugInPutDUnitTest extends DistributedTestCase NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) )); client2.invoke(() -> HABugInPutDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) )); - //Boolean.getBoolean("") - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { client1.invoke(() -> HABugInPutDUnitTest.closeCache()); client2.invoke(() -> HABugInPutDUnitTest.closeCache()); // close server http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java index bb2ca69..3a23140 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java @@ -85,9 +85,8 @@ public class HAClearDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); @@ -101,11 +100,10 @@ public class HAClearDUnitTest extends DistributedTestCase client2 = host.getVM(3); CacheObserverHolder.setInstance(new CacheObserverAdapter()); - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { client1.invoke(() -> HAClearDUnitTest.closeCache()); client2.invoke(() -> HAClearDUnitTest.closeCache()); server1.invoke(() -> HAClearDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java index 212a798..1d027bf 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java @@ -97,9 +97,8 @@ public class HAConflationDUnitTest extends CacheTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); // Server1 VM server1 = host.getVM(0); @@ -111,21 +110,20 @@ public class HAConflationDUnitTest extends CacheTestCase server1.invoke(() -> ConflationDUnitTest.setIsSlowStart()); server1.invoke(() -> HAConflationDUnitTest.makeDispatcherSlow()); client1.invoke(() -> HAConflationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) )); - } @Override - protected final void postTearDownCacheTestCase() throws Exception { - client1.invoke(() -> HAConflationDUnitTest.closeCache()); + public final void postTearDownCacheTestCase() throws Exception { + client1.invoke(() -> HAConflationDUnitTest.closeCacheAndDisconnect()); // close server - server1.invoke(() -> HAConflationDUnitTest.closeCache()); + server1.invoke(() -> HAConflationDUnitTest.closeCacheAndDisconnect()); } - public static void closeCache() + public static void closeCacheAndDisconnect() { - if (cache != null && !cache.isClosed()) { - cache.close(); - cache.getDistributedSystem().disconnect(); + if (basicGetCache() != null && !basicGetCache().isClosed()) { + basicGetCache().close(); + basicGetCache().getDistributedSystem().disconnect(); } } @@ -212,11 +210,11 @@ public class HAConflationDUnitTest extends CacheTestCase "putFromServer") { public void run2() throws CacheException { - Region region = cache.getRegion(Region.SEPARATOR + regionName); + Region region = basicGetCache().getRegion(Region.SEPARATOR + regionName); assertNotNull(region); - cache.getLogger().info("starting put()"); + basicGetCache().getLogger().info("starting put()"); region.put(key, value); - cache.getLogger().info("finished put()"); + basicGetCache().getLogger().info("finished put()"); } }; @@ -229,10 +227,10 @@ public class HAConflationDUnitTest extends CacheTestCase "invalidateFromServer") { public void run2() throws CacheException { - Region region = cache.getRegion(Region.SEPARATOR + regionName); + Region region = basicGetCache().getRegion(Region.SEPARATOR + regionName); assertNotNull(region); region.invalidate(key); - cache.getLogger().info("done invalidate() successfully"); + basicGetCache().getLogger().info("done invalidate() successfully"); } }; @@ -246,10 +244,10 @@ public class HAConflationDUnitTest extends CacheTestCase "performDestroy") { public void run2() throws CacheException { - Region region = cache.getRegion(Region.SEPARATOR + regionName); + Region region = basicGetCache().getRegion(Region.SEPARATOR + regionName); assertNotNull(region); region.destroy(key); - cache.getLogger().info("done destroy successfully"); + basicGetCache().getLogger().info("done destroy successfully"); } }; @@ -302,8 +300,8 @@ public class HAConflationDUnitTest extends CacheTestCase assertNotNull(ds); ds.disconnect(); ds = getSystem(props); - cache = CacheFactory.create(ds); - assertNotNull(cache); + getCache(); + assertNotNull(basicGetCache()); } public static void createClientCache(String host, Integer port1, Boolean isListenerPresent) @@ -323,8 +321,8 @@ public class HAConflationDUnitTest extends CacheTestCase factory.setCacheListener(clientListener); } RegionAttributes attrs = factory.create(); - cache.createRegion(regionName, attrs); - Region region = cache.getRegion(Region.SEPARATOR + regionName); + basicGetCache().createRegion(regionName, attrs); + Region region = basicGetCache().getRegion(Region.SEPARATOR + regionName); assertNotNull(region); region.registerInterest(KEY1); @@ -349,8 +347,8 @@ public class HAConflationDUnitTest extends CacheTestCase factory.setCacheListener(serverListener); } RegionAttributes attrs = factory.create(); - cache.createRegion(regionName, attrs); - CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); + basicGetCache().createRegion(regionName, attrs); + CacheServerImpl server = (CacheServerImpl)basicGetCache().addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java index 1d18390..937b2cc 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java @@ -89,9 +89,8 @@ public class HADuplicateDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); @@ -104,7 +103,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { client1.invoke(() -> HADuplicateDUnitTest.closeCache()); // close server server1.invoke(() -> HADuplicateDUnitTest.reSetQRMslow()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java index 4753fb7..153ee20 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java @@ -87,9 +87,8 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase } /** get the hosts and the VMs * */ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart()); @@ -98,7 +97,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase /** close the caches* */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { client1.invoke(() -> HAEventIdPropagationDUnitTest.closeCache()); // close server server1.invoke(() -> HAEventIdPropagationDUnitTest.closeCache());
