Add test condition to test x-match=all-with-x

Broker version >= 3.10.

References #725

(cherry picked from commit 0b7d8f0)

Conflicts:
	src/test/java/com/rabbitmq/client/test/TestUtils.java

Author: acogoluegnes

src/test/java/com/rabbitmq/client/test/TestUtils.java

@@ -19,6 +19,11 @@
 import com.rabbitmq.client.impl.NetworkConnection;
 import com.rabbitmq.client.impl.recovery.AutorecoveringConnection;
 import com.rabbitmq.tools.Host;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
 import org.assertj.core.api.Assertions;
 import org.junit.AssumptionViolatedException;
 import org.junit.rules.TestRule;
@@ -121,6 +126,10 @@ public static boolean isVersion38orLater(Connection connection) {
         return atLeastVersion("3.8.0", connection);
     }
 
+    public static boolean isVersion310orLater(Connection connection) {
+        return atLeastVersion("3.10.0", connection);
+    }
+
     private static boolean atLeastVersion(String expectedVersion, Connection connection) {
         String currentVersion = null;
         try {
@@ -364,4 +373,52 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
 
         return messageReceived;
     }
+
+    @Target({ElementType.METHOD})
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface TestExecutionCondition {
+
+        Class<? extends ExecutionCondition>[] value();
+
+    }
+
+    interface ExecutionCondition {
+
+        void check(Description description) throws Exception;
+
+    }
+
+    public static class BrokerAtLeast310Condition implements ExecutionCondition {
+
+        private static final String VERSION = "3.10.0";
+
+        @Override
+        public void check(Description description) throws Exception {
+            try (Connection c = TestUtils.connectionFactory().newConnection()) {
+                if (!TestUtils.atLeastVersion(VERSION, c)) {
+                    throw new AssumptionViolatedException("Broker version < " + VERSION + ", skipping.");
+                }
+            }
+        }
+    }
+
+    public static class ExecutionConditionRule implements TestRule {
+
+        @Override
+        public Statement apply(Statement base, Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    Method testMethod = description.getTestClass().getDeclaredMethod(description.getMethodName());
+                    TestExecutionCondition conditionAnnotation = testMethod.getAnnotation(
+                        TestExecutionCondition.class);
+                    if (conditionAnnotation != null) {
+                       conditionAnnotation.value()[0].getConstructor().newInstance()
+                           .check(description);
+                    }
+                    base.evaluate();
+                }
+            };
+        }
+    }
 }

src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2007-2022 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -17,6 +17,7 @@
 
 import static org.junit.Assert.fail;
 
+import com.rabbitmq.client.test.TestUtils;
 import java.io.IOException;
 import java.util.HashMap;
 
@@ -48,11 +49,13 @@ public class HeadersExchangeValidation extends BrokerTestCase {
         arguments.put("x-match", "any");
         succeedBind(queue, arguments);
 
-        arguments.put("x-match", "all-with-x");
-        succeedBind(queue, arguments);
+        if (TestUtils.isVersion310orLater(connection)) {
+            arguments.put("x-match", "all-with-x");
+            succeedBind(queue, arguments);
 
-        arguments.put("x-match", "any-with-x");
-        succeedBind(queue, arguments);
+            arguments.put("x-match", "any-with-x");
+            succeedBind(queue, arguments);
+        }
     }
 
     private void failBind(String queue, HashMap<String, Object> arguments) {

src/test/java/com/rabbitmq/client/test/functional/Routing.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2007-2022 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -21,13 +21,17 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
+import com.rabbitmq.client.test.TestUtils.BrokerAtLeast310Condition;
+import com.rabbitmq.client.test.TestUtils.ExecutionConditionRule;
+import com.rabbitmq.client.test.TestUtils.TestExecutionCondition;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
+import org.junit.Rule;
 import org.junit.Test;
 
 import com.rabbitmq.client.AMQP;
@@ -36,10 +40,13 @@
 import com.rabbitmq.client.ReturnListener;
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.utility.BlockingCell;
+import org.junit.rules.TestRule;
 
 public class Routing extends BrokerTestCase
 {
 
+    @Rule public TestRule executionConditionRule = new ExecutionConditionRule();
+
     protected final String E = "MRDQ";
     protected final String Q1 = "foo";
     protected final String Q2 = "bar";
@@ -245,7 +252,9 @@ private void checkGet(String queue, boolean messageExpected)
         checkGet(Q2, false);
     }
 
-    @Test public void headersWithXRouting() throws Exception {
+    @Test
+    @TestExecutionCondition(BrokerAtLeast310Condition.class)
+    public void headersWithXRouting() throws Exception {
         Map<String, Object> spec = new HashMap<String, Object>();
         spec.put("x-key-1", "value-1");
         spec.put("x-key-2", "value-2");