You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/01/05 18:20:48 UTC
[geode] branch develop updated: GEODE-4135: Awaitility condition
added
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 2d4cd26 GEODE-4135: Awaitility condition added
2d4cd26 is described below
commit 2d4cd268eb4fa113c57561a6215ef45376d97610
Author: nabarun <nn...@pivotal.io>
AuthorDate: Thu Jan 4 14:26:50 2018 -0800
GEODE-4135: Awaitility condition added
* Additional awaitility added to check for the region size
* Modified the test structure.
---
.../apache/geode/internal/cache/wan/WANTestBase.java | 20 ++++++++++++--------
.../internal/cache/wan/misc/PDXNewWanDUnitTest.java | 11 +++++------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 5c361b1..3468591 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -2760,16 +2760,20 @@ public class WANTestBase extends JUnit4DistributedTestCase {
public static void validateRegionSize_PDX(String regionName, final int regionSize) {
final Region r = cache.getRegion(Region.SEPARATOR + regionName);
assertNotNull(r);
- Awaitility.await().atMost(200, TimeUnit.SECONDS)
- .until(
- () -> assertEquals(
- "Expected region entries: " + regionSize + " but actual entries: "
- + r.keySet().size() + " present region keyset " + r.keySet(),
- true, (regionSize <= r.keySet().size())));
+ Awaitility.await().atMost(200, TimeUnit.SECONDS).until(() -> {
+ assertEquals("Expected region entries: " + regionSize + " but actual entries: "
+ + r.keySet().size() + " present region keyset " + r.keySet(), true,
+ (regionSize <= r.keySet().size()));
+ assertEquals("Expected region size: " + regionSize + " but actual size: " + r.size(), true,
+ (regionSize == r.size()));
+ });
for (int i = 0; i < regionSize; i++) {
+ final int temp = i;
logger.info("For Key : Key_" + i + " : Values : " + r.get("Key_" + i));
- assertEquals("keySet = " + r.keySet() + " values() = " + r.values(),
- new SimpleClass(i, (byte) i), r.get("Key_" + i));
+ Awaitility.await().atMost(200, TimeUnit.SECONDS)
+ .until(() -> assertEquals(
+ "keySet = " + r.keySet() + " values() = " + r.values() + "Region Size = " + r.size(),
+ new SimpleClass(temp, (byte) temp), r.get("Key_" + temp)));
}
}
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index d526441..abcd142 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -478,20 +478,19 @@ public class PDXNewWanDUnitTest extends WANTestBase {
Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
createCacheInVMs(nyPort, vm2);
- vm2.invoke(() -> WANTestBase.createReceiver());
-
- vm3.invoke(() -> WANTestBase.createCache(lnPort));
-
- vm3.invoke(() -> WANTestBase.createSender("ln", 2, true, 100, 10, false, false, null, true));
-
vm2.invoke(() -> WANTestBase.createPartitionedRegion(getTestMethodName() + "_PR", null, 0, 1,
isOffHeap()));
+ vm2.invoke(() -> WANTestBase.createReceiver());
+ vm3.invoke(() -> WANTestBase.createCache(lnPort));
vm3.invoke(() -> WANTestBase.createPartitionedRegion(getTestMethodName() + "_PR", "ln", 0, 1,
isOffHeap()));
+ vm3.invoke(() -> WANTestBase.createSender("ln", 2, true, 100, 10, false, false, null, true));
vm3.invoke(() -> WANTestBase.startSender("ln"));
+ vm3.invoke(() -> WANTestBase.waitForSenderRunningState("ln"));
+
vm3.invoke(() -> WANTestBase.doPutsPDXSerializable(getTestMethodName() + "_PR", 1));
vm2.invoke(() -> WANTestBase.validateRegionSize_PDX(getTestMethodName() + "_PR", 1));
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].