http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerMaxConnectionsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerMaxConnectionsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerMaxConnectionsJUnitTest.java deleted file mode 100644 index 2739f55..0000000 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerMaxConnectionsJUnitTest.java +++ /dev/null @@ -1,220 +0,0 @@ -/*========================================================================= - * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. - * This product is protected by U.S. and international copyright - * and intellectual property laws. Pivotal products are covered by - * one or more patents listed at http://www.pivotal.io/patents. - *========================================================================= - */ -package com.gemstone.gemfire.internal.cache.tier.sockets; - -import java.util.Properties; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.*; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.client.internal.Connection; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - -import dunit.DistributedTestCase; -import dunit.DistributedTestCase.WaitCriterion; - -/** - * Make sure max-connections on bridge server is enforced - * - * @author darrel - * - */ -@Category(IntegrationTest.class) -public class BridgeServerMaxConnectionsJUnitTest - -{ - - /** connection proxy object for the client */ - PoolImpl proxy = null; - - /** the distributed system instance for the test */ - DistributedSystem system; - - /** the cache instance for the test */ - Cache cache; - - /** name of the region created */ - final String regionName = "region1"; - - private static int PORT; - - /** - * Close the cache and disconnects from the distributed system - * - * @exception - - * thrown if any exception occured in closing cache/ds - */ - @After - public void tearDown() throws Exception - - { - this.cache.close(); - this.system.disconnect(); - } - - /** - * Default to 0; override in sub tests to add thread pool - */ - protected int getMaxThreads() { - return 0; - } - - /** - * Initializes proxy object and creates region for client - * - */ - private void createProxyAndRegionForClient() - { - try { - //props.setProperty("retryAttempts", "0"); - PoolFactory pf = PoolManager.createFactory(); - pf.addServer("localhost", PORT); - pf.setMinConnections(0); - pf.setPingInterval(10000); - pf.setThreadLocalConnections(true); - pf.setReadTimeout(2000); - pf.setSocketBufferSize(32768); - proxy = (PoolImpl)pf.create("junitPool"); - AttributesFactory factory = new AttributesFactory(); - factory.setScope(Scope.DISTRIBUTED_ACK); - factory.setPoolName("junitPool"); - RegionAttributes attrs = factory.createRegionAttributes(); - cache.createVMRegion(regionName, attrs); - } - catch (Exception ex) { - ex.printStackTrace(); - fail("Failed to initialize client"); - } - } - - private final static int MAX_CNXS = 100; - - /** - * Creates and starts the server instance - * - */ - private int createServer() - { - CacheServer server = null; - try { - Properties p = new Properties(); - // make it a loner - p.put("mcast-port", "0"); - p.put("locators", ""); - this.system = DistributedSystem.connect(p); - this.cache = CacheFactory.create(system); - server = this.cache.addCacheServer(); - int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - server.setMaxConnections(MAX_CNXS); - server.setMaxThreads(getMaxThreads()); - server.setPort(port); - server.start(); - } - catch (Exception e) { - e.printStackTrace(); - fail("Failed to create server"); - } - return server.getPort(); - } - - /** - * This test performs the following:<br> - * 1)create server<br> - * 2)initialize proxy object and create region for client<br> - * 3)perform a PUT on client by acquiring Connection through proxy<br> - * 4)stop server monitor threads in client to ensure that server treats this - * as dead client <br> - * 5)wait for some time to allow server to clean up the dead client artifacts<br> - * 6)again perform a PUT on client through same Connection and verify after - * the put that the Connection object used was new one. - */ - @Test - public void testMaxCnxLimit() throws Exception - { - PORT = createServer(); - createProxyAndRegionForClient(); - StatisticsType st = this.system.findType("CacheServerStats"); - final Statistics s = this.system.findStatisticsByType(st)[0]; - assertEquals(0, s.getInt("currentClients")); - assertEquals(0, s.getInt("currentClientConnections")); - Connection[] cnxs = new Connection[MAX_CNXS]; - for (int i=0; i < MAX_CNXS; i++) { - cnxs[i] = proxy.acquireConnection(); - this.system.getLogWriter().info("acquired connection[" + i + "]=" + cnxs[i]); - } - WaitCriterion ev = new WaitCriterion() { - public boolean done() { - return s.getInt("currentClientConnections") == MAX_CNXS; - } - public String description() { - return null; - } - }; - DistributedTestCase.waitForCriterion(ev, 1000, 200, true); - assertEquals(MAX_CNXS, s.getInt("currentClientConnections")); - assertEquals(1, s.getInt("currentClients")); - this.system.getLogWriter().info("<ExpectedException action=add>" - + "exceeded max-connections" + "</ExpectedException>"); - try { - Connection cnx = proxy.acquireConnection(); - if (cnx != null) { - fail("should not have been able to connect more than " + MAX_CNXS + " times but was able to connect " + s.getInt("currentClientConnections") + " times. Last connection=" + cnx); - } - this.system.getLogWriter().info("acquire connection returned null which is ok"); - } - catch (NoAvailableServersException expected) { - // This is expected but due to race conditions in server handshake - // we may get null back from acquireConnection instead. - this.system.getLogWriter().info("received expected " + expected.getMessage()); - } - catch (Exception ex) { - fail("expected acquireConnection to throw NoAvailableServersException but instead it threw " + ex); - } - finally { - this.system.getLogWriter().info("<ExpectedException action=remove>" - + "exceeded max-connections" + "</ExpectedException>"); - } - - // now lets see what happens we we close our connections - for (int i=0; i < MAX_CNXS; i++) { - cnxs[i].close(false); - } - ev = new WaitCriterion() { - public boolean done() { - return s.getInt("currentClients") == 0; - } - public String description() { - return null; - } - }; - DistributedTestCase.waitForCriterion(ev, 3 * 1000, 200, true); - this.system.getLogWriter().info("currentClients=" - + s.getInt("currentClients") - + " currentClientConnections=" - + s.getInt("currentClientConnections")); - assertEquals(0, s.getInt("currentClientConnections")); - assertEquals(0, s.getInt("currentClients")); - } -}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerSelectorMaxConnectionsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerSelectorMaxConnectionsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerSelectorMaxConnectionsJUnitTest.java deleted file mode 100644 index abe40c2..0000000 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeServerSelectorMaxConnectionsJUnitTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gemstone.gemfire.internal.cache.tier.sockets; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - -/** - * Just like its parent but enables the server thread pool (aka selector). - * - * @author darrel - * - */ -@Category(IntegrationTest.class) -public class BridgeServerSelectorMaxConnectionsJUnitTest extends BridgeServerMaxConnectionsJUnitTest -{ - protected int getMaxThreads() { - return 2; - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java index c885e3f..95a62af 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BridgeWriterMiscDUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import dunit.DistributedTestCase; @@ -1012,7 +1012,7 @@ public class BridgeWriterMiscDUnitTest extends CacheTestCase Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache(); assertEquals("More than one BridgeServer", 1, cache.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -1042,7 +1042,7 @@ public class BridgeWriterMiscDUnitTest extends CacheTestCase Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache(); assertEquals("More than one BridgeServer", 1, cache.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -1087,7 +1087,7 @@ public class BridgeWriterMiscDUnitTest extends CacheTestCase Cache cache = new BridgeWriterMiscDUnitTest("temp").getCache(); assertEquals("More than one BridgeServer", 1, cache.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java index 7cb07e4..fd83e2b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; import com.gemstone.gemfire.cache.client.*; @@ -224,7 +224,7 @@ public class Bug37210DUnitTest extends DistributedTestCase { assertEquals("More than one BridgeServers found ", 1, cache .getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers().iterator() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers().iterator() .next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java new file mode 100644 index 0000000..ba21c39 --- /dev/null +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java @@ -0,0 +1,220 @@ +/*========================================================================= + * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. + * This product is protected by U.S. and international copyright + * and intellectual property laws. Pivotal products are covered by + * one or more patents listed at http://www.pivotal.io/patents. + *========================================================================= + */ +package com.gemstone.gemfire.internal.cache.tier.sockets; + +import java.util.Properties; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import static org.junit.Assert.*; +import junit.framework.TestCase; + +import com.gemstone.gemfire.Statistics; +import com.gemstone.gemfire.StatisticsType; +import com.gemstone.gemfire.cache.AttributesFactory; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.client.*; +import com.gemstone.gemfire.cache.client.internal.PoolImpl; +import com.gemstone.gemfire.cache.client.internal.Connection; +import com.gemstone.gemfire.cache.server.CacheServer; +import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.internal.AvailablePort; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; + +import dunit.DistributedTestCase; +import dunit.DistributedTestCase.WaitCriterion; + +/** + * Make sure max-connections on cache server is enforced + * + * @author darrel + * + */ +@Category(IntegrationTest.class) +public class CacheServerMaxConnectionsJUnitTest + +{ + + /** connection proxy object for the client */ + PoolImpl proxy = null; + + /** the distributed system instance for the test */ + DistributedSystem system; + + /** the cache instance for the test */ + Cache cache; + + /** name of the region created */ + final String regionName = "region1"; + + private static int PORT; + + /** + * Close the cache and disconnects from the distributed system + * + * @exception - + * thrown if any exception occured in closing cache/ds + */ + @After + public void tearDown() throws Exception + + { + this.cache.close(); + this.system.disconnect(); + } + + /** + * Default to 0; override in sub tests to add thread pool + */ + protected int getMaxThreads() { + return 0; + } + + /** + * Initializes proxy object and creates region for client + * + */ + private void createProxyAndRegionForClient() + { + try { + //props.setProperty("retryAttempts", "0"); + PoolFactory pf = PoolManager.createFactory(); + pf.addServer("localhost", PORT); + pf.setMinConnections(0); + pf.setPingInterval(10000); + pf.setThreadLocalConnections(true); + pf.setReadTimeout(2000); + pf.setSocketBufferSize(32768); + proxy = (PoolImpl)pf.create("junitPool"); + AttributesFactory factory = new AttributesFactory(); + factory.setScope(Scope.DISTRIBUTED_ACK); + factory.setPoolName("junitPool"); + RegionAttributes attrs = factory.createRegionAttributes(); + cache.createVMRegion(regionName, attrs); + } + catch (Exception ex) { + ex.printStackTrace(); + fail("Failed to initialize client"); + } + } + + private final static int MAX_CNXS = 100; + + /** + * Creates and starts the server instance + * + */ + private int createServer() + { + CacheServer server = null; + try { + Properties p = new Properties(); + // make it a loner + p.put("mcast-port", "0"); + p.put("locators", ""); + this.system = DistributedSystem.connect(p); + this.cache = CacheFactory.create(system); + server = this.cache.addCacheServer(); + int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); + server.setMaxConnections(MAX_CNXS); + server.setMaxThreads(getMaxThreads()); + server.setPort(port); + server.start(); + } + catch (Exception e) { + e.printStackTrace(); + fail("Failed to create server"); + } + return server.getPort(); + } + + /** + * This test performs the following:<br> + * 1)create server<br> + * 2)initialize proxy object and create region for client<br> + * 3)perform a PUT on client by acquiring Connection through proxy<br> + * 4)stop server monitor threads in client to ensure that server treats this + * as dead client <br> + * 5)wait for some time to allow server to clean up the dead client artifacts<br> + * 6)again perform a PUT on client through same Connection and verify after + * the put that the Connection object used was new one. + */ + @Test + public void testMaxCnxLimit() throws Exception + { + PORT = createServer(); + createProxyAndRegionForClient(); + StatisticsType st = this.system.findType("CacheServerStats"); + final Statistics s = this.system.findStatisticsByType(st)[0]; + assertEquals(0, s.getInt("currentClients")); + assertEquals(0, s.getInt("currentClientConnections")); + Connection[] cnxs = new Connection[MAX_CNXS]; + for (int i=0; i < MAX_CNXS; i++) { + cnxs[i] = proxy.acquireConnection(); + this.system.getLogWriter().info("acquired connection[" + i + "]=" + cnxs[i]); + } + WaitCriterion ev = new WaitCriterion() { + public boolean done() { + return s.getInt("currentClientConnections") == MAX_CNXS; + } + public String description() { + return null; + } + }; + DistributedTestCase.waitForCriterion(ev, 1000, 200, true); + assertEquals(MAX_CNXS, s.getInt("currentClientConnections")); + assertEquals(1, s.getInt("currentClients")); + this.system.getLogWriter().info("<ExpectedException action=add>" + + "exceeded max-connections" + "</ExpectedException>"); + try { + Connection cnx = proxy.acquireConnection(); + if (cnx != null) { + fail("should not have been able to connect more than " + MAX_CNXS + " times but was able to connect " + s.getInt("currentClientConnections") + " times. Last connection=" + cnx); + } + this.system.getLogWriter().info("acquire connection returned null which is ok"); + } + catch (NoAvailableServersException expected) { + // This is expected but due to race conditions in server handshake + // we may get null back from acquireConnection instead. + this.system.getLogWriter().info("received expected " + expected.getMessage()); + } + catch (Exception ex) { + fail("expected acquireConnection to throw NoAvailableServersException but instead it threw " + ex); + } + finally { + this.system.getLogWriter().info("<ExpectedException action=remove>" + + "exceeded max-connections" + "</ExpectedException>"); + } + + // now lets see what happens we we close our connections + for (int i=0; i < MAX_CNXS; i++) { + cnxs[i].close(false); + } + ev = new WaitCriterion() { + public boolean done() { + return s.getInt("currentClients") == 0; + } + public String description() { + return null; + } + }; + DistributedTestCase.waitForCriterion(ev, 3 * 1000, 200, true); + this.system.getLogWriter().info("currentClients=" + + s.getInt("currentClients") + + " currentClientConnections=" + + s.getInt("currentClientConnections")); + assertEquals(0, s.getInt("currentClientConnections")); + assertEquals(0, s.getInt("currentClients")); + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java new file mode 100644 index 0000000..7c8f84b --- /dev/null +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java @@ -0,0 +1,19 @@ +package com.gemstone.gemfire.internal.cache.tier.sockets; + +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; + +/** + * Just like its parent but enables the server thread pool (aka selector). + * + * @author darrel + * + */ +@Category(IntegrationTest.class) +public class CacheServerSelectorMaxConnectionsJUnitTest extends CacheServerMaxConnectionsJUnitTest +{ + protected int getMaxThreads() { + return 2; + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java index 6db8ca1..20406b5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; import com.gemstone.gemfire.internal.cache.BridgeObserverHolder; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -284,7 +284,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase public static void assertAllQueuesEmpty() { Iterator servers = cacheServer.getCacheServers().iterator(); while (servers.hasNext()) { - Iterator proxies = ((BridgeServerImpl)servers.next()).getAcceptor(). + Iterator proxies = ((CacheServerImpl)servers.next()).getAcceptor(). getCacheClientNotifier().getClientProxies().iterator(); while (proxies.hasNext()) { int qsize = ((CacheClientProxy)proxies.next()).getQueueSize(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java index 1e7823e..c66291e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import dunit.DistributedTestCase; @@ -405,7 +405,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase Iterator servers = cacheServer.getCacheServers().iterator(); assertTrue("No servers found!", servers.hasNext()); while (servers.hasNext()) { - Iterator proxies = ((BridgeServerImpl)servers.next()).getAcceptor(). + Iterator proxies = ((CacheServerImpl)servers.next()).getAcceptor(). getCacheClientNotifier().getClientProxies().iterator(); assertTrue("No proxies found!", proxies.hasNext()); while (proxies.hasNext()) { @@ -420,7 +420,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase String excuse; public boolean done() { // assume a single cache server as configured in this test - BridgeServerImpl bridgeServer = (BridgeServerImpl) cacheServer. + CacheServerImpl bridgeServer = (CacheServerImpl) cacheServer. getCacheServers().iterator().next(); if (bridgeServer == null) { excuse = "No Cache Server"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java index 86f215f..b2a7565 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java @@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; import com.gemstone.gemfire.internal.cache.BridgeObserverHolder; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.HARegion; import com.gemstone.gemfire.internal.cache.ha.HAHelper; @@ -794,7 +794,7 @@ public class ConflationDUnitTest extends DistributedTestCase { Cache cache = GemFireCacheImpl.getInstance(); Iterator itr = cache.getCacheServers().iterator(); - BridgeServerImpl server = (BridgeServerImpl)itr.next(); + CacheServerImpl server = (CacheServerImpl)itr.next(); Iterator iter_prox = server.getAcceptor().getCacheClientNotifier() .getClientProxies().iterator(); int ccpCount=0; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java index 6b146fe..4608ae5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java @@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.InternalDataSerializer; import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; import com.gemstone.gemfire.internal.cache.BridgeObserverHolder; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.EventID; import dunit.DistributedTestCase; @@ -355,7 +355,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { try { assertEquals("Expected exactly one CacheServer", 1, cache .getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); bs.stop(); @@ -370,7 +370,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { Cache c = CacheFactory.getAnyInstance(); assertEquals("Expected exactly one CacheServer", 1, c.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() + CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); bs.start(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java index a8c1317..8d2ef40 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java @@ -33,7 +33,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -563,8 +563,8 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase .getClientProxies().size(); } - private static BridgeServerImpl getBridgeServer() { - BridgeServerImpl bridgeServer = (BridgeServerImpl) cache.getCacheServers().iterator().next(); + private static CacheServerImpl getBridgeServer() { + CacheServerImpl bridgeServer = (CacheServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bridgeServer); return bridgeServer; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java index a39ea2f..f8f036e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java @@ -18,7 +18,7 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; @@ -269,7 +269,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { try { Cache cache = CacheServerTestUtil.getCache(); com.gemstone.gemfire.LogWriter logger = cache.getLogger(); - BridgeServerImpl currentServer = (BridgeServerImpl)(new ArrayList(cache + CacheServerImpl currentServer = (CacheServerImpl)(new ArrayList(cache .getCacheServers()).get(0)); AcceptorImpl ai = currentServer.getAcceptor(); CacheClientNotifier notifier = ai.getCacheClientNotifier(); @@ -290,7 +290,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { try { Cache cache = CacheServerTestUtil.getCache(); com.gemstone.gemfire.LogWriter logger = cache.getLogger(); - BridgeServerImpl currentServer = (BridgeServerImpl)(new ArrayList(cache + CacheServerImpl currentServer = (CacheServerImpl)(new ArrayList(cache .getCacheServers()).get(0)); AcceptorImpl ai = currentServer.getAcceptor(); CacheClientNotifier notifier = ai.getCacheClientNotifier(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index 316cf32..14c7ac4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.FilterProfile; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.InitialImageOperation; @@ -835,8 +835,8 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { return proxy; } - private static BridgeServerImpl getBridgeServer() { - BridgeServerImpl bridgeServer = (BridgeServerImpl)CacheServerTestUtil + private static CacheServerImpl getBridgeServer() { + CacheServerImpl bridgeServer = (CacheServerImpl)CacheServerTestUtil .getCache().getCacheServers().iterator().next(); assertNotNull(bridgeServer); return bridgeServer; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java index 2da9050..6e2478f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; import com.gemstone.gemfire.internal.cache.BridgeObserverHolder; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.tier.InterestType; @@ -413,7 +413,7 @@ public class HAInterestBaseTest extends DistributedTestCase { }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -467,7 +467,7 @@ public class HAInterestBaseTest extends DistributedTestCase { }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -552,14 +552,14 @@ public class HAInterestBaseTest extends DistributedTestCase { public static void startServer() throws IOException { Cache c = CacheFactory.getAnyInstance(); assertEquals("More than one BridgeServer", 1, c.getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) c.getCacheServers().iterator().next(); assertNotNull(bs); bs.start(); } public static void stopServer() { assertEquals("More than one BridgeServer", 1, cache.getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); bs.stop(); } @@ -758,7 +758,7 @@ public class HAInterestBaseTest extends DistributedTestCase { }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -818,7 +818,7 @@ public class HAInterestBaseTest extends DistributedTestCase { }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java index f146cad..f4463d1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java @@ -29,7 +29,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; import com.gemstone.gemfire.internal.cache.BridgeObserverHolder; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -384,7 +384,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase try { assertEquals("Expected exactly one BridgeServer", 1, cache .getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); bs.stop(); @@ -431,7 +431,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase Cache c = CacheFactory.getAnyInstance(); assertEquals("Expected exactly one BridgeServer", 1, c.getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers() + CacheServerImpl bs = (CacheServerImpl) c.getCacheServers() .iterator().next(); assertNotNull(bs); bs.start(); @@ -481,7 +481,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -541,7 +541,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() + CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java index 493840b..d1ba9d6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.cache.NoSubscriptionServersAvailableException; @@ -566,7 +566,7 @@ public class InterestListDUnitTest extends DistributedTestCase /** wait for queues to drain in the server */ public static void flushQueues() throws Exception { - BridgeServerImpl impl = (BridgeServerImpl)server; + CacheServerImpl impl = (CacheServerImpl)server; for (CacheClientProxy proxy: (Set<CacheClientProxy>)impl.getAllClientSessions()) { final CacheClientProxy fproxy = proxy; WaitCriterion ev = new WaitCriterion() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java index 3eae255..ca34569 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java @@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -264,7 +264,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase try { Cache c = CacheFactory.getAnyInstance(); assertEquals("More than one BridgeServer", 1, c.getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) c.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -391,7 +391,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase try { Cache c = CacheFactory.getAnyInstance(); assertEquals("More than one CacheServer", 1, c.getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); + CacheServerImpl bs = (CacheServerImpl) c.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java index 76dc221..ebaba34 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.cache.client.internal.PoolImpl; @@ -453,7 +453,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase public static Set getCacheClientProxies() { Cache c = CacheFactory.getAnyInstance(); assertEquals("More than one CacheServer", 1, c.getCacheServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() + CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java index 2566224..be2cade 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java @@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.BridgeObserver; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; import com.gemstone.gemfire.internal.cache.BridgeObserverHolder; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -163,7 +163,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -222,7 +222,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -352,7 +352,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase { assertEquals("More than one BridgeServer", 1, cache.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -376,7 +376,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); @@ -414,7 +414,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 180 * 1000, 2000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() + CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -489,7 +489,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase { try { Cache c = CacheFactory.getAnyInstance(); - BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() + CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); bs.start(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java index 7272f2f..d4bfac7 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; import com.gemstone.gemfire.cache.client.*; @@ -140,7 +140,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase assertEquals("More than one CacheServer", 1, c.getCacheServers().size()); - final BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); + final CacheServerImpl bs = (CacheServerImpl) c.getCacheServers().iterator().next(); WaitCriterion ev = new WaitCriterion() { public boolean done() { return bs.getAcceptor().getCacheClientNotifier().getClientProxies().size() == 1; @@ -190,7 +190,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase }; DistributedTestCase.waitForCriterion(ev, 40 * 1000, 200, true); - final BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() + final CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator() .next(); ev = new WaitCriterion() { public boolean done() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java index 034fc0a..75fcfc6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.CacheObserverAdapter; import com.gemstone.gemfire.internal.cache.CacheObserverHolder; import com.gemstone.gemfire.cache.client.*; @@ -214,7 +214,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe RegionAttributes attrs = factory.createRegionAttributes(); cache.createVMRegion(REGION_NAME, attrs); } - BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port);
