Change x-death header assertions for 3.13+

x-death is not appended to the values already
present in a newly published message. Only the broker
can append values to this header.

(cherry picked from commit 1cc206b)

Author: acogoluegnes

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

@@ -353,4 +353,6 @@ protected boolean beforeMessageContainers() {
        return versionCompare(this.brokerVersion, "3.13.0") < 0;
     }
 
+
+
 }

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

@@ -410,7 +410,7 @@ public void handleDelivery(String consumerTag, Envelope envelope,
 
     @SuppressWarnings("unchecked")
     @Test public void republish() throws Exception {
-        if (TestUtils.atMost312(connection)) {
+        if (beforeMessageContainers()) {
             Map<String, Object> args = new HashMap<>();
             args.put("x-message-ttl", 100);
             declareQueue(TEST_QUEUE_NAME, DLX, null, args);

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

@@ -21,7 +21,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.client.test.TestUtils.BrokerVersion;
 import com.rabbitmq.client.test.TestUtils.BrokerVersionAtLeast;
 import java.io.IOException;
@@ -335,7 +334,7 @@ public void headersWithXRouting() throws Exception {
         channel.txCommit();
         assertNotNull(channel.basicGet(Q1, true));
 
-        if (TestUtils.atMost312(connection)) {
+        if (beforeMessageContainers()) {
             //returned 'mandatory' publish when message is routable on
             //publish but not on commit
             channel.basicPublish("", Q1, true, false, null, "mandatory2".getBytes());

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

@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 
-import com.rabbitmq.client.test.TestUtils;
 import org.junit.jupiter.api.Test;
 
 import com.rabbitmq.client.AMQP;
@@ -330,7 +329,7 @@ private long[] publishSelectAndGet(int n)
 
     @Test public void commitWithDeletedQueue()
             throws IOException, TimeoutException {
-        if (TestUtils.atMost312(connection)) {
+        if (beforeMessageContainers()) {
             txSelect();
             basicPublish();
             releaseResources();

src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java

@@ -173,23 +173,36 @@ private void cleanUpQueues(String... qs) throws IOException {
 
         assertTrue(latch.await(5, TimeUnit.SECONDS));
         List<Map<String, Object>> events = (List<Map<String, Object>>)cons.getHeaders().get("x-death");
-        assertEquals(6, events.size());
+        if (beforeMessageContainers()) {
+            assertEquals(6, events.size());
+        } else {
+            assertEquals(3, events.size());
+        }
 
         List<String> qs = new ArrayList<String>();
         for (Map<String, Object> evt : events) {
             qs.add(evt.get("queue").toString());
         }
         Collections.sort(qs);
-        assertEquals(Arrays.asList(qz, q1, q2,
-                                   "issues.rabbitmq-server-152.queue97",
-                                   "issues.rabbitmq-server-152.queue98",
-                                   "issues.rabbitmq-server-152.queue99"), qs);
+        if (beforeMessageContainers()) {
+            assertEquals(Arrays.asList(qz, q1, q2,
+                "issues.rabbitmq-server-152.queue97",
+                "issues.rabbitmq-server-152.queue98",
+                "issues.rabbitmq-server-152.queue99"), qs);
+        } else {
+            assertEquals(Arrays.asList(qz, q1, q2), qs);
+        }
+
         List<Long> cs = new ArrayList<Long>();
         for (Map<String, Object> evt : events) {
             cs.add((Long)evt.get("count"));
         }
         Collections.sort(cs);
-        assertEquals(Arrays.asList(1L, 1L, 4L, 4L, 9L, 12L), cs);
+        if (beforeMessageContainers()) {
+            assertEquals(Arrays.asList(1L, 1L, 4L, 4L, 9L, 12L), cs);
+        } else {
+            assertEquals(Arrays.asList(1L, 1L, 9L), cs);
+        }
 
         cleanUpExchanges(x1, x2);
         cleanUpQueues(q1, q2, qz,