Catch also shutdown exception

(cherry picked from commit 251c8c5)

Author: acogoluegnes

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2007-2023 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

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2007-2023 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
@@ -71,7 +71,6 @@ protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws
                         .builder()
                         .expiration(expiryDelay)
                         .build(), new byte[]{});
-        long expiryStartTime = System.currentTimeMillis();
         restart();
         Thread.sleep(Integer.parseInt(expiryDelay));
         try {

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

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
+import com.rabbitmq.client.ShutdownSignalException;
 import java.io.IOException;
 
 import org.junit.Test;
@@ -67,6 +68,8 @@ protected void releaseResources() throws IOException {
             fail("Should not be able to set TTL using non-numeric values");
         } catch (IOException e) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        } catch (ShutdownSignalException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
         }
     }
 
@@ -77,16 +80,20 @@ protected void releaseResources() throws IOException {
             fail("Should not be able to set TTL using non-numeric values");
         } catch (IOException e) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        } catch (ShutdownSignalException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
         }
     }
 
-    @Test public void tTLMustBePositive() throws Exception {
+    @Test public void tTLMustBePositive() {
         try {
             declareAndBindQueue(-10);
             publishAndSync(MSG[0]);
             fail("Should not be able to set TTL using negative values");
         } catch (IOException e) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        } catch (ShutdownSignalException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
         }
     }