This is an automated email from the ASF dual-hosted git repository. dschneider pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 0b15a3b GEODE-4464: remove singleton calls from all tests in org.apache.geode.cache30 (#1484) 0b15a3b is described below commit 0b15a3bee602c37c617429c919ed19384dd371ca Author: Darrel Schneider <dschnei...@pivotal.io> AuthorDate: Thu Feb 22 12:17:32 2018 -0800 GEODE-4464: remove singleton calls from all tests in org.apache.geode.cache30 (#1484) * removed unneeded fine logging on deprecated method so that getAnyInstance would not be called * changed getAnyInstance calls to getCache * InternalDistributedSystem.getConnectedInstance no longer called * InternalDistributedSystem.getAnyInstance call removed from CachedAllEventsDUnitTest * InternalDistributedSystem.getAnyInstance call removed from CallbackArgDUnitTest * removed InternalDistributedSystem.getAnyInstance call from ClientMembershipDUnitTest * removed getAnyInstance calls from ClientServerTestCase by removing the methods getDistributedMember and getSystemProperties * removed InternalDistributedSystem.getAnyInstance from ProxyDUnitTest * removed InternalDistributedSystem.getAnyInstance call from RegionMembershipListenerDUnitTest * removed unused InternalDistributedSystem.getAnyInstance call from RegionReliabilityTestCase * InternalDistributedSystem.getAnyInstance call removed from TXOrderDUnitTest --- .../geode/cache30/CacheSerializableRunnable.java | 3 -- .../geode/cache30/CachedAllEventsDUnitTest.java | 17 -------- .../apache/geode/cache30/CallbackArgDUnitTest.java | 20 --------- .../geode/cache30/ClientMembershipDUnitTest.java | 51 +++------------------- .../geode/cache30/ClientServerCCEDUnitTest.java | 4 +- .../apache/geode/cache30/ClientServerTestCase.java | 22 ---------- .../DistributedNoAckRegionCCEDUnitTest.java | 14 ------ .../org/apache/geode/cache30/ProxyDUnitTest.java | 11 +---- .../cache30/RegionMembershipListenerDUnitTest.java | 14 +----- .../geode/cache30/RegionReliabilityTestCase.java | 7 --- .../org/apache/geode/cache30/TXOrderDUnitTest.java | 18 -------- 11 files changed, 13 insertions(+), 168 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java index 5a5c80d..3ae4f1b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java @@ -15,7 +15,6 @@ package org.apache.geode.cache30; import org.apache.geode.cache.CacheException; -import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.CacheRuntimeException; import org.apache.geode.test.dunit.RepeatableRunnable; import org.apache.geode.test.dunit.SerializableRunnable; @@ -75,9 +74,7 @@ public abstract class CacheSerializableRunnable extends SerializableRunnable try { lastErr = null; this.run(); - CacheFactory.getAnyInstance().getLogger().fine("Completed " + this); } catch (AssertionError err) { - CacheFactory.getAnyInstance().getLogger().fine("Repeating " + this); lastErr = err; try { Thread.sleep(50); diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java index 86ddf79..172e354 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java @@ -26,8 +26,6 @@ import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.Scope; import org.apache.geode.cache.SubscriptionAttributes; -import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; @@ -46,16 +44,6 @@ public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase { return host.getVM(0); } - private void initOtherId() { - VM vm = getOtherVm(); - vm.invoke(new CacheSerializableRunnable("Connect") { - public void run2() throws CacheException { - getCache(); - } - }); - vm.invoke(() -> CachedAllEventsDUnitTest.getVMDistributedMember()); - } - private void doCreateOtherVm() { VM vm = getOtherVm(); vm.invoke(new CacheSerializableRunnable("create root") { @@ -68,10 +56,6 @@ public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase { }); } - public static DistributedMember getVMDistributedMember() { - return InternalDistributedSystem.getAnyInstance().getDistributedMember(); - } - /** * make sure a remote create will be done in a NORMAL+ALL region * @@ -79,7 +63,6 @@ public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase { */ private void remoteCreate(DataPolicy dp, InterestPolicy ip, boolean rmtCreate) throws CacheException { - initOtherId(); AttributesFactory af = new AttributesFactory(); af.setDataPolicy(dp); af.setSubscriptionAttributes(new SubscriptionAttributes(ip)); diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java index ce02b87..e45f251 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java @@ -36,13 +36,10 @@ import org.apache.geode.cache.TransactionEvent; import org.apache.geode.cache.TransactionListener; import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.cache.util.TransactionListenerAdapter; -import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.SerializableCallable; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -53,8 +50,6 @@ import org.apache.geode.test.junit.categories.DistributedTest; @Category(DistributedTest.class) public class CallbackArgDUnitTest extends JUnit4CacheTestCase { - // private transient Region r; - // private transient DistributedMember otherId; protected transient int invokeCount; protected static String callbackArg; @@ -67,16 +62,6 @@ public class CallbackArgDUnitTest extends JUnit4CacheTestCase { return host.getVM(0); } - private void initOtherId() { - VM vm = getOtherVm(); - vm.invoke(new CacheSerializableRunnable("Connect") { - public void run2() throws CacheException { - getCache(); - } - }); - vm.invoke(() -> CallbackArgDUnitTest.getVMDistributedMember()); - } - private void doCommitOtherVm() { VM vm = getOtherVm(); vm.invoke(new CacheSerializableRunnable("create root") { @@ -117,10 +102,6 @@ public class CallbackArgDUnitTest extends JUnit4CacheTestCase { }); } - public static DistributedMember getVMDistributedMember() { - return InternalDistributedSystem.getAnyInstance().getDistributedMember(); - } - ////////////////////// Test Methods ////////////////////// List expectedKeys; @@ -153,7 +134,6 @@ public class CallbackArgDUnitTest extends JUnit4CacheTestCase { } private void doTest() throws CacheException { - initOtherId(); AttributesFactory af = new AttributesFactory(); af.setDataPolicy(DataPolicy.REPLICATE); af.setScope(Scope.DISTRIBUTED_ACK); diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java index cec1345..9758153 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java @@ -47,9 +47,7 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; import org.apache.geode.distributed.*; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.ServerLocation; -import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.tier.InternalClientMembership; import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl; import org.apache.geode.internal.cache.tier.sockets.ServerConnection; @@ -109,8 +107,9 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } protected int getAcceptsInProgress() { - StatisticsType st = InternalDistributedSystem.getAnyInstance().findType("CacheServerStats"); - Statistics[] s = InternalDistributedSystem.getAnyInstance().findStatisticsByType(st); + DistributedSystem distributedSystem = getCache().getDistributedSystem(); + StatisticsType st = distributedSystem.findType("CacheServerStats"); + Statistics[] s = distributedSystem.findStatisticsByType(st); return s[0].getInt("acceptsInProgress"); } @@ -180,42 +179,6 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { System.out.println("closing mean socket 2"); vm0.invoke("close mean socket", () -> closeMeanSocket); } - - // SerializableRunnable denialOfService = new CacheSerializableRunnable("Do lots of - // connects") { - // public void run2() throws CacheException { - // int connectionCount = 0; - // ArrayList al = new ArrayList(60000); - // try { - // InetAddress addr = InetAddress.getLocalHost(); - // for (;;) { - // Socket s = new Socket(addr, port); - // al.add(s); - // connectionCount++; - // getLogWriter().info("connected # " + connectionCount + " s=" + s); - // // try { - // // s.close(); - // // } catch (IOException ignore) {} - // } - // } - // catch (Exception e) { - // getLogWriter().info("connected # " + connectionCount - // + " stopped because of exception " + e); - // Iterator it = al.iterator(); - // while (it.hasNext()) { - // Socket s = (Socket)it.next(); - // try { - // s.close(); - // } catch (IOException ignore) {} - // } - // } - // } - // }; - // // now pretend to do a denial of service attack by doing a bunch of connects - // // really fast and see what that does to the server's fds. - // getLogWriter().info("doing denial of service attach"); - // vm0.invoke(denialOfService); - // // @todo darrel: check fd limit? } finally { stopBridgeServers(getCache()); } @@ -790,7 +753,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertTrue(ports[0] != 0); DistributedMember serverMember = (DistributedMember) vm0.invoke("get distributed member", - () -> ClientMembershipDUnitTest.getDistributedMember()); + () -> getSystem().getDistributedMember()); String serverMemberId = serverMember.toString(); @@ -1250,8 +1213,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { // assert that event is fired again after reconnecting properties = config; - InternalDistributedSystem sys = getSystem(config); - assertTrue(sys.isConnected()); + assertTrue(getSystem(config).isConnected()); InternalClientMembership.notifyServerJoined(serverLocation); Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS) @@ -1385,7 +1347,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertTrue(testGetConnectedServers_port != 0); System.out.println("[testGetConnectedServers] port=" + ports[whichVM]); - System.out.println("[testGetConnectedServers] serverMemberId=" + getDistributedMember()); + System.out.println( + "[testGetConnectedServers] serverMemberId=" + getSystem().getDistributedMember()); }); ports[whichVM] = vm.invoke("getTestGetConnectedServers_port", () -> ClientMembershipDUnitTest.getTestGetConnectedServers_port()); diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java index edd4da4..af2d2a8 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java @@ -156,7 +156,7 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase { } private void verifyServerState(String name, int numIterations) { - Cache cache = CacheFactory.getAnyInstance(); + Cache cache = getCache(); DistributedRegion region = (DistributedRegion) cache.getRegion(name); CachePerfStats stats = region.getCachePerfStats(); assertEquals(0, stats.getConflatedEventsCount()); @@ -167,7 +167,7 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase { } private void doOps(String name, int numIterations, String clientGateName) { - ClientCache cache = ClientCacheFactory.getAnyInstance(); + ClientCache cache = (ClientCache) getCache(); Region region = cache.getRegion(name); getBlackboard().signalGate(clientGateName); try { diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java index 745b185..60abfcc 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java @@ -32,8 +32,6 @@ import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.client.PoolManager; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.DistributedSystem; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.test.dunit.DistributedTestUtils; import org.apache.geode.test.dunit.VM; @@ -268,13 +266,6 @@ public abstract class ClientServerTestCase extends JUnit4CacheTestCase { threadLocalCnxs, lifetimeTimeout, statisticInterval); } - /* - * protected static InternalDistributedMember findDistributedMember() { DM dm = - * ((InternalDistributedSystem) - * InternalDistributedSystem.getAnyInstance()).getDistributionManager(); return - * dm.getDistributionManagerId(); } - */ - protected static DistributedMember getMemberId() { WaitCriterion w = new WaitCriterion() { @@ -283,9 +274,6 @@ public abstract class ClientServerTestCase extends JUnit4CacheTestCase { } public boolean done() { - // getLogWriter().warning("checking member id " + system.getMemberId() + - // " for member " + system.getDistributedMember() + " hash " + - // System.identityHashCode(system.getDistributedMember())); return getSystemStatic().getDistributedMember().getPort() > 0; } @@ -297,16 +285,6 @@ public abstract class ClientServerTestCase extends JUnit4CacheTestCase { return getSystemStatic().getDistributedMember(); } - protected static DistributedMember getDistributedMember() { - DistributedSystem system = InternalDistributedSystem.getAnyInstance(); - return system.getDistributedMember(); - } - - protected static Properties getSystemProperties() { - DistributedSystem system = InternalDistributedSystem.getAnyInstance(); - return system.getProperties(); - } - public static class CacheServerCacheLoader extends TestCacheLoader implements Declarable { public CacheServerCacheLoader() {} diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java index b627802..0928128 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java @@ -34,7 +34,6 @@ import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.CacheListenerAdapter; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.cache.LocalRegion; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.dunit.AsyncInvocation; @@ -85,19 +84,6 @@ public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDU } @Override - public void sendSerialMessageToAll() { - try { - org.apache.geode.distributed.internal.SerialAckedMessage msg = - new org.apache.geode.distributed.internal.SerialAckedMessage(); - msg.send(InternalDistributedSystem.getConnectedInstance().getDM() - .getNormalDistributionManagerIds(), false); - } catch (Exception e) { - throw new RuntimeException("Unable to send serial message due to exception", e); - } - } - - - @Override @Test public void testLocalDestroy() throws InterruptedException { // replicates don't allow local destroy diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java index d82e22a..07ed2cb 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java @@ -43,11 +43,9 @@ import org.apache.geode.cache.SubscriptionAttributes; import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.DMStats; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -79,7 +77,7 @@ public class ProxyDUnitTest extends JUnit4CacheTestCase { getCache(); } }); - this.otherId = (DistributedMember) vm.invoke(() -> ProxyDUnitTest.getVMDistributedMember()); + this.otherId = (DistributedMember) vm.invoke(() -> getSystem().getDistributedMember()); } private void doCreateOtherVm() { @@ -94,10 +92,6 @@ public class ProxyDUnitTest extends JUnit4CacheTestCase { }); } - public static DistributedMember getVMDistributedMember() { - return InternalDistributedSystem.getAnyInstance().getDistributedMember(); - } - ////////////////////// Test Methods ////////////////////// /** @@ -246,8 +240,7 @@ public class ProxyDUnitTest extends JUnit4CacheTestCase { * Gets the DMStats for the vm's DM */ private DMStats getDMStats() { - return ((InternalDistributedSystem) getCache().getDistributedSystem()).getDistributionManager() - .getStats(); + return getCache().getDistributionManager().getStats(); } /** diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java index 7d662ee..cc07db9 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java @@ -33,18 +33,15 @@ import org.apache.geode.cache.RegionMembershipListener; import org.apache.geode.cache.util.RegionMembershipListenerAdapter; import org.apache.geode.distributed.*; import org.apache.geode.distributed.internal.DistributionAdvisor.Profile; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper; import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile; import org.apache.geode.internal.cache.DistributedRegion; -import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.LogWriterUtils; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; /** @@ -94,8 +91,7 @@ public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase { getCache(); } }); - this.otherId = (DistributedMember) vm - .invoke(() -> RegionMembershipListenerDUnitTest.getVMDistributedMember()); + this.otherId = vm.invoke(() -> getSystem().getDistributedMember()); } protected void createRootOtherVm(final String rName) { @@ -153,17 +149,11 @@ public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase { public void run2() throws CacheException { // shut down the gms before the distributed system to simulate // a crash. In post-5.1.x, this could use SystemFailure.initFailure() - GemFireCacheImpl cache = (GemFireCacheImpl) getCache(); - InternalDistributedSystem sys = (InternalDistributedSystem) cache.getDistributedSystem(); - MembershipManagerHelper.crashDistributedSystem(sys); + MembershipManagerHelper.crashDistributedSystem(getCache().getDistributedSystem()); } }); } - public static DistributedMember getVMDistributedMember() { - return InternalDistributedSystem.getAnyInstance().getDistributedMember(); - } - protected void createRootRegionWithListener(String rName) throws CacheException { int to = getOpTimeout(); this.myListener = new MyRML(to); diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java index 8299696..ffb544b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java @@ -58,9 +58,7 @@ import org.apache.geode.cache.query.Query; import org.apache.geode.cache.query.QueryService; import org.apache.geode.cache.util.RegionMembershipListenerAdapter; import org.apache.geode.distributed.Role; -import org.apache.geode.distributed.internal.DistributionManager; import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.distributed.internal.membership.InternalRole; import org.apache.geode.internal.cache.AbstractRegion; import org.apache.geode.internal.cache.DistributedCacheOperation; @@ -517,11 +515,6 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase { assertNoAccessDoesNotThrow(region); } - private static InternalDistributedMember findDistributedMember() { - DistributionManager dm = (InternalDistributedSystem.getAnyInstance()).getDistributionManager(); - return dm.getDistributionManagerId(); - } - /** * Tests affect of NO_ACCESS on local entry expiration actions. */ diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java index 17cc3fb..4862ff9 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java @@ -53,8 +53,6 @@ import org.apache.geode.cache.query.SelectResults; import org.apache.geode.cache.query.transaction.Person; import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.cache.util.TransactionListenerAdapter; -import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.LogWriterUtils; import org.apache.geode.test.dunit.SerializableCallable; @@ -75,7 +73,6 @@ public class TXOrderDUnitTest extends JUnit4CacheTestCase { private final int TEST_DESTROY = 2; private transient Region r; - private transient DistributedMember otherId; protected transient int invokeCount; List expectedKeys; @@ -86,16 +83,6 @@ public class TXOrderDUnitTest extends JUnit4CacheTestCase { return host.getVM(0); } - private void initOtherId() { - VM vm = getOtherVm(); - vm.invoke(new CacheSerializableRunnable("Connect") { - public void run2() throws CacheException { - getCache(); - } - }); - this.otherId = (DistributedMember) vm.invoke(() -> TXOrderDUnitTest.getVMDistributedMember()); - } - private void doCommitOtherVm() { VM vm = getOtherVm(); vm.invoke(new CacheSerializableRunnable("create root") { @@ -118,10 +105,6 @@ public class TXOrderDUnitTest extends JUnit4CacheTestCase { }); } - public static DistributedMember getVMDistributedMember() { - return InternalDistributedSystem.getAnyInstance().getDistributedMember(); - } - Object getCurrentExpectedKey() { Object result = this.expectedKeys.get(this.clCount); this.clCount += 1; @@ -133,7 +116,6 @@ public class TXOrderDUnitTest extends JUnit4CacheTestCase { */ @Test public void testFarSideOrder() throws CacheException { - initOtherId(); AttributesFactory af = new AttributesFactory(); af.setDataPolicy(DataPolicy.REPLICATE); af.setScope(Scope.DISTRIBUTED_ACK); -- To stop receiving notification emails like this one, please contact dschnei...@apache.org.