Skip to content

Commit

Permalink
Use Awaitility to instead of Thread sleep method. (#389)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattisonchao
mattisonchao committed Jul 12, 2021
1 parent e42a07a commit 4dffb5e
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 87 deletions.
5 changes: 5 additions & 0 deletions curator-client/pom.xml
View file
Expand Up @@ -82,6 +82,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
64 changes: 15 additions & 49 deletions curator-client/src/test/java/org/apache/curator/BasicTests.java
View file
Expand Up @@ -23,21 +23,21 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.time.Duration;
import org.apache.curator.ensemble.fixed.FixedEnsembleProvider;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.BaseClassForTests;
import org.apache.curator.test.Timing;
import org.apache.curator.utils.ZookeeperFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.ZooKeeper;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;

Expand All @@ -47,14 +47,8 @@ public class BasicTests extends BaseClassForTests
public void testFactory() throws Exception
{
final ZooKeeper mockZookeeper = Mockito.mock(ZooKeeper.class);
ZookeeperFactory zookeeperFactory = new ZookeeperFactory()
{
@Override
public ZooKeeper newZooKeeper(String connectString, int sessionTimeout, Watcher watcher, boolean canBeReadOnly) throws Exception
{
return mockZookeeper;
}
};
ZookeeperFactory zookeeperFactory =
(connectString, sessionTimeout, watcher, canBeReadOnly) -> mockZookeeper;
CuratorZookeeperClient client = new CuratorZookeeperClient(zookeeperFactory, new FixedEnsembleProvider(server.getConnectString()), 10000, 10000, null, new RetryOneTime(1), false);
client.start();
assertEquals(client.getZooKeeper(), mockZookeeper);
Expand All @@ -68,15 +62,10 @@ public void testExpiredSession() throws Exception
final Timing timing = new Timing();

final CountDownLatch latch = new CountDownLatch(1);
Watcher watcher = new Watcher()
{
@Override
public void process(WatchedEvent event)
Watcher watcher = event -> {
if ( event.getState() == Watcher.Event.KeeperState.Expired )
{
if ( event.getState() == Event.KeeperState.Expired )
{
latch.countDown();
}
latch.countDown();
}
};

Expand All @@ -88,11 +77,7 @@ public void process(WatchedEvent event)
RetryLoop.callWithRetry
(
client,
new Callable<Object>()
{
@Override
public Object call() throws Exception
{
() -> {
if ( firstTime.compareAndSet(true, false) )
{
try
Expand All @@ -113,7 +98,6 @@ public Object call() throws Exception
assertNotNull(zooKeeper.exists("/foo", false));
return null;
}
}
);
}
finally
Expand Down Expand Up @@ -166,34 +150,16 @@ public void testSimple() throws Exception
}

@Test
public void testBackgroundConnect() throws Exception
public void testBackgroundConnect() throws Exception
{
final int CONNECTION_TIMEOUT_MS = 4000;

CuratorZookeeperClient client = new CuratorZookeeperClient(server.getConnectString(), 10000, CONNECTION_TIMEOUT_MS, null, new RetryOneTime(1));
try
{
try (CuratorZookeeperClient client = new CuratorZookeeperClient(server.getConnectString(), 10000,
CONNECTION_TIMEOUT_MS, null, new RetryOneTime(1))) {
assertFalse(client.isConnected());
client.start();

outer: do
{
for ( int i = 0; i < (CONNECTION_TIMEOUT_MS / 1000); ++i )
{
if ( client.isConnected() )
{
break outer;
}

Thread.sleep(CONNECTION_TIMEOUT_MS);
}

fail();
} while ( false );
}
finally
{
client.close();
Awaitility.await()
.atMost(Duration.ofMillis(CONNECTION_TIMEOUT_MS))
.untilAsserted(() -> Assertions.assertTrue(client.isConnected()));
}
}
}
41 changes: 7 additions & 34 deletions curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java
View file
Expand Up @@ -22,6 +22,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.common.collect.Lists;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -89,11 +90,7 @@ public void testBasicCallable() throws InterruptedException
{
service.submit
(
new Callable<Void>()
{
@Override
public Void call() throws Exception
{
(Callable<Void>) () -> {
try
{
startLatch.countDown();
Expand All @@ -109,7 +106,6 @@ public Void call() throws Exception
}
return null;
}
}
);
}

Expand All @@ -128,11 +124,7 @@ public void testListeningRunnable() throws InterruptedException
{
Future<?> future = service.submit
(
new Runnable()
{
@Override
public void run()
{
() -> {
try
{
startLatch.countDown();
Expand All @@ -143,7 +135,6 @@ public void run()
Thread.currentThread().interrupt();
}
}
}
);
futures.add(future);
}
Expand All @@ -168,11 +159,7 @@ public void testListeningCallable() throws InterruptedException
{
Future<?> future = service.submit
(
new Callable<Void>()
{
@Override
public Void call() throws Exception
{
(Callable<Void>) () -> {
try
{
startLatch.countDown();
Expand All @@ -184,7 +171,6 @@ public Void call() throws Exception
}
return null;
}
}
);
futures.add(future);
}
Expand All @@ -204,11 +190,7 @@ public void testPartialRunnable() throws InterruptedException
final CountDownLatch outsideLatch = new CountDownLatch(1);
executorService.submit
(
new Runnable()
{
@Override
public void run()
{
() -> {
try
{
Thread.currentThread().join();
Expand All @@ -222,7 +204,6 @@ public void run()
outsideLatch.countDown();
}
}
}
);

CloseableExecutorService service = new CloseableExecutorService(executorService);
Expand All @@ -233,10 +214,7 @@ public void run()
submitRunnable(service, startLatch, latch);
}

while ( service.size() < QTY )
{
Thread.sleep(100);
}
Awaitility.await().until(()-> service.size() >= QTY);

assertTrue(startLatch.await(3, TimeUnit.SECONDS));
service.close();
Expand All @@ -248,11 +226,7 @@ private void submitRunnable(CloseableExecutorService service, final CountDownLat
{
service.submit
(
new Runnable()
{
@Override
public void run()
{
() -> {
try
{
startLatch.countDown();
Expand All @@ -267,7 +241,6 @@ public void run()
latch.countDown();
}
}
}
);
}
}
5 changes: 5 additions & 0 deletions curator-framework/pom.xml
View file
Expand Up @@ -86,6 +86,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 3 additions & 4 deletions curator-framework/src/test/java/org/apache/curator/framework/imps/TestCleanState.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.apache.curator.utils.CloseableUtils;
import org.apache.zookeeper.ZooKeeper;
import java.util.concurrent.Callable;
import org.awaitility.Awaitility;

public class TestCleanState
{
Expand All @@ -43,10 +44,8 @@ public static void closeAndTestClean(CuratorFramework client)
EnsembleTracker ensembleTracker = internalClient.getEnsembleTracker();
if ( ensembleTracker != null )
{
while ( ensembleTracker.hasOutstanding() )
{
Thread.sleep(100);
}
Awaitility.await()
.until(() -> !ensembleTracker.hasOutstanding());
ensembleTracker.close();
}
ZooKeeper zooKeeper = internalClient.getZooKeeper();
Expand Down
9 changes: 9 additions & 0 deletions pom.xml
View file
Expand Up @@ -100,6 +100,7 @@
<dropwizard-version>3.2.5</dropwizard-version>
<snappy-version>1.1.7</snappy-version>
<build-helper-maven-plugin-version>3.1.0</build-helper-maven-plugin-version>
<awaitility-version>4.1.0</awaitility-version>

<!-- OSGi Properties -->
<osgi.export.package />
Expand Down Expand Up @@ -627,6 +628,14 @@
<artifactId>snappy-java</artifactId>
<version>${snappy-version}</version>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility-version}</version>
<scope>test</scope>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down

0 comments on commit 4dffb5e

Please sign in to comment.