Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 57131 invoked from network); 29 Oct 2007 16:54:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Oct 2007 16:54:46 -0000 Received: (qmail 1711 invoked by uid 500); 29 Oct 2007 16:54:34 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 1696 invoked by uid 500); 29 Oct 2007 16:54:34 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 1685 invoked by uid 99); 29 Oct 2007 16:54:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2007 09:54:34 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2007 16:54:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E51651A9832; Mon, 29 Oct 2007 09:54:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r589736 - in /harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex: Matcher2Test.java PatternErrorTest.java Date: Mon, 29 Oct 2007 16:54:22 -0000 To: commits@harmony.apache.org From: odeakin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071029165424.E51651A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: odeakin Date: Mon Oct 29 09:54:20 2007 New Revision: 589736 URL: http://svn.apache.org/viewvc?rev=589736&view=rev Log: Let JUnit deal with unexpected Exceptions rather than catching them ourselves - regex module. Modified: harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java Modified: harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java?rev=589736&r1=589735&r2=589736&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java (original) +++ harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java Mon Oct 29 09:54:20 2007 @@ -225,7 +225,7 @@ try { mat.replaceAll(substitutionString); fail("IndexOutOfBoundsException should be thrown"); - } catch (Exception e) { + } catch (IndexOutOfBoundsException e) { } } } Modified: harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java?rev=589736&r1=589735&r2=589736&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java Mon Oct 29 09:54:20 2007 @@ -59,8 +59,9 @@ Pattern.compile("foo",flags); } catch (IllegalArgumentException e) { // This is the expected exception - } catch (Exception e) { - fail(); + return; } + + fail("Expected IllegalArgumentException to be thrown"); } }