Do not check for CC deletion for RabbitMQ 3.13+

After message container merge, when a message is dead-lettered
with a routing key.

(cherry picked from commit 1f3f444)

Author: acogoluegnes

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

@@ -28,10 +28,13 @@
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 
+import static com.rabbitmq.client.test.TestUtils.currentVersion;
+import static com.rabbitmq.client.test.TestUtils.versionCompare;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class BrokerTestCase {
 
+    private String brokerVersion;
     private boolean ha = false;
 
     protected volatile TestInfo testInfo;
@@ -65,6 +68,7 @@ public void setUp(TestInfo testInfo) throws IOException, TimeoutException {
         Assumptions.assumeTrue(shouldRun());
         this.testInfo = testInfo;
         openConnection();
+        this.brokerVersion = currentVersion(this.connection.getServerProperties().get("version").toString());
         openChannel();
 
         createResources();
@@ -343,4 +347,8 @@ protected boolean ha() {
         return this.ha;
     }
 
+    protected boolean beforeMessageContainers() {
+       return versionCompare(this.brokerVersion, "3.13.0") < 0;
+    }
+
 }

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

@@ -141,7 +141,7 @@ private static boolean atLeastVersion(String expectedVersion, String currentVers
         }
     }
 
-    private static String currentVersion(String currentVersion) {
+    static String currentVersion(String currentVersion) {
         // versions built from source: 3.7.0+rc.1.4.gedc5d96
         if (currentVersion.contains("+")) {
             currentVersion = currentVersion.substring(0, currentVersion.indexOf("+"));

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

@@ -394,7 +394,9 @@ public void handleDelivery(String consumerTag, Envelope envelope,
         consumeN(DLQ2, MSG_COUNT, getResponse -> {
             Map<String, Object> headers1 = getResponse.getProps().getHeaders();
             assertNotNull(headers1);
-            assertNull(headers1.get("CC"));
+            if (beforeMessageContainers()) {
+                assertNull(headers1.get("CC"));
+            }
             assertNull(headers1.get("BCC"));
 
             ArrayList<Object> death = (ArrayList<Object>) headers1.get("x-death");