Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 60520 invoked from network); 29 Oct 2007 16:59:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Oct 2007 16:59:19 -0000 Received: (qmail 7283 invoked by uid 500); 29 Oct 2007 16:59:07 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 7262 invoked by uid 500); 29 Oct 2007 16:59:07 -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 7251 invoked by uid 99); 29 Oct 2007 16:59:07 -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:59:07 -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:59:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFEDB1A983A; Mon, 29 Oct 2007 09:58:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r589741 - /harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java Date: Mon, 29 Oct 2007 16:58:58 -0000 To: commits@harmony.apache.org From: odeakin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071029165858.CFEDB1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: odeakin Date: Mon Oct 29 09:58:57 2007 New Revision: 589741 URL: http://svn.apache.org/viewvc?rev=589741&view=rev Log: Let JUnit deal with unexpected Exceptions rather than catching them ourselves - rmi module. Modified: harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java Modified: harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java?rev=589741&r1=589740&r2=589741&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java Mon Oct 29 09:58:57 2007 @@ -106,33 +106,25 @@ Object obj = null; // 1-st get: thread context classloader is equal to system classloader - try { - obj = mo.get(); + obj = mo.get(); - if (obj.getClass().getClassLoader() != old_cl) { - fail("1-st get failed: loaded through: " - + obj.getClass().getClassLoader() + ", expected: " + old_cl); + if (obj.getClass().getClassLoader() != old_cl) { + fail("1-st get failed: loaded through: " + + obj.getClass().getClassLoader() + ", expected: " + old_cl); } else { System.out.println("1-st get passed."); } - } catch (Exception ex) { - fail("1-st get failed: " + ex); - } // 2-nd get: thread context classloader is equal to null Thread.currentThread().setContextClassLoader(null); - try { - obj = mo.get(); + obj = mo.get(); - if (obj.getClass().getClassLoader() != old_cl) { - fail("2-nd get failed: loaded through: " - + obj.getClass().getClassLoader() + ", expected: " + old_cl); - } else { - System.out.println("2-nd get passed."); - } - } catch (Exception ex) { - fail("2-nd get failed: " + ex); + if (obj.getClass().getClassLoader() != old_cl) { + fail("2-nd get failed: loaded through: " + + obj.getClass().getClassLoader() + ", expected: " + old_cl); + } else { + System.out.println("2-nd get passed."); } } finally { // restore thread context classloader