Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ void testSharedConnectionIncomingUsesEventLoopContext() throws InterruptedExcept
await().until(() -> isRabbitMQConnectorAvailable(container));

IncomingContextBean bean = get(container, IncomingContextBean.class);
await().atMost(1, TimeUnit.MINUTES).untilAsserted(() -> {
await().untilAsserted(() -> {
JsonArray connections = usage.getConnections();
assertThat(connections).isNotNull();

Expand All @@ -317,7 +317,7 @@ void testSharedConnectionIncomingUsesEventLoopContext() throws InterruptedExcept

usage.produce(exchangeName, queueName, routingKey, 1, () -> 1);

assertThat(bean.awaitMessage(1, TimeUnit.MINUTES)).isTrue();
assertThat(bean.awaitMessage(10, TimeUnit.SECONDS)).isTrue();
assertThat(bean.getMessageContext()).isNotNull();
assertThat(bean.isEventLoopContext()).isTrue();
}
Expand Down Expand Up @@ -356,7 +356,7 @@ void testSharedConnectionNameIsNotSuffixed() {
container = weld.initialize();
await().until(() -> isRabbitMQConnectorAvailable(container));

await().atMost(1, TimeUnit.MINUTES).untilAsserted(() -> {
await().untilAsserted(() -> {
JsonArray connections = usage.getConnections();
assertThat(connections).isNotNull();

Expand Down Expand Up @@ -395,7 +395,7 @@ void testDefaultConnectionNameIncludesDirection() {
container = weld.initialize();
await().until(() -> isRabbitMQConnectorAvailable(container));

await().atMost(1, TimeUnit.MINUTES).untilAsserted(() -> {
await().untilAsserted(() -> {
JsonArray connections = usage.getConnections();
assertThat(connections).isNotNull();

Expand Down Expand Up @@ -882,7 +882,7 @@ void testReceivingMessagesFromRabbitMQ() {
AtomicInteger counter = new AtomicInteger();
usage.produceTenIntegers(exchangeName, queueName, routingKey, counter::getAndIncrement);

await().atMost(1, TimeUnit.MINUTES).until(() -> list.size() >= 10);
await().until(() -> list.size() >= 10);
assertThat(list).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
}

Expand Down Expand Up @@ -921,7 +921,7 @@ void testReceivingMessagesFromRabbitMQWithInvalidContentType() {

AtomicInteger counter = new AtomicInteger();
usage.produce(exchangeName, queueName, routingKey, 10, counter::getAndIncrement, "application/invalid");
await().atMost(1, TimeUnit.MINUTES).until(() -> list.size() >= 10);
await().until(() -> list.size() >= 10);
assertThat(bean.getTypeCasts()).isEqualTo(10);
assertThat(list).containsOnly(0);
}
Expand Down Expand Up @@ -962,7 +962,7 @@ void testReceivingMessagesFromRabbitMQWithOverriddenContentType() {

AtomicInteger counter = new AtomicInteger();
usage.produce(exchangeName, queueName, routingKey, 10, counter::getAndIncrement, "application/invalid");
await().atMost(1, TimeUnit.MINUTES).until(() -> list.size() >= 10);
await().until(() -> list.size() >= 10);
assertThat(bean.getTypeCasts()).isEqualTo(0);
assertThat(list).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
}
Expand Down Expand Up @@ -1001,7 +1001,7 @@ void testDefaultExchangeName() {

AtomicInteger counter = new AtomicInteger();
usage.produce("", queueName, queueName, 10, counter::getAndIncrement, "application/invalid");
await().atMost(1, TimeUnit.MINUTES).until(() -> list.size() >= 10);
await().until(() -> list.size() >= 10);
assertThat(bean.getTypeCasts()).isEqualTo(0);
assertThat(list).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
}
Expand Down Expand Up @@ -1064,7 +1064,7 @@ void testNackWithRejectAndRequeue() {
AtomicInteger counter = new AtomicInteger();
usage.produceTenIntegers(exchangeName, queueName, routingKey, counter::getAndIncrement);

await().atMost(1, TimeUnit.MINUTES).untilAsserted(() -> {
await().untilAsserted(() -> {
assertThat(list)
.hasSizeGreaterThanOrEqualTo(30)
.containsExactlyInAnyOrder(
Expand Down Expand Up @@ -1111,7 +1111,7 @@ void testConsumerArguments() {

AtomicInteger counter = new AtomicInteger();
usage.produceTenIntegers(exchangeName, queueName, routingKey, counter::getAndIncrement);
await().atMost(1, TimeUnit.MINUTES).until(() -> list.size() >= 10);
await().until(() -> list.size() >= 10);
assertThat(bean.getTypeCasts()).isEqualTo(0);
assertThat(list).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
await().untilAsserted(() -> {
Expand Down Expand Up @@ -1159,21 +1159,28 @@ void testSharedConnectionMultipleIncomingChannelsGetDistinctContexts() throws In

SmallRyeConfigTestUtil.installConfig();
container = weld.initialize();
await().atMost(1, TimeUnit.MINUTES).until(() -> isRabbitMQConnectorAvailable(container));
await().until(() -> isRabbitMQConnectorAvailable(container));

DualIncomingContextBean bean = get(container, DualIncomingContextBean.class);

await().until(() -> {
JsonObject queue1 = usage.getQueue(queueName);
JsonObject queue2 = usage.getQueue(queueName2);
return queue1 != null && queue1.getInteger("consumers", 0) > 0
&& queue2 != null && queue2.getInteger("consumers", 0) > 0;
});

usage.produce(exchangeName, queueName, routingKey1, 1, () -> 1);
usage.produce(exchangeName, queueName2, routingKey2, 1, () -> 2);

assertThat(bean.awaitMessages(1, TimeUnit.MINUTES)).isTrue();
assertThat(bean.awaitMessages(10, TimeUnit.SECONDS)).isTrue();

assertThat(bean.isEventLoop1()).isTrue();
assertThat(bean.isEventLoop2()).isTrue();
assertThat(bean.getContext1()).isNotSameAs(bean.getContext2());

// Verify single shared connection
await().atMost(1, TimeUnit.MINUTES).untilAsserted(() -> {
await().untilAsserted(() -> {
JsonArray connections = usage.getConnections();
assertThat(connections).isNotNull();

Expand Down Expand Up @@ -1214,9 +1221,14 @@ void testNonSharedIncomingUsesEventLoopContext() throws InterruptedException {

IncomingContextBean bean = get(container, IncomingContextBean.class);

await().until(() -> {
JsonObject queue = usage.getQueue(queueName);
return queue != null && queue.getInteger("consumers", 0) > 0;
});

usage.produce(exchangeName, queueName, routingKey, 1, () -> 1);

assertThat(bean.awaitMessage(1, TimeUnit.MINUTES)).isTrue();
assertThat(bean.awaitMessage(10, TimeUnit.SECONDS)).isTrue();
assertThat(bean.getMessageContext()).isNotNull();
assertThat(bean.isEventLoopContext()).isTrue();
}
Expand Down