geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bogle...@apache.org
Subject [geode] branch develop updated: GEODE-4015: Modified test Wait description to return actual value
Date Mon, 27 Nov 2017 20:51:35 GMT
This is an automated email from the ASF dual-hosted git repository.

boglesby 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 e286c4e  GEODE-4015: Modified test Wait description to return actual value
e286c4e is described below

commit e286c4e7d1225270b8132db0fea9d5ff46b38876
Author: Barry Oglesby <boglesby@pivotal.io>
AuthorDate: Mon Nov 27 12:31:19 2017 -0800

    GEODE-4015: Modified test Wait description to return actual value
---
 .../cache/tier/sockets/ConflationDUnitTest.java         | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
index b31b827..4203b28 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -446,10 +446,10 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
    *
    */
   public static void assertAllCountersZero() {
-    assertEquals(count, 0);
-    assertEquals(counterCreate, 0);
-    assertEquals(counterUpdate, 0);
-    assertEquals(counterDestroy, 0);
+    assertEquals(0, count);
+    assertEquals(0, counterCreate);
+    assertEquals(0, counterUpdate);
+    assertEquals(0, counterDestroy);
   }
 
   /**
@@ -483,36 +483,33 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   public static void assertCounterSizes() {
     WaitCriterion ev = new WaitCriterion() {
       public boolean done() {
-        Thread.yield(); // TODO is this necessary?
         return counterCreate == 2;
       }
 
       public String description() {
-        return null;
+        return "Expected counterCreate to be 2. Instead it was " + counterCreate + ".";
       }
     };
     Wait.waitForCriterion(ev, 60 * 1000, 200, true);
 
     ev = new WaitCriterion() {
       public boolean done() {
-        Thread.yield(); // TODO is this necessary?
         return counterUpdate == 2;
       }
 
       public String description() {
-        return null;
+        return "Expected counterUpdate to be 2. Instead it was " + counterUpdate + ".";
       }
     };
     Wait.waitForCriterion(ev, 60 * 1000, 200, true);
 
     ev = new WaitCriterion() {
       public boolean done() {
-        Thread.yield(); // TODO is this necessary?
         return counterDestroy == 2;
       }
 
       public String description() {
-        return null;
+        return "Expected counterDestroy to be 2. Instead it was " + counterDestroy + ".";
       }
     };
     Wait.waitForCriterion(ev, 60 * 1000, 200, true);

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message