You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/23 09:40:07 UTC
[camel] 01/02: Minor fixes and improvements to the camel-atomix
test code: (#4499)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0616e89288b266ce3a11ca50dabc5ff1e2511002
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Fri Oct 23 10:57:44 2020 +0200
Minor fixes and improvements to the camel-atomix test code: (#4499)
- prevent NPEs from hiding other test errors/failures
- added a note about required adjustments necessary for running the tests
- removed calls to deprecated clearAll method on test code
---
components/camel-atomix/README.md | 7 +++
.../atomix/client/map/AtomixMapConsumerTest.java | 4 +-
.../client/map/AtomixMapNodesProducerTest.java | 6 ++-
.../atomix/client/map/AtomixMapProducerTest.java | 52 +++++++++++-----------
.../client/messaging/AtomixMessagingTest.java | 6 +--
.../multimap/AtomixMultiMapProducerTest.java | 44 +++++++++---------
.../client/queue/AtomixQueueConsumerTest.java | 4 +-
.../client/queue/AtomixQueueProducerTest.java | 30 +++++++------
.../atomix/client/set/AtomixSetConsumerTest.java | 4 +-
.../atomix/client/set/AtomixSetProducerTest.java | 24 +++++-----
.../client/value/AtomixValueConsumerTest.java | 4 +-
.../client/value/AtomixValueProducerTest.java | 12 ++---
12 files changed, 111 insertions(+), 86 deletions(-)
diff --git a/components/camel-atomix/README.md b/components/camel-atomix/README.md
new file mode 100644
index 0000000..14a60df
--- /dev/null
+++ b/components/camel-atomix/README.md
@@ -0,0 +1,7 @@
+# Camel Atomix
+
+# Running the tests
+
+Running the tests for this component may require adjustments to the maximum number of open files. Some modern systems
+may set the limit of open files to 4096, which is not sufficient to run these tests. Ideally, a limit of at least 8192
+is recommended. Consult your OS documentation for details about how to correctly adjust this parameter.
\ No newline at end of file
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
index 59cb19d..dfafdaf 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
@@ -59,7 +59,9 @@ public class AtomixMapConsumerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- map.close();
+ if (map != null) {
+ map.close();
+ }
super.tearDown();
}
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
index b19cbe5..89a2dbe 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
@@ -62,7 +62,9 @@ public class AtomixMapNodesProducerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- map.close();
+ if (map != null) {
+ map.close();
+ }
super.tearDown();
}
@@ -78,7 +80,7 @@ public class AtomixMapNodesProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.PUT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val)
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
index 15b9740..ea4c121 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
@@ -70,7 +70,9 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- map.close();
+ if (map != null) {
+ map.close();
+ }
super.tearDown();
}
@@ -86,7 +88,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.PUT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val)
@@ -105,7 +107,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.PUT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key1)
.withHeader(AtomixClientConstants.RESOURCE_TTL, "1s")
@@ -116,7 +118,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
assertEquals(val, result.getBody());
assertEquals(val, map.get(key1).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.PUT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key2)
.withHeader(AtomixClientConstants.RESOURCE_TTL, "0.250s")
@@ -145,7 +147,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.PUT_IF_ABSENT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val1)
@@ -155,7 +157,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
assertEquals(val1, result.getBody());
assertEquals(val1, map.get(key).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.PUT_IF_ABSENT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val2)
@@ -173,7 +175,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.GET)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.request(Message.class);
@@ -183,7 +185,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.GET)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.request(Message.class);
@@ -200,7 +202,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.SIZE)
.request(Message.class);
@@ -210,7 +212,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.SIZE)
.request(Message.class);
@@ -218,7 +220,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
assertEquals(1, result.getBody(Integer.class).intValue());
assertEquals(map.size().join(), result.getBody(Integer.class));
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.IS_EMPTY)
.request(Message.class);
@@ -226,14 +228,14 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
assertFalse(result.getBody(Boolean.class));
assertFalse(map.isEmpty().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.CLEAR)
.request(Message.class);
assertFalse(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(0, map.size().join().intValue());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.IS_EMPTY)
.request(Message.class);
@@ -249,7 +251,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.CONTAINS_KEY)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val)
@@ -261,7 +263,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.CONTAINS_KEY)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val)
@@ -279,7 +281,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.CONTAINS_VALUE)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val)
.request(Message.class);
@@ -290,7 +292,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.CONTAINS_VALUE)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val)
.request(Message.class);
@@ -309,7 +311,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, context().getUuidGenerator().generateUuid())
@@ -319,7 +321,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
assertFalse(result.getBody(Boolean.class));
assertTrue(map.containsKey(key).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val)
@@ -331,7 +333,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.request(Message.class);
@@ -351,7 +353,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.REPLACE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withHeader(AtomixClientConstants.RESOURCE_OLD_VALUE, context().getUuidGenerator().generateUuid())
@@ -362,7 +364,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
assertFalse(result.getBody(Boolean.class));
assertEquals(oldVal, map.get(key).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.REPLACE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withHeader(AtomixClientConstants.RESOURCE_OLD_VALUE, oldVal)
@@ -375,7 +377,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(key, oldVal).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.REPLACE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(newVal)
@@ -392,7 +394,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
- Message result = fluent.clearAll()
+ Message result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.VALUES)
.request(Message.class);
@@ -406,7 +408,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
- Message result = fluent.clearAll()
+ Message result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMap.Action.ENTRY_SET)
.request(Message.class);
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
index 2ad4903..0412b3f 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
@@ -60,15 +60,13 @@ public class AtomixMessagingTest extends AtomixClientTestSupport {
mock2.expectedMessageCount(1);
mock2.expectedBodiesReceived("broadcast-message");
- template.clearAll()
- .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMessaging.Action.DIRECT)
+ template.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMessaging.Action.DIRECT)
.withHeader(AtomixClientConstants.MEMBER_NAME, "member-1")
.withHeader(AtomixClientConstants.CHANNEL_NAME, "channel")
.withBody("direct-message")
.send();
- template.clearAll()
- .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMessaging.Action.BROADCAST)
+ template.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMessaging.Action.BROADCAST)
.withHeader(AtomixClientConstants.CHANNEL_NAME, "channel")
.withBody("direct-message")
.send();
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
index f63a741..cbf5025 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
@@ -68,7 +68,9 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- map.close();
+ if (map != null) {
+ map.close();
+ }
super.tearDown();
}
@@ -85,7 +87,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.PUT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val1)
@@ -95,7 +97,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
assertTrue(result.getBody(Boolean.class));
assertEquals(Arrays.asList(val1), map.get(key).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.PUT)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val2)
@@ -113,7 +115,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.GET)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.request(Message.class);
@@ -124,7 +126,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.GET)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.request(Message.class);
@@ -141,7 +143,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.SIZE)
.request(Message.class);
@@ -153,14 +155,14 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
map.put(key1, context().getUuidGenerator().generateUuid()).join();
map.put(key2, context().getUuidGenerator().generateUuid()).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.SIZE)
.request(Message.class);
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(map.size().join(), result.getBody(Integer.class));
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.SIZE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key1)
.request(Message.class);
@@ -168,7 +170,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(map.size(key1).join(), result.getBody(Integer.class));
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.IS_EMPTY)
.request(Message.class);
@@ -176,14 +178,14 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
assertFalse(result.getBody(Boolean.class));
assertFalse(map.isEmpty().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.CLEAR)
.request(Message.class);
assertFalse(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(0, map.size().join().intValue());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.IS_EMPTY)
.request(Message.class);
@@ -199,7 +201,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.CONTAINS_KEY)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val)
@@ -211,7 +213,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
map.put(key, val).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.CONTAINS_KEY)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withBody(val)
@@ -230,7 +232,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
//
// Message result;
//
- // result = fluent.clearAll()
+ // result = fluent
// .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixClientMultiMapAction.CONTAINS_VALUE)
// .withHeader(AtomixClientConstants.RESOURCE_VALUE, val1)
// .request(Message.class);
@@ -242,7 +244,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
// map.put(key, val1).join();
// map.put(key, val2).join();
//
- // result = fluent.clearAll()
+ // result = fluent
// .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixClientMultiMapAction.CONTAINS_VALUE)
// .withHeader(AtomixClientConstants.RESOURCE_VALUE, val1)
// .request(Message.class);
@@ -251,7 +253,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
// assertTrue(result.getBody(Boolean.class));
// assertTrue(map.containsValue(val1).join());
//
- // result = fluent.clearAll()
+ // result = fluent
// .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixClientMultiMapAction.CONTAINS_VALUE)
// .withHeader(AtomixClientConstants.RESOURCE_VALUE, val2)
// .request(Message.class);
@@ -272,7 +274,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
//
// Message result;
//
- // result = fluent.clearAll()
+ // result = fluent
// .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixClientMultiMapAction.CONTAINS_ENTRY)
// .withHeader(AtomixClientConstants.RESOURCE_KEY, key)
// .withHeader(AtomixClientConstants.RESOURCE_VALUE, val1)
@@ -282,7 +284,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
// assertTrue(result.getBody(Boolean.class));
// assertTrue(map.containsEntry(key, val1).join());
//
- // result = fluent.clearAll()
+ // result = fluent
// .withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixClientMultiMapAction.CONTAINS_ENTRY)
// .withHeader(AtomixClientConstants.RESOURCE_KEY, key)
// .withHeader(AtomixClientConstants.RESOURCE_VALUE, val2)
@@ -307,7 +309,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val1)
@@ -316,7 +318,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(Arrays.asList(val2, val3), map.get(key).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.REMOVE_VALUE)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val2)
.request(Message.class);
@@ -325,7 +327,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
assertEquals(Arrays.asList(val3), map.get(key).join());
assertTrue(map.containsKey(key).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixMultiMap.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_KEY, key)
.request(Message.class);
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
index 91cb9fb..35ae2d8 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
@@ -57,7 +57,9 @@ public class AtomixQueueConsumerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- queue.close();
+ if (queue != null) {
+ queue.close();
+ }
super.tearDown();
}
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
index 62503f0..cba373c 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
@@ -65,7 +65,9 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- queue.close();
+ if (queue != null) {
+ queue.close();
+ }
super.tearDown();
}
@@ -81,7 +83,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.ADD)
.withBody(val1)
.request(Message.class);
@@ -89,7 +91,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertTrue(queue.contains(val1).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.ADD)
.withBody(val2)
.request(Message.class);
@@ -104,7 +106,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.OFFER)
.withBody(val)
.request(Message.class);
@@ -112,7 +114,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertTrue(queue.contains(val).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.PEEK)
.request(Message.class);
@@ -120,7 +122,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
assertTrue(queue.contains(val).join());
assertEquals(val, result.getBody());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.POLL)
.request(Message.class);
@@ -136,7 +138,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.SIZE)
.request(Message.class);
@@ -147,14 +149,14 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
queue.add(val1).join();
queue.add(val2).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.SIZE)
.request(Message.class);
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(queue.size().join(), result.getBody(Integer.class));
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.IS_EMPTY)
.request(Message.class);
@@ -162,14 +164,14 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
assertFalse(result.getBody(Boolean.class));
assertFalse(queue.isEmpty().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.CLEAR)
.request(Message.class);
assertFalse(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(0, queue.size().join().intValue());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.IS_EMPTY)
.request(Message.class);
@@ -184,7 +186,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.CONTAINS)
.withBody(val)
.request(Message.class);
@@ -195,7 +197,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
queue.add(val);
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.CONTAINS)
.withBody(val)
.request(Message.class);
@@ -215,7 +217,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixQueue.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val1)
.request(Message.class);
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
index ac65379..3b8b030 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
@@ -57,7 +57,9 @@ public class AtomixSetConsumerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- set.close();
+ if (set != null) {
+ set.close();
+ }
super.tearDown();
}
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
index 044e26d..9311642 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
@@ -65,7 +65,9 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- set.close();
+ if (set != null) {
+ set.close();
+ }
super.tearDown();
}
@@ -81,7 +83,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.ADD)
.withBody(val1)
.request(Message.class);
@@ -89,7 +91,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertTrue(set.contains(val1).join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.ADD)
.withBody(val2)
.request(Message.class);
@@ -105,7 +107,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.SIZE)
.request(Message.class);
@@ -116,14 +118,14 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
set.add(val1).join();
set.add(val2).join();
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.SIZE)
.request(Message.class);
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(set.size().join(), result.getBody(Integer.class));
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.IS_EMPTY)
.request(Message.class);
@@ -131,14 +133,14 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
assertFalse(result.getBody(Boolean.class));
assertFalse(set.isEmpty().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.CLEAR)
.request(Message.class);
assertFalse(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(0, set.size().join().intValue());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.IS_EMPTY)
.request(Message.class);
@@ -153,7 +155,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.CONTAINS)
.withBody(val)
.request(Message.class);
@@ -164,7 +166,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
set.add(val);
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.CONTAINS)
.withBody(val)
.request(Message.class);
@@ -184,7 +186,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixSet.Action.REMOVE)
.withHeader(AtomixClientConstants.RESOURCE_VALUE, val1)
.request(Message.class);
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
index 6fbd0dc..12a1b13 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
@@ -56,7 +56,9 @@ public class AtomixValueConsumerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- value.close();
+ if (value != null) {
+ value.close();
+ }
super.tearDown();
}
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
index 3b197dc..de001a5 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
@@ -65,7 +65,9 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
@Override
@AfterEach
public void tearDown() throws Exception {
- value.close();
+ if (value != null) {
+ value.close();
+ }
super.tearDown();
}
@@ -81,7 +83,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
Message result;
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixValue.Action.SET)
.withBody(val1)
.request(Message.class);
@@ -89,7 +91,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
assertFalse(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(val1, value.get().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixValue.Action.COMPARE_AND_SET)
.withHeader(AtomixClientConstants.RESOURCE_OLD_VALUE, val1)
.withBody(val2)
@@ -98,7 +100,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
assertTrue(result.getHeader(AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT, Boolean.class));
assertEquals(val2, value.get().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixValue.Action.GET)
.request(Message.class);
@@ -106,7 +108,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
assertEquals(val2, result.getBody());
assertEquals(val2, value.get().join());
- result = fluent.clearAll()
+ result = fluent
.withHeader(AtomixClientConstants.RESOURCE_ACTION, AtomixValue.Action.GET_AND_SET)
.withBody(val1)
.request(Message.class);