Skip to content

Commit 5d3ec25

Browse files
committed
Test SQL filter expressions against RabbitMQ 4.2
1 parent d576d94 commit 5d3ec25

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.github/workflows/test-pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
cache: 'maven'
2525
- name: Start broker
2626
run: ci/start-broker.sh
27-
env:
28-
RABBITMQ_IMAGE: pivotalrabbitmq/rabbitmq:pr-14110-otp27
2927
- name: Start toxiproxy
3028
run: ci/start-toxiproxy.sh
3129
- name: Display Java version

src/main/java/com/rabbitmq/client/amqp/impl/Utils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ static boolean supportSetToken(String brokerVersion) {
263263
}
264264

265265
static boolean supportSqlFilterExpressions(String brokerVersion) {
266-
// TODO should be 4.2
267-
return is4_1_OrMore(brokerVersion);
266+
return is4_2_OrMore(brokerVersion);
268267
}
269268

270269
static final class ObservationConnectionInfo implements ObservationCollector.ConnectionInfo {

src/test/java/com/rabbitmq/client/amqp/impl/SourceFiltersTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static com.rabbitmq.client.amqp.Management.QueueType.STREAM;
2222
import static com.rabbitmq.client.amqp.impl.Assertions.assertThat;
2323
import static com.rabbitmq.client.amqp.impl.TestConditions.BrokerVersion.RABBITMQ_4_1_0;
24+
import static com.rabbitmq.client.amqp.impl.TestConditions.BrokerVersion.RABBITMQ_4_2_0;
2425
import static com.rabbitmq.client.amqp.impl.TestUtils.sync;
2526
import static com.rabbitmq.client.amqp.impl.TestUtils.waitUntilStable;
2627
import static java.nio.charset.StandardCharsets.*;
@@ -471,8 +472,7 @@ void filterExpressionStringModifier() {
471472
}
472473

473474
@Test
474-
// TODO should be 4.2
475-
@BrokerVersionAtLeast(RABBITMQ_4_1_0)
475+
@BrokerVersionAtLeast(RABBITMQ_4_2_0)
476476
void sqlFilterExpressionsShouldFilterMessages() {
477477
publish(1, m -> m.subject("abc 123"));
478478
publish(1, m -> m.subject("foo bar"));
@@ -486,8 +486,7 @@ void sqlFilterExpressionsShouldFilterMessages() {
486486
}
487487

488488
@Test
489-
// TODO should be 4.2
490-
@BrokerVersionAtLeast(RABBITMQ_4_1_0)
489+
@BrokerVersionAtLeast(RABBITMQ_4_2_0)
491490
void incorrectFilterShouldThrowException() {
492491
assertThatThrownBy(
493492
() ->

0 commit comments

Comments
 (0)