Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Received: (qmail 13025 invoked from network); 26 Oct 2009 20:37:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Oct 2009 20:37:40 -0000 Received: (qmail 18146 invoked by uid 500); 26 Oct 2009 20:37:40 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 18128 invoked by uid 500); 26 Oct 2009 20:37:40 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 18119 invoked by uid 99); 26 Oct 2009 20:37:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2009 20:37:40 +0000 X-ASF-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2009 20:37:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D2AD0238889C; Mon, 26 Oct 2009 20:37:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r829943 - in /incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth: authorize/JDBCGroupDatabaseTest.java user/XMLUserDatabaseTest.java Date: Mon, 26 Oct 2009 20:37:17 -0000 To: jspwiki-commits@incubator.apache.org From: jalkanen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091026203717.D2AD0238889C@eris.apache.org> Author: jalkanen Date: Mon Oct 26 20:37:17 2009 New Revision: 829943 URL: http://svn.apache.org/viewvc?rev=829943&view=rev Log: Fixed to call shutdown() properly in case either tearDown() or setUp() fail. Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=829943&r1=829942&r2=829943&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java Mon Oct 26 20:37:17 2009 @@ -85,6 +85,7 @@ "please make sure that you have started your database "+ "(e.g. by running ant hsql-start)"); + m_engine.shutdown(); throw (SQLException) e.fillInStackTrace(); } @@ -95,12 +96,17 @@ public void tearDown() throws Exception { - if ( m_conn != null ) + try + { + if ( m_conn != null ) + { + m_conn.close(); + } + } + finally { - m_conn.close(); + m_engine.shutdown(); } - - m_engine.shutdown(); } public void testDelete() throws WikiException Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=829943&r1=829942&r2=829943&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java Mon Oct 26 20:37:17 2009 @@ -64,9 +64,16 @@ protected void tearDown() throws Exception { - assertEquals( 8, m_db.getWikiNames().length ); - super.tearDown(); - m_engine.shutdown(); + try + { + // If this fails, shutdown() is never called unless it's wrapped in a finally block. + assertEquals( 8, m_db.getWikiNames().length ); + } + finally + { + super.tearDown(); + m_engine.shutdown(); + } } public void testDeleteByLoginName() throws WikiSecurityException