This is an automated email from the ASF dual-hosted git repository. klund 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 45138b4 GEODE-5630: fixup usage of Awaitility 45138b4 is described below commit 45138b4861ff882006000c953a823b4ecc4a5fdd Author: Kirk Lund <kl...@apache.org> AuthorDate: Fri Aug 24 15:40:56 2018 -0700 GEODE-5630: fixup usage of Awaitility --- .../test/junit/rules/MySqlConnectionRule.java | 5 ++++- .../junit/rules/SqlDatabaseConnectionRule.java | 4 +++- .../internal/AutoConnectionSourceDUnitTest.java | 3 ++- .../query/dunit/QueryIndexUsingXMLDUnitTest.java | 3 +-- .../EntriesDoNotExpireDuringGiiRegressionTest.java | 2 +- .../ParallelAsyncEventListenerDistributedTest.java | 2 +- .../management/JMXMBeanReconnectDUnitTest.java | 10 ++------- .../internal/pulse/TestClientIdsDUnitTest.java | 8 +------- .../CacheClientNotifierIntegrationTest.java | 24 +++++++--------------- ...pClientExecutorSubmitTaskWithExceptionTest.java | 9 ++++---- .../cache/query/internal/QueryMonitorTest.java | 5 ++++- ...ientStatisticsPublicationSecurityDUnitTest.java | 14 +++++-------- .../tier/sockets/ClientServerMiscBCDUnitTest.java | 15 ++++++-------- .../geode/cache/lucene/ExpirationDUnitTest.java | 9 +------- ...eneIndexCreationPersistenceIntegrationTest.java | 13 ++++-------- .../LuceneSearchWithRollingUpgradeDUnit.java | 15 +++++--------- 16 files changed, 51 insertions(+), 90 deletions(-) diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/MySqlConnectionRule.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/MySqlConnectionRule.java index 4998cbf..e8dadda 100644 --- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/MySqlConnectionRule.java +++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/MySqlConnectionRule.java @@ -14,6 +14,8 @@ */ package org.apache.geode.test.junit.rules; +import static org.assertj.core.api.Assertions.assertThat; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -37,7 +39,8 @@ public class MySqlConnectionRule extends SqlDatabaseConnectionRule { @Override public Connection getConnection() throws SQLException { Awaitility.await().ignoreExceptions().atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> DriverManager.getConnection(getCreateDbConnectionUrl())); + .untilAsserted( + () -> assertThat(DriverManager.getConnection(getCreateDbConnectionUrl())).isNotNull()); String dbName = getDbName(); if (dbName != null) { Connection connection = DriverManager.getConnection(getCreateDbConnectionUrl()); diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/SqlDatabaseConnectionRule.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/SqlDatabaseConnectionRule.java index 1dcd255..aab0b08 100644 --- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/SqlDatabaseConnectionRule.java +++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/test/junit/rules/SqlDatabaseConnectionRule.java @@ -14,6 +14,8 @@ */ package org.apache.geode.test.junit.rules; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; @@ -64,7 +66,7 @@ public abstract class SqlDatabaseConnectionRule extends ExternalResource public Connection getConnection() throws SQLException { String connectionUrl = getConnectionUrl(); Awaitility.await().ignoreExceptions().atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> DriverManager.getConnection(connectionUrl)); + .untilAsserted(() -> assertThat(DriverManager.getConnection(connectionUrl)).isNotNull()); Connection connection = DriverManager.getConnection(connectionUrl); return connection; } diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java index 1ddb8ed..8e53ad7 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java @@ -17,6 +17,7 @@ package org.apache.geode.cache.client.internal; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -436,7 +437,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase { private void putAndWaitForSuccess(VM vm, final String regionName, final Serializable key, final Serializable value) { Awaitility.await().atMost(MAX_WAIT, MILLISECONDS).untilAsserted(() -> { - putInVM(vm, regionName, key, value); + assertThatCode(() -> putInVM(vm, regionName, key, value)).doesNotThrowAnyException(); }); } diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java index 284274d..c6d6a79 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java @@ -32,7 +32,6 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; -import org.awaitility.Awaitility; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -518,7 +517,7 @@ public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase { } public void validateIndexSize() { - Awaitility.await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> { + await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> { boolean indexSizeCheck_NAME = validateIndexSizeForRegion(NAME); boolean indexSizeCheck_REP_REG_NAME = validateIndexSizeForRegion(REP_REG_NAME); boolean indexSizeCheck_PERSISTENT_REG_NAME = validateIndexSizeForRegion(PERSISTENT_REG_NAME); diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java index 1633a59..5947146 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java @@ -113,7 +113,7 @@ public class EntriesDoNotExpireDuringGiiRegressionTest implements Serializable { doRegionOps.await(); - await().untilAsserted(() -> region.values().isEmpty()); + await().until(() -> region.values().isEmpty()); assertThat(region.values()).hasSize(0); assertThat(region.keySet()).hasSize(ENTRY_COUNT); diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java index c5a3503..eae6d00 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java @@ -1235,7 +1235,7 @@ public class ParallelAsyncEventListenerDistributedTest implements Serializable { } private void waitForPrimaryToMove() { - await().atMost(TWO_MINUTES).untilAsserted(() -> getPrimaryMovingAsyncEventListener().isMoved()); + await().atMost(TWO_MINUTES).until(() -> getPrimaryMovingAsyncEventListener().isMoved()); } private InternalGatewaySender getInternalGatewaySender() { diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java index fe08e10..a8a52b3 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java @@ -35,7 +35,6 @@ import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; -import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -224,13 +223,8 @@ public class JMXMBeanReconnectDUnitTest { private void waitForMBeanFederationFrom(int numMemberMBeans, MemberVM member) { String memberName = "server-" + member.getVM().getId(); - Awaitility.waitAtMost(10, SECONDS).untilAsserted(() -> { - List<ObjectName> beans = null; - try { - beans = getFederatedGemfireBeansFrom(locator1); - } catch (IOException e) { - e.printStackTrace(); - } + waitAtMost(10, SECONDS).untilAsserted(() -> { + List<ObjectName> beans = getFederatedGemfireBeansFrom(locator1); List<ObjectName> beanList = beans.stream().filter(b -> b.toString().contains(memberName)).sorted().collect(toList()); assertThat(beanList.size()).isEqualTo(numMemberMBeans); diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java index d28c514..a52ff3e 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java @@ -128,13 +128,7 @@ public class TestClientIdsDUnitTest implements Serializable { private void verifyClientIds(final DistributedMember serverMember, final int serverPort) throws Exception { CacheServerMXBean cacheServerMXBean = awaitCacheServerMXBean(serverMember, serverPort); - await().untilAsserted(() -> { - try { - assertThat(cacheServerMXBean.getClientIds()).hasSize(2); - } catch (Exception e) { - throw new Error(e); - } - }); + await().untilAsserted(() -> assertThat(cacheServerMXBean.getClientIds()).hasSize(2)); assertThat(cacheServerMXBean.getClientIds()).hasSize(2); // TODO: write better assertions } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierIntegrationTest.java index bef8b04..d65dd6e 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierIntegrationTest.java @@ -15,6 +15,8 @@ package org.apache.geode.internal.cache.tier.sockets; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; @@ -36,11 +38,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import org.apache.shiro.subject.Subject; -import org.awaitility.Awaitility; -import org.awaitility.Duration; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -152,21 +151,12 @@ public class CacheClientNotifierIntegrationTest { } // Verify that we do not hang in peek() for the second proxy due to the wrapper - Awaitility.waitAtMost(new Duration(30, TimeUnit.SECONDS)).untilAsserted(() -> { - try { - Object eventPeeked = null; - while (eventPeeked == null) { - // Simulating message dispatching. We peek() and remove() but aren't testing - // the actual message delivery for this test. - eventPeeked = cacheClientProxyTwo.getHARegionQueue().peek(); - if (eventPeeked != null) { - cacheClientProxyTwo.getHARegionQueue().remove(); - } - } - } catch (InterruptedException e) { - e.printStackTrace(); - throw (new RuntimeException(e)); + await().atMost(30, SECONDS).until(() -> { + if (cacheClientProxyTwo.getHARegionQueue().peek() != null) { + cacheClientProxyTwo.getHARegionQueue().remove(); + return true; } + return false; }); Assert.assertEquals("Expected the HAContainer to be empty", 0, diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java index 1e8911d..e8e4e02 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache.client.internal; -import java.util.concurrent.TimeUnit; +import static java.util.concurrent.TimeUnit.MINUTES; import org.awaitility.Awaitility; import org.junit.Rule; @@ -50,12 +50,11 @@ public class SingleHopClientExecutorSubmitTaskWithExceptionTest { } }); - /** + /* * Sometimes need to wait for more than sec as thread execution takes time. */ - Awaitility.await("Waiting for exception").atMost(60l, TimeUnit.SECONDS).untilAsserted(() -> { - systemErrRule.getLog().contains(erroMsg); - }); + Awaitility.await("Waiting for exception").atMost(1, MINUTES) + .until(() -> systemErrRule.getLog().contains(erroMsg)); } } diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryMonitorTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryMonitorTest.java index a83adcf..f77528c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryMonitorTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryMonitorTest.java @@ -15,6 +15,7 @@ package org.apache.geode.cache.query.internal; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -91,7 +92,9 @@ public class QueryMonitorTest { private Thread createQueryExecutionThread(int i) { Thread thread = new Thread(() -> { // make sure the threadlocal variable is updated - Awaitility.await().untilAsserted(() -> QueryMonitor.isQueryExecutionCanceled()); + Awaitility.await() + .untilAsserted(() -> assertThatCode(() -> QueryMonitor.isQueryExecutionCanceled()) + .doesNotThrowAnyException()); }); thread.setName("query" + i); return thread; diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/cache/ClientStatisticsPublicationSecurityDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/ClientStatisticsPublicationSecurityDUnitTest.java index 2299c28..71787ff 100644 --- a/geode-cq/src/distributedTest/java/org/apache/geode/cache/ClientStatisticsPublicationSecurityDUnitTest.java +++ b/geode-cq/src/distributedTest/java/org/apache/geode/cache/ClientStatisticsPublicationSecurityDUnitTest.java @@ -123,16 +123,12 @@ public class ClientStatisticsPublicationSecurityDUnitTest { SystemManagementService service = (SystemManagementService) ManagementService.getExistingManagementService(cache); CacheServerMXBean serviceMBean = service.getJMXAdapter().getClientServiceMXBean(serverPort); - try { - String clientId = serviceMBean.getClientIds()[0]; - ClientHealthStatus status = serviceMBean.showClientStats(clientId); - assertThat(status.getNumOfPuts()).isEqualTo(expectedNumPuts); - assertThat(status.getPoolStats().keySet()) - .containsExactlyInAnyOrder(expectedPoolStatKeys); - } catch (Exception e) { - throw new RuntimeException(e); - } + String clientId = serviceMBean.getClientIds()[0]; + ClientHealthStatus status = serviceMBean.showClientStats(clientId); + assertThat(status.getNumOfPuts()).isEqualTo(expectedNumPuts); + assertThat(status.getPoolStats().keySet()) + .containsExactlyInAnyOrder(expectedPoolStatKeys); }); }); } diff --git a/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 9bf906a..d8c43e1 100755 --- a/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-cq/src/upgradeTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -179,9 +179,8 @@ public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTestBase { server2.invoke("wait for failover queue to drain", () -> { CacheClientProxy proxy = CacheClientNotifier.getInstance().getClientProxies().iterator().next(); - Awaitility.await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> { - proxy.getHARegionQueue().isEmpty(); - }); + Awaitility.await().atMost(30, TimeUnit.SECONDS) + .until(() -> proxy.getHARegionQueue().isEmpty()); }); // the client should now get duplicate events from the current-version server @@ -204,9 +203,8 @@ public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTestBase { server3.invoke("wait for failover queue to drain", () -> { CacheClientProxy proxy = CacheClientNotifier.getInstance().getClientProxies().iterator().next(); - Awaitility.await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> { - proxy.getHARegionQueue().isEmpty(); - }); + Awaitility.await().atMost(30, TimeUnit.SECONDS) + .until(() -> proxy.getHARegionQueue().isEmpty()); }); // the client should now get duplicate events from the current-version server @@ -290,9 +288,8 @@ public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTestBase { server2.invoke("wait for failover queue to drain", () -> { CacheClientProxy proxy = CacheClientNotifier.getInstance().getClientProxies().iterator().next(); - Awaitility.await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> { - proxy.getHARegionQueue().isEmpty(); - }); + Awaitility.await().atMost(60, TimeUnit.SECONDS) + .until(() -> proxy.getHARegionQueue().isEmpty()); }); } diff --git a/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java index 2c33af8..3c741f3 100644 --- a/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java +++ b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java @@ -18,7 +18,6 @@ import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME; import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.util.Collection; import java.util.concurrent.TimeUnit; @@ -76,13 +75,7 @@ public class ExpirationDUnitTest extends LuceneQueriesAccessorBase { LuceneQuery<Integer, TestObject> luceneQuery = luceneService.createLuceneQueryFactory() .setLimit(100).create(INDEX_NAME, REGION_NAME, "world", "text"); - Collection luceneResultList = null; - try { - luceneResultList = luceneQuery.findKeys(); - } catch (LuceneQueryException e) { - e.printStackTrace(); - fail(); - } + Collection luceneResultList = luceneQuery.findKeys(); assertEquals(0, luceneResultList.size()); })); } diff --git a/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java index ac89e10..f1d78ad 100644 --- a/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java +++ b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java @@ -14,6 +14,7 @@ */ package org.apache.geode.cache.lucene; +import static java.util.concurrent.TimeUnit.SECONDS; import static junitparams.JUnitParamsRunner.$; import static org.apache.geode.cache.RegionShortcut.PARTITION; import static org.apache.geode.cache.RegionShortcut.PARTITION_OVERFLOW; @@ -30,18 +31,18 @@ import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.createIndex import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.getIndexQueue; import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.pauseSender; import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.verifyIndexFinishFlushing; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; -import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import junitparams.JUnitParamsRunner; import junitparams.Parameters; -import org.awaitility.Awaitility; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -228,13 +229,7 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra String defaultField, int size) throws Exception { LuceneQuery query = luceneService.createLuceneQueryFactory().create(indexName, regionName, queryString, defaultField); - Awaitility.await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> { - try { - assertEquals(size, query.findPages().size()); - } catch (LuceneQueryException e) { - throw new RuntimeException(e); - } - }); + await().atMost(60, SECONDS).untilAsserted(() -> assertThat(query.findPages()).hasSize(size)); } private void verifyInternalRegions(Consumer<LocalRegion> verify) { diff --git a/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java index d8fd74b..33f69e1 100644 --- a/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java +++ b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java @@ -358,16 +358,11 @@ public abstract class LuceneSearchWithRollingUpgradeDUnit extends JUnit4Distribu private void waitForRegionToHaveExpectedSize(String regionName, int expectedRegionSize) { Awaitility.await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> { - try { - Object region = - cache.getClass().getMethod("getRegion", String.class).invoke(cache, regionName); - int regionSize = (int) region.getClass().getMethod("size").invoke(region); - assertEquals("Region size not as expected after 60 seconds", expectedRegionSize, - regionSize); - } catch (Exception e) { - throw new RuntimeException(); - } - + Object region = + cache.getClass().getMethod("getRegion", String.class).invoke(cache, regionName); + int regionSize = (int) region.getClass().getMethod("size").invoke(region); + assertEquals("Region size not as expected after 60 seconds", expectedRegionSize, + regionSize); }); }