You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/07 20:54:54 UTC
[39/62] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-837
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 548ec9f,43c8de6..f2afb1f
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@@ -16,14 -16,6 +16,14 @@@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
- import static org.junit.Assert.*;
++import static com.gemstone.gemfire.test.dunit.Assert.*;
+
+import java.util.Iterator;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.InterestResultPolicy;
import com.gemstone.gemfire.cache.Region;
@@@ -76,6 -58,6 +76,7 @@@ public class DurableClientSimpleDUnitTe
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -83,6 -65,6 +84,7 @@@
// Have the durable client register interest in all keys
this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -99,6 -81,6 +101,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -114,6 -96,6 +117,7 @@@
// Verify the durable client received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -156,6 -137,6 +160,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
assertEquals(2, PoolManager.getAll().size());
CacheServerTestUtil.getCache().readyForEvents();
@@@ -164,6 -145,6 +169,7 @@@
// Verify durable clients on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Get the CacheClientNotifier
CacheClientNotifier notifier = getBridgeServer().getAcceptor()
@@@ -193,6 -174,6 +199,7 @@@
// Verify the durable client is no longer on the server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(0);
@@@ -208,9 -189,7 +215,9 @@@
* while the first VM is connected. Also, verify that the first client is not
* affected by the second one attempting to connect.
*/
- @Ignore("TODO")
- public void XtestMultipleVMsWithSameDurableId() {
++ @Ignore("TODO: test is disabled")
+ @Test
+ public void testMultipleVMsWithSameDurableId() {
// Start a server
final int serverPort = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
.intValue();
@@@ -222,6 -201,6 +229,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -229,6 -208,6 +237,7 @@@
// Have the durable client register interest in all keys
this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -241,6 -220,6 +250,7 @@@
// Attempt to start another durable client VM with the same id.
this.publisherClientVM.invoke(new CacheSerializableRunnable("Create another durable client") {
++ @Override
public void run2() throws CacheException {
getSystem(getClientDistributedSystemProperties(durableClientId));
PoolFactoryImpl pf = (PoolFactoryImpl)PoolManager.createFactory();
@@@ -248,7 -227,7 +258,7 @@@
try {
pf.create("uncreatablePool");
fail("Should not have been able to create the pool");
-- } catch (ServerRefusedConnectionException e) {
++ } catch (ServerRefusedConnectionException expected) {
// expected exception
disconnectFromDS();
} catch (Exception e) {
@@@ -259,6 -238,6 +269,7 @@@
// Verify durable client on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -278,6 -257,6 +289,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -293,6 -272,6 +305,7 @@@
// Verify the durable client received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -332,6 -310,6 +345,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -345,6 -323,6 +359,7 @@@
// Send clientReady message
durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -352,6 -330,6 +367,7 @@@
// Verify durable clients on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Get the CacheClientNotifier
CacheClientNotifier notifier = getBridgeServer().getAcceptor()
@@@ -388,9 -366,8 +404,9 @@@
* Test that starting a durable client on multiple servers (one live and one
* not live) is processed correctly.
*/
- @Ignore("TODO: Disabled for bug 52043")
- @Ignore("Disabled for bug 52043")
- public void DISABLED_testDurableClientMultipleServersOneLive() {
++ @Ignore("TODO: test is disabled for bug 52043")
+ @Test
+ public void testDurableClientMultipleServersOneLive() {
// Start server 1
final int server1Port = ((Integer) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServer(regionName, new Boolean(true))))
.intValue();
@@@ -411,6 -388,6 +427,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -418,6 -395,6 +435,7 @@@
// Have the durable client register interest in all keys
this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -430,6 -407,6 +448,7 @@@
// Verify durable client on server1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -449,6 -426,6 +468,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -464,6 -441,6 +484,7 @@@
// Verify the durable client received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -478,10 -455,10 +499,10 @@@
});
try {
-- java.lang.Thread.sleep(10000);
++ Thread.sleep(10000);
}
catch (InterruptedException ex) {
-- fail("interrupted");
++ fail("interrupted", ex);
}
// Stop the durable client
@@@ -489,6 -466,6 +510,7 @@@
// Verify the durable client still exists on the server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
CacheClientProxy proxy = getClientProxy();
@@@ -498,6 -475,6 +520,7 @@@
// Publish some more entries
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -516,6 -493,6 +539,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -523,6 -500,6 +547,7 @@@
// Verify durable client on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -537,6 -514,6 +562,7 @@@
// Verify the durable client received the updates held for it on the server
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -578,6 -554,6 +604,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -585,6 -561,6 +612,7 @@@
// Have the durable client register interest in all keys
this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -603,6 -579,6 +631,7 @@@
// Send clientReady message
durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -610,6 -586,6 +639,7 @@@
// Have the durable client register interest in all keys
durableClient2VM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -622,6 -598,6 +652,7 @@@
// Verify durable clients on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Get the CacheClientNotifier
CacheClientNotifier notifier = getBridgeServer().getAcceptor()
@@@ -652,6 -628,6 +683,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -667,6 -643,6 +699,7 @@@
// Verify durable client 1 received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -682,6 -658,6 +715,7 @@@
// Verify durable client 2 received the updates
durableClient2VM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -699,7 -675,7 +733,7 @@@
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
-- fail("interrupted");
++ fail("interrupted", ex);
}
// Stop the durable clients
@@@ -708,6 -684,6 +742,7 @@@
// Verify the durable clients still exist on the server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Get the CacheClientNotifier
CacheClientNotifier notifier = getBridgeServer().getAcceptor()
@@@ -734,6 -710,6 +769,7 @@@
// Publish some more entries
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -748,14 -724,14 +784,15 @@@
});
try {
-- java.lang.Thread.sleep(1000);
++ Thread.sleep(1000);
}
-- catch (java.lang.InterruptedException ex) {
-- fail("interrupted");
++ catch (InterruptedException ex) {
++ fail("interrupted", ex);
}
// Verify the durable clients' queues contain the entries
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Get the CacheClientNotifier
CacheClientNotifier notifier = getBridgeServer().getAcceptor()
@@@ -763,7 -739,7 +800,6 @@@
// Iterate the CacheClientProxies and verify the queue sizes
checkNumberOfClientProxies(2);
--// boolean durableClient1Found=false, durableClient2Found=false;
for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
CacheClientProxy proxy = (CacheClientProxy) i.next();
assertEquals(numberOfEntries, proxy.getQueueSize());
@@@ -776,6 -752,6 +812,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -786,6 -762,6 +823,7 @@@
// Send clientReady message
durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -793,6 -769,6 +831,7 @@@
// Verify durable client 1 received the updates held for it on the server
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -808,6 -784,6 +847,7 @@@
// Verify durable client 2 received the updates held for it on the server
durableClient2VM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -863,6 -838,6 +903,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -870,6 -845,6 +911,7 @@@
// Have the durable client register interest in all keys
this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -882,6 -857,6 +924,7 @@@
// Verify durable client on server 1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -904,6 -879,6 +947,7 @@@
// Verify durable client on server 1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -922,6 -897,6 +966,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -936,14 -911,14 +981,15 @@@
});
try {
-- java.lang.Thread.sleep(1000);
++ Thread.sleep(1000);
}
-- catch (java.lang.InterruptedException ex) {
-- fail("interrupted");
++ catch (InterruptedException ex) {
++ fail("interrupted", ex);
}
// Verify the durable client's queue contains the entries
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
CacheClientProxy proxy = getClientProxy();
@@@ -960,6 -935,6 +1006,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -967,6 -942,6 +1014,7 @@@
// Verify durable client on server 1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -982,6 -957,6 +1030,7 @@@
// Verify durable client on server 2
this.server2VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -1002,6 -977,6 +1051,7 @@@
// Verify the durable client received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1045,6 -1019,6 +1095,7 @@@
// verify that readyForEvents has not yet been called on the client's default pool
this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
++ @Override
public void run2() throws CacheException {
for (Pool p: PoolManager.getAll().values()) {
assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
@@@ -1054,6 -1028,6 +1105,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -1061,6 -1035,6 +1113,7 @@@
// Verify durable clients on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Get the CacheClientNotifier
CacheClientNotifier notifier = getBridgeServer().getAcceptor()
@@@ -1110,6 -1081,6 +1163,7 @@@
// verify that readyForEvents has not yet been called on all the client's pools
this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
++ @Override
public void run2() throws CacheException {
for (Pool p: PoolManager.getAll().values()) {
assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
@@@ -1119,6 -1090,6 +1173,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -1126,6 -1097,6 +1181,7 @@@
//Durable client registers durable cq on server
this.durableClientVM.invoke(new CacheSerializableRunnable("Register Cq") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1148,19 -1119,19 +1204,20 @@@
query.execute();
}
catch (CqExistsException e) {
-- fail("Failed due to " + e);
++ fail("Failed due to ", e);
}
catch (CqException e) {
-- fail("Failed due to " + e);
++ fail("Failed due to ", e);
}
catch (RegionNotFoundException e) {
-- fail("Could not find specified region:" + regionName + ":" + e);
++ fail("Could not find specified region:" + regionName + ":", e);
}
}
});
// Verify durable client on server1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -1179,6 -1150,6 +1236,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("publish updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1194,6 -1165,6 +1252,7 @@@
// Verify the durable client received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1212,7 -1183,7 +1271,7 @@@
Thread.sleep(10000);
}
catch (InterruptedException e) {
-- fail("interrupted" + e);
++ fail("interrupted", e);
}
// Stop the durable client
@@@ -1220,6 -1191,6 +1279,7 @@@
// Verify the durable client still exists on the server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
CacheClientProxy proxy = getClientProxy();
@@@ -1229,6 -1200,6 +1289,7 @@@
// Publish some more entries
this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish additional updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1250,6 -1221,6 +1311,7 @@@
//Durable client registers durable cq on server
this.durableClientVM.invoke(new CacheSerializableRunnable("Register cq") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1272,13 -1243,13 +1334,13 @@@
query.execute();
}
catch (CqExistsException e) {
-- fail("Failed due to " + e);
++ fail("Failed due to ", e);
}
catch (CqException e) {
-- fail("Failed due to " + e);
++ fail("Failed due to ", e);
}
catch (RegionNotFoundException e) {
-- fail("Could not find specified region:" + regionName + ":" + e);
++ fail("Could not find specified region:" + regionName + ":", e);
}
}
@@@ -1286,6 -1257,6 +1348,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -1293,6 -1264,6 +1356,7 @@@
// Verify durable client on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -1307,6 -1278,6 +1371,7 @@@
// Verify the durable client received the updates held for it on the server
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1338,6 -1309,6 +1403,7 @@@
public void run2() throws CacheException {
PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = true;
ClientServerObserver origObserver = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
++ @Override
public void beforeSendingClientAck()
{
LogWriterUtils.getLogWriter().info("beforeSendingClientAck invoked");
@@@ -1376,6 -1346,6 +1442,7 @@@
// verify that readyForEvents has not yet been called on all the client's pools
this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
++ @Override
public void run2() throws CacheException {
for (Pool p: PoolManager.getAll().values()) {
assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
@@@ -1385,6 -1355,6 +1452,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -1392,6 -1362,6 +1460,7 @@@
//Durable client registers durable cq on server
this.durableClientVM.invoke(new CacheSerializableRunnable("Register Interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1404,6 -1374,6 +1473,7 @@@
// Verify durable client on server1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -1422,6 -1392,6 +1492,7 @@@
// Publish some entries
final int numberOfEntries = 10;
this.publisherClientVM.invoke(new CacheSerializableRunnable("publish updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1437,6 -1407,6 +1508,7 @@@
// Verify the durable client received the updates
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1453,13 -1423,13 +1525,14 @@@
Thread.sleep(10000);
}
catch (InterruptedException e) {
-- fail("interrupted" + e);
++ fail("interrupted", e);
}
// Stop the durable client
this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache(new Boolean(true)));
// Verify the durable client still exists on the server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
CacheClientProxy proxy = getClientProxy();
@@@ -1469,6 -1439,6 +1542,7 @@@
// Publish some more entries
this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish additional updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1489,6 -1459,6 +1563,7 @@@
//Durable client registers durable cq on server
this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1501,6 -1471,6 +1576,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -1508,6 -1478,6 +1584,7 @@@
// Verify durable client on server
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -1522,6 -1492,6 +1599,7 @@@
// Verify the durable client received the updates held for it on the server
this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
++ @Override
public void run2() throws CacheException {
// Get the region
Region region = CacheServerTestUtil.getCache().getRegion(regionName);
@@@ -1635,7 -1604,7 +1713,6 @@@
// Start server 1
Integer[] ports = ((Integer[]) this.server1VM.invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
final int serverPort = ports[0].intValue();
-- final int mcastPort = ports[1].intValue();
final String durableClientId = getName() + "_client";
@@@ -1668,7 -1637,7 +1745,7 @@@
Thread.sleep((timeoutInSeconds + 2) * 1000);
}
catch (InterruptedException ie) {
-- Thread.currentThread().interrupt();
++ fail("interrupted", ie);
}
//Restart the durable client
startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
@@@ -2400,7 -2370,7 +2477,7 @@@
Thread.sleep((timeoutInSeconds + 5) * 1000);
}
catch (InterruptedException e) {
-- Thread.currentThread().interrupt();
++ fail("interrupted", e);
}
//Restart the durable client
@@@ -2477,6 -2446,6 +2554,7 @@@
this.server1VM.invoke(new CacheSerializableRunnable(
"Close cq for durable client") {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -2489,7 -2458,7 +2567,7 @@@
ccnInstance.closeClientCq(durableClientId, "All");
}
catch (CqException e) {
-- throw new CacheException(e){};
++ fail("failed", e);
}
}
});
@@@ -2561,6 -2529,6 +2639,7 @@@
this.server1VM.invoke(new CacheSerializableRunnable(
"Close cq for durable client") {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -2575,7 -2543,7 +2654,7 @@@
ccnInstance.closeClientCq(durableClientId, "LessThan5");
}
catch (CqException e) {
-- throw new CacheException(e){};
++ fail("failed", e);
}
}
});
@@@ -2646,6 -2614,6 +2725,7 @@@
this.server1VM.invoke(new CacheSerializableRunnable(
"Close cq for durable client") {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -2660,7 -2628,7 +2740,7 @@@
ccnInstance.closeClientCq(durableClientId, "LessThan5");
}
catch (CqException e) {
-- throw new CacheException(e){};
++ fail("failed", e);
}
}
});
@@@ -2757,6 -2726,6 +2837,7 @@@
// Verify 2nd durable client on server
this.server1VM
.invoke(new CacheSerializableRunnable("Verify 2nd durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(2);
@@@ -2774,6 -2743,6 +2855,7 @@@
this.server1VM.invoke(new CacheSerializableRunnable(
"Close cq for durable client 1") {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -2786,7 -2755,7 +2868,7 @@@
ccnInstance.closeClientCq(durableClientId, "All");
}
catch (CqException e) {
-- throw new CacheException(e){};
++ fail("failed", e);
}
}
});
@@@ -2877,6 -2846,6 +2959,7 @@@
this.server1VM.invoke(new CacheSerializableRunnable(
"Set test hook") {
++ @Override
public void run2() throws CacheException {
//Set the Test Hook!
//This test hook will pause during the drain process
@@@ -2886,6 -2855,6 +2969,7 @@@
this.server1VM.invokeAsync(new CacheSerializableRunnable(
"Close cq for durable client") {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -2898,7 -2867,7 +2982,7 @@@
ccnInstance.closeClientCq(durableClientId, "All");
}
catch (CqException e) {
-- throw new CacheException(e){};
++ fail("failed", e);
}
}
});
@@@ -2908,11 -2877,11 +2992,14 @@@
this.server1VM.invoke(new CacheSerializableRunnable(
"verify was rejected at least once") {
++ @Override
public void run2() throws CacheException {
WaitCriterion ev = new WaitCriterion() {
++ @Override
public boolean done() {
return CacheClientProxy.testHook != null && (((RejectClientReconnectTestHook) CacheClientProxy.testHook).wasClientRejected());
}
++ @Override
public String description() {
return null;
}
@@@ -2949,6 -2918,6 +3036,7 @@@
}finally{
this.server1VM.invoke(new CacheSerializableRunnable(
"unset test hook") {
++ @Override
public void run2() throws CacheException {
CacheClientProxy.testHook = null;
}
@@@ -2998,6 -2967,6 +3086,7 @@@
AsyncInvocation async = this.server1VM.invokeAsync(new CacheSerializableRunnable(
"Close cq for durable client") {
++ @Override
public void run2() throws CacheException {
//Set the Test Hook!
@@@ -3052,6 -3021,6 +3141,7 @@@
}finally {
this.server1VM.invoke(new CacheSerializableRunnable(
"unset test hook") {
++ @Override
public void run2() throws CacheException {
CacheClientProxy.testHook = null;
}
@@@ -3094,6 -3063,6 +3184,7 @@@
//Attempt to close a cq even though the client is running
this.server1VM.invoke(new CacheSerializableRunnable(
"Close cq for durable client") {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -3110,7 -3079,7 +3201,7 @@@
//expected exception;
String expected = LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_ACTIVE_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId());
if (!e.getMessage().equals(expected)) {
-- fail("Not the expected exception, was expecting " + (LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_ACTIVE_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId()) + " instead of exception: " + e.getMessage()));
++ fail("Not the expected exception, was expecting " + (LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_ACTIVE_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId()) + " instead of exception: " + e.getMessage()), e);
}
}
}
@@@ -3120,7 -3089,7 +3211,6 @@@
checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
--
// Stop the durable client
this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
@@@ -3178,6 -3148,6 +3268,7 @@@
//drop client proxy
this.server1VM.invoke(new CacheSerializableRunnable(
"Close client proxy on server for client" + durableClientId) {
++ @Override
public void run2() throws CacheException {
final CacheClientNotifier ccnInstance = CacheClientNotifier
@@@ -3248,6 -3217,6 +3339,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -3255,6 -3224,6 +3347,7 @@@
// Verify durable client on server 1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -3270,6 -3239,6 +3363,7 @@@
// Verify durable client on server 2
this.server2VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -3288,6 -3257,6 +3382,7 @@@
// Verify the durable client is still on server 1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -3298,6 -3267,6 +3393,7 @@@
// Verify the durable client is still on server 2
this.server2VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -3312,6 -3281,6 +3408,7 @@@
// Send clientReady message
this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
++ @Override
public void run2() throws CacheException {
CacheServerTestUtil.getCache().readyForEvents();
}
@@@ -3319,6 -3288,6 +3416,7 @@@
// Verify durable client on server1
this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -3334,6 -3303,6 +3432,7 @@@
// Verify durable client on server2
this.server2VM.invoke(new CacheSerializableRunnable("Verify durable client") {
++ @Override
public void run2() throws CacheException {
// Find the proxy
checkNumberOfClientProxies(1);
@@@ -3360,7 -3329,7 +3459,5 @@@
// Stop server 2
this.server2VM.invoke(() -> CacheServerTestUtil.closeCache());
}
--
--
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --cc geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index a77b725,840f593..4ed2934
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@@ -16,20 -16,6 +16,21 @@@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.InterestResultPolicy;
import com.gemstone.gemfire.cache.Region;
@@@ -71,13 -46,11 +72,13 @@@ import com.gemstone.gemfire.test.junit.
/**
* Class <code>DurableClientTestCase</code> tests durable client
* functionality.
- *
- *
+ *
- * @since 5.2
- */
+ * @since GemFire 5.2
- */
-public class DurableClientTestCase extends DistributedTestCase {
++ */
+@Category(DistributedTest.class)
+public class DurableClientTestCase extends JUnit4DistributedTestCase {
+
+ protected static volatile boolean isPrimaryRecovered = false;
protected VM server1VM;
protected VM server2VM;
@@@ -170,10 -148,9 +171,10 @@@
* In this test we will set gemfire.SPECIAL_DURABLE property to true and will
* see durableID appended by poolname or not
*/
+ @Test
public void testSimpleDurableClient2() {
final Properties jp = new Properties();
- jp.setProperty("gemfire.SPECIAL_DURABLE", "true");
+ jp.setProperty(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE", "true");
try {
// Start a server
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
----------------------------------------------------------------------
diff --cc geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
index 75161f2,9d201fb..299a343
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
@@@ -24,16 -24,13 +24,16 @@@
*
*
* @version 1.0
- * @since 2014-04-02
+ * @since GemFire 2014-04-02
*/
-
package com.vmware.gemfire.tools.pulse.tests;
-import com.gemstone.gemfire.test.junit.categories.UITest;
-import junit.framework.Assert;
+import static org.junit.Assert.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 0e09842,7f92d7c..c0b8476
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@@ -16,40 -16,11 +16,40 @@@
*/
package com.gemstone.gemfire.internal.cache;
-import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.EntryNotFoundException;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Region.Entry;
+import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter;
import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
-import com.gemstone.gemfire.cache.wan.*;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
- import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
@@@ -58,34 -29,30 +58,28 @@@ import com.gemstone.gemfire.internal.ca
import com.gemstone.gemfire.internal.cache.versions.VersionStamp;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
-import com.gemstone.gemfire.test.dunit.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.*;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
- * @since 7.0.1
+ * @since GemFire 7.0.1
*/
-public class UpdateVersionDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
protected static final String regionName = "testRegion";
protected static Cache cache;
private static Set<IgnoredException>expectedExceptions = new HashSet<IgnoredException>();
--
--
- public UpdateVersionDUnitTest() {
- super();
- public UpdateVersionDUnitTest(String name) {
- super(name);
-- }
--
@Override
public final void preTearDown() throws Exception {
closeCache();
@@@ -94,9 -61,8 +88,8 @@@
} });
}
+ @Test
public void testUpdateVersionAfterCreateWithSerialSender() {
--
Host host = Host.getHost(0);
VM vm0 = host.getVM(0); // server1 site1
VM vm1 = host.getVM(1); // server2 site1
@@@ -233,9 -199,8 +226,8 @@@
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
}
+ @Test
public void testUpdateVersionAfterCreateWithSerialSenderOnDR() {
--
Host host = Host.getHost(0);
VM vm0 = host.getVM(0); // server1 site1
VM vm1 = host.getVM(1); // server2 site1
@@@ -359,9 -324,8 +351,8 @@@
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
}
+ @Test
public void testUpdateVersionAfterCreateWithParallelSender() {
--
Host host = Host.getHost(0);
VM vm0 = host.getVM(0); // server1 site1
VM vm1 = host.getVM(1); // server2 site1
@@@ -499,9 -463,8 +490,8 @@@
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
}
+ @Test
public void testUpdateVersionAfterCreateWithConcurrentSerialSender() {
--
Host host = Host.getHost(0);
VM vm0 = host.getVM(0); // server1 site1
VM vm1 = host.getVM(1); // server2 site1
@@@ -638,8 -601,8 +628,7 @@@
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
}
--
--
++
private VersionTagHolder createNewEvent(LocalRegion region, VersionTag tag, Object key, Object value) {
VersionTagHolder updateEvent = new VersionTagHolder(tag);
updateEvent.setOperation(Operation.UPDATE);
@@@ -661,13 -624,13 +650,13 @@@
*/
private static void createCache(Integer locPort) {
- UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+ UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
Properties props = test.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
- props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
- props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, "localhost[" + locPort + "]");
+ props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(USE_CLUSTER_CONFIGURATION, "false");
InternalDistributedSystem ds = test.getSystem(props);
cache = CacheFactory.create(ds);
IgnoredException ex = new IgnoredException("could not get remote locator information for remote site");
@@@ -744,7 -707,7 +733,6 @@@
}
}
--
public static void createPartitionedRegion(String regionName, String senderIds, Integer redundantCopies, Integer totalNumBuckets){
AttributesFactory fact = new AttributesFactory();
if(senderIds!= null){
@@@ -769,8 -732,8 +757,6 @@@
StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
while (tokenizer.hasMoreTokens()){
String senderId = tokenizer.nextToken();
--// GatewaySender sender = cache.getGatewaySender(senderId);
--// assertNotNull(sender);
fact.addGatewaySenderId(senderId);
}
}
@@@ -800,16 -763,16 +786,16 @@@
}
public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
- UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+ UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
- props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
- props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
- props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+ props.setProperty(LOCATORS, "localhost[" + port + "]");
+ props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
+ props.setProperty(USE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
test.getSystem(props);
return port;
}
@@@ -868,10 -831,10 +854,10 @@@
}
public static int createReceiver(int locPort) {
- UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+ UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
Properties props = test.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, "localhost[" + locPort
+ "]");
InternalDistributedSystem ds = test.getSystem(props);
@@@ -902,18 -865,18 +888,19 @@@
sender.start();
}
-- protected static class MyLocatorCallback extends
-- LocatorDiscoveryCallbackAdapter {
++ protected static class MyLocatorCallback extends LocatorDiscoveryCallbackAdapter {
private final Set discoveredLocators = new HashSet();
private final Set removedLocators = new HashSet();
++ @Override
public synchronized void locatorsDiscovered(List locators) {
discoveredLocators.addAll(locators);
notifyAll();
}
++ @Override
public synchronized void locatorsRemoved(List locators) {
removedLocators.addAll(locators);
notifyAll();
@@@ -960,16 -923,16 +947,16 @@@
}
public static Integer createFirstLocatorWithDSId(int dsId) {
- UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName());
+ UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
- props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
- props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
- props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
- props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
+ props.setProperty(LOCATORS, "localhost[" + port + "]");
+ props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(USE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
test.getSystem(props);
return port;
}
--}
++}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd38e10f/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
index 1932a7a,f22060b..46b3461
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
@@@ -16,68 -16,36 +16,50 @@@
*/
package com.gemstone.gemfire.internal.cache.wan;
- import org.junit.experimental.categories.Category;
- import org.junit.Test;
-
-import com.gemstone.gemfire.cache.*;
++import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
- import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
- import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
- import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
++import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolManager;
- import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
- import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
- import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
- import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
- import com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes;
+ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.ha.HAContainerRegion;
- import com.gemstone.gemfire.internal.cache.ha.HAContainerWrapper;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
- import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
- import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.logging.LogService;
- import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.*;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
- import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
- import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
++import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+@Category(DistributedTest.class)
public class CacheClientNotifierDUnitTest extends WANTestBase {
++
private static final int NUM_KEYS = 10;
- public CacheClientNotifierDUnitTest() {
- super();
- public CacheClientNotifierDUnitTest(String name) {
- super(name);
-- // TODO Auto-generated constructor stub
-- }
--
-- private int createCacheServerWithCSC(VM vm, final boolean withCSC, final int capacity,
++ private int createCacheServerWithCSC(VM vm, final boolean withCSC, final int capacity,
final String policy, final String diskStoreName) {
final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@@ -179,12 -147,11 +161,12 @@@
vm.invoke(verifyRegionSize);
}
-- /*
++ /**
* The test will start several cache servers, including gateway receivers.
-- * Shutdown them and verify the CacheClientNofifier for each server is correct
++ * Shutdown them and verify the CacheClientNotifier for each server is correct
*/
-- // GEODE-1183: random ports, failure to start threads, eats exceptions, time sensitive
++ @Category(FlakyTest.class) // GEODE-1183: random ports, failure to start threads, eats exceptions, time sensitive
+ @Test
public void testNormalClient2MultipleCacheServer() throws Exception {
doMultipleCacheServer(false);
}
@@@ -253,13 -220,13 +235,13 @@@
public static void createClientWithLocator(int port0,String host,
String regionName, String clientId, boolean isDurable) {
- WANTestBase test = new WANTestBase(getTestMethodName());
+ WANTestBase test = new WANTestBase();
Properties props = test.getDistributedSystemProperties();
- props.setProperty("mcast-port", "0");
- props.setProperty("locators", "");
+ props.setProperty(MCAST_PORT, "0");
+ props.setProperty(LOCATORS, "");
if (isDurable) {
- props.setProperty("durable-client-id", clientId);
- props.setProperty("durable-client-timeout", "" + 200);
+ props.setProperty(DURABLE_CLIENT_ID, clientId);
+ props.setProperty(DURABLE_CLIENT_TIMEOUT, "" + 200);
}
InternalDistributedSystem ds = test.getSystem(props);
@@@ -292,5 -259,5 +274,4 @@@
"Distributed Region " + regionName + " created Successfully :"
+ region.toString() + " in a "+(isDurable?"durable":"")+" client");
}
--
-- }
++}