This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 55885369718 (chores) camel-infinispan: minor test cleanups
55885369718 is described below
commit 5588536971884d0ea9a8fb14dcbef75ffa7abf0a
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Thu Apr 11 14:58:41 2024 +0200
(chores) camel-infinispan: minor test cleanups
---
...panRemoteAggregationRepositoryOperationsIT.java | 31 ++++++++--------------
.../remote/InfinispanRemoteConfigurationIT.java | 18 ++++++-------
.../remote/InfinispanRemoteProducerIT.java | 4 +++
.../remote/InfinispanRemoteQueryConsumerIT.java | 5 ++++
4 files changed, 28 insertions(+), 30 deletions(-)
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
index 1b8157233bc..953e5041c81 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
@@ -16,11 +16,14 @@
*/
package org.apache.camel.component.infinispan.remote;
+import java.time.Duration;
import java.util.Set;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultExchangeHolder;
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -61,10 +64,16 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
return true;
}
- @Test
- public void testAdd() {
+ @BeforeEach
+ public void cleanup() {
// cleanup
aggregationRepository.getCache().clear();
+
+ Awaitility.await().atMost(Duration.ofSeconds(1)).until(() ->
cacheContainer.isStarted());
+ }
+
+ @Test
+ public void testAdd() {
// Given
String key = "Add";
assertFalse(exists(key));
@@ -77,8 +86,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testGetExists() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String key = "Get_Exists";
Exchange exchange = new DefaultExchange(context());
@@ -94,8 +101,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testGetNotExists() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String key = "Get_NotExists";
assertFalse(exists(key));
@@ -107,8 +112,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testRemoveExists() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String key = "Remove_Exists";
Exchange exchange = new DefaultExchange(context());
@@ -122,8 +125,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testRemoveNotExists() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String key = "RemoveNotExists";
Exchange exchange = new DefaultExchange(context());
@@ -136,8 +137,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testGetKeys() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String[] keys = { "GetKeys1", "GetKeys2" };
addExchanges(keys);
@@ -151,8 +150,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testConfirmExist() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
for (int i = 1; i < 4; i++) {
String key = "Confirm_" + i;
@@ -171,8 +168,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testConfirmNotExist() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String[] keys = new String[3];
for (int i = 1; i < 4; i++) {
@@ -202,8 +197,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testScan() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String[] keys = { "Scan1", "Scan2" };
addExchanges(keys);
@@ -217,8 +210,6 @@ public class
InfinispanRemoteAggregationRepositoryOperationsIT extends Infinispa
@Test
public void testRecover() {
- // cleanup
- aggregationRepository.getCache().clear();
// Given
String[] keys = { "Recover1", "Recover2" };
addExchanges(keys);
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
index 2da9bbd707f..4e3451a8794 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
@@ -36,14 +36,7 @@ public class InfinispanRemoteConfigurationIT {
@Test
public void remoteCacheWithoutProperties() throws Exception {
- InfinispanRemoteConfiguration configuration = new
InfinispanRemoteConfiguration();
- configuration.setHosts(service.host() + ":" + service.port());
- configuration.setSecure(true);
- configuration.setUsername(service.username());
- configuration.setPassword(service.password());
- configuration.setSecurityServerName("infinispan");
- configuration.setSaslMechanism("DIGEST-MD5");
- configuration.setSecurityRealm("default");
+ final InfinispanRemoteConfiguration configuration =
getBaseConfiguration();
if (SystemUtils.IS_OS_MAC) {
configuration.addConfigurationProperty(
"infinispan.client.hotrod.client_intelligence", "BASIC");
@@ -68,8 +61,7 @@ public class InfinispanRemoteConfigurationIT {
}
}
- @Test
- public void remoteCacheWithProperties() throws Exception {
+ private static InfinispanRemoteConfiguration getBaseConfiguration() {
InfinispanRemoteConfiguration configuration = new
InfinispanRemoteConfiguration();
configuration.setHosts(service.host() + ":" + service.port());
configuration.setSecure(true);
@@ -78,6 +70,12 @@ public class InfinispanRemoteConfigurationIT {
configuration.setSecurityServerName("infinispan");
configuration.setSaslMechanism("DIGEST-MD5");
configuration.setSecurityRealm("default");
+ return configuration;
+ }
+
+ @Test
+ public void remoteCacheWithProperties() throws Exception {
+ final InfinispanRemoteConfiguration configuration =
getBaseConfiguration();
if (SystemUtils.IS_OS_MAC) {
configuration.setConfigurationUri("infinispan/client-mac.properties");
} else {
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
index cdec42d279a..996e0f5cbb9 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.infinispan.remote;
+import java.time.Duration;
import java.util.function.BiFunction;
import org.apache.camel.BindToRegistry;
@@ -23,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.infinispan.InfinispanConstants;
import org.apache.camel.component.infinispan.InfinispanOperation;
import org.apache.camel.component.infinispan.InfinispanProducerTestSupport;
+import org.awaitility.Awaitility;
import org.infinispan.client.hotrod.ServerStatistics;
import org.infinispan.commons.api.BasicCache;
import org.junit.jupiter.api.BeforeEach;
@@ -74,6 +76,8 @@ public class InfinispanRemoteProducerIT extends
InfinispanRemoteTestSupport impl
protected void beforeEach() {
// cleanup the default test cache before each run
getCache().clear();
+
+ Awaitility.await().atMost(Duration.ofSeconds(1)).until(() ->
cacheContainer.isStarted());
}
@Override
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
index c3f57e4b6fd..c71fbce54a5 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
@@ -16,11 +16,14 @@
*/
package org.apache.camel.component.infinispan.remote;
+import java.time.Duration;
+
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.infinispan.InfinispanConstants;
import org.apache.camel.component.infinispan.InfinispanQueryBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.awaitility.Awaitility;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.client.hotrod.marshall.MarshallerUtil;
import org.infinispan.commons.api.BasicCache;
@@ -131,6 +134,8 @@ public class InfinispanRemoteQueryConsumerIT extends
InfinispanRemoteQueryTestSu
protected void beforeEach() {
// cleanup the default test cache before each run
getCache().clear();
+
+ Awaitility.await().atMost(Duration.ofSeconds(1)).until(() ->
cacheContainer.isStarted());
}
@Override
