Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 86A5F18D8A for ; Wed, 9 Dec 2015 12:38:05 +0000 (UTC) Received: (qmail 47079 invoked by uid 500); 9 Dec 2015 12:38:05 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 47030 invoked by uid 500); 9 Dec 2015 12:38:05 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 47012 invoked by uid 99); 9 Dec 2015 12:38:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Dec 2015 12:38:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39646E0B28; Wed, 9 Dec 2015 12:38:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Date: Wed, 09 Dec 2015 12:38:06 -0000 Message-Id: <8a3ec6b827094daab3fd26e05b2a7f3e@git.apache.org> In-Reply-To: <6e18fb21426d47808fae8f60d81ffee1@git.apache.org> References: <6e18fb21426d47808fae8f60d81ffee1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq git commit: with failover the reported exception may be wrapped by the failover listener with failover the reported exception may be wrapped by the failover listener Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9c4ef26d Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9c4ef26d Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9c4ef26d Branch: refs/heads/master Commit: 9c4ef26d5ca27fb789e88980112598a31d178a4f Parents: 7a7c70a Author: gtully Authored: Wed Dec 9 11:26:58 2015 +0000 Committer: gtully Committed: Wed Dec 9 12:30:29 2015 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/ActiveMQSslConnectionFactoryTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/9c4ef26d/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java b/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java index cde7cb5..fb03532 100644 --- a/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java @@ -63,17 +63,17 @@ public class ActiveMQSslConnectionFactoryTest { executeTest(SSL_TRANSPORT, TRUST_STORE_RESOURCE_PREFIX + TRUST_STORE_FILE_NAME + ".dummy"); } - @Test(expected = ConnectException.class) + @Test(expected = IOException.class) public void validTrustStoreFileFailoverTest() throws Throwable { executeTest(FAILOVER_SSL_TRANSPORT, TRUST_STORE_DIRECTORY_NAME + TRUST_STORE_FILE_NAME); } - @Test(expected = ConnectException.class) + @Test(expected = IOException.class) public void validTrustStoreURLFailoverTest() throws Throwable { executeTest(FAILOVER_SSL_TRANSPORT, new File(TRUST_STORE_DIRECTORY_NAME + TRUST_STORE_FILE_NAME).toURI().toString()); } - @Test(expected = ConnectException.class) + @Test(expected = IOException.class) public void validTrustStoreResourceFailoverTest() throws Throwable { executeTest(FAILOVER_SSL_TRANSPORT, TRUST_STORE_RESOURCE_PREFIX + TRUST_STORE_FILE_NAME); }