More exception handling testing

Author: acogoluegnes

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

@@ -91,8 +91,6 @@ static AmqpException convert(ClientException e, String format, Object... args) {
           ((ClientConnectionRemotelyClosedException) e).getErrorCondition();
       if (isNetworkError(e) || !isUnauthorizedAccess(errorCondition)) {
         return new AmqpException.AmqpConnectionException(e.getMessage(), e);
-      } else if (e.getCause() instanceof SSLException) {
-        return new AmqpException.AmqpSecurityException(e.getCause());
       } else {
         return new AmqpException(e.getMessage(), e);
       }

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

@@ -21,7 +21,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.rabbitmq.client.amqp.AmqpException;
+import javax.net.ssl.SSLException;
 import org.apache.qpid.protonj2.client.ErrorCondition;
+import org.apache.qpid.protonj2.client.exceptions.ClientConnectionRemotelyClosedException;
+import org.apache.qpid.protonj2.client.exceptions.ClientException;
 import org.apache.qpid.protonj2.client.exceptions.ClientLinkRemotelyClosedException;
 import org.apache.qpid.protonj2.client.exceptions.ClientSessionRemotelyClosedException;
 import org.junit.jupiter.api.Test;
@@ -48,6 +51,19 @@ void convertTest() {
         .isInstanceOf(AmqpException.AmqpEntityDoesNotExistException.class);
     assertThat(convert(new ClientLinkRemotelyClosedException("")))
         .isInstanceOf(AmqpException.AmqpResourceClosedException.class);
+    assertThat(convert(new ClientConnectionRemotelyClosedException("connection reset")))
+        .isInstanceOf(AmqpException.AmqpConnectionException.class);
+    assertThat(convert(new ClientConnectionRemotelyClosedException("connection refused")))
+        .isInstanceOf(AmqpException.AmqpConnectionException.class);
+    assertThat(convert(new ClientConnectionRemotelyClosedException("", new RuntimeException())))
+        .isInstanceOf(AmqpException.AmqpConnectionException.class)
+        .hasCauseInstanceOf(ClientConnectionRemotelyClosedException.class);
+    assertThat(convert(new ClientConnectionRemotelyClosedException("", new SSLException(""))))
+        .isInstanceOf(AmqpException.AmqpSecurityException.class)
+        .hasCauseInstanceOf(SSLException.class);
+    assertThat(convert(new ClientException("")))
+        .isInstanceOf(AmqpException.class)
+        .hasCauseInstanceOf(ClientException.class);
   }
 
   ErrorCondition errorCondition(String condition) {