Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 88F09200B36 for ; Wed, 1 Jun 2016 02:06:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 877FF160A47; Wed, 1 Jun 2016 00:06:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D259F160A48 for ; Wed, 1 Jun 2016 02:06:40 +0200 (CEST) Received: (qmail 78376 invoked by uid 500); 1 Jun 2016 00:06:39 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 78315 invoked by uid 99); 1 Jun 2016 00:06:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 00:06:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EBFAE03AF; Wed, 1 Jun 2016 00:06:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Wed, 01 Jun 2016 00:06:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] curator git commit: Don't exit test until watchers have hit so that the watcher removal code is stable archived-at: Wed, 01 Jun 2016 00:06:41 -0000 Don't exit test until watchers have hit so that the watcher removal code is stable Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/44fd666a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/44fd666a Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/44fd666a Branch: refs/heads/CURATOR-3.0 Commit: 44fd666a366999ae9503dff6866bb8aa37b2d604 Parents: 4fb0895 Author: randgalt Authored: Mon May 30 21:31:21 2016 -0500 Committer: randgalt Committed: Mon May 30 21:31:21 2016 -0500 ---------------------------------------------------------------------- .../recipes/shared/TestSharedCount.java | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/44fd666a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java index 16134ed..28df3f9 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java @@ -163,10 +163,29 @@ public class TestSharedCount extends BaseClassForTests client.start(); count.start(); + final CountDownLatch setLatch = new CountDownLatch(3); + SharedCountListener listener = new SharedCountListener() + { + @Override + public void countHasChanged(SharedCountReader sharedCount, int newCount) throws Exception + { + setLatch.countDown(); + } + + @Override + public void stateChanged(CuratorFramework client, ConnectionState newState) + { + // nop + } + }; + count.addListener(listener); + Assert.assertTrue(count.trySetCount(1)); Assert.assertTrue(count.trySetCount(2)); Assert.assertTrue(count.trySetCount(10)); Assert.assertEquals(count.getCount(), 10); + + Assert.assertTrue(new Timing().awaitLatch(setLatch)); } finally { @@ -242,12 +261,30 @@ public class TestSharedCount extends BaseClassForTests Assert.assertTrue(count2.trySetCount(versionedValue, 20)); timing.sleepABit(); + final CountDownLatch setLatch = new CountDownLatch(2); + SharedCountListener listener = new SharedCountListener() + { + @Override + public void countHasChanged(SharedCountReader sharedCount, int newCount) throws Exception + { + setLatch.countDown(); + } + + @Override + public void stateChanged(CuratorFramework client, ConnectionState newState) + { + // nop + } + }; + count1.addListener(listener); VersionedValue versionedValue1 = count1.getVersionedValue(); VersionedValue versionedValue2 = count2.getVersionedValue(); Assert.assertTrue(count2.trySetCount(versionedValue2, 30)); Assert.assertFalse(count1.trySetCount(versionedValue1, 40)); + versionedValue1 = count1.getVersionedValue(); Assert.assertTrue(count1.trySetCount(versionedValue1, 40)); + Assert.assertTrue(timing.awaitLatch(setLatch)); } finally {