Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 76789 invoked from network); 28 Sep 2006 14:44:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Sep 2006 14:44:42 -0000 Received: (qmail 62769 invoked by uid 500); 28 Sep 2006 14:44:41 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 62741 invoked by uid 500); 28 Sep 2006 14:44:41 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 62730 invoked by uid 99); 28 Sep 2006 14:44:41 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Sep 2006 07:44:41 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:53285] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 25/22-17533-8DFDB154 for ; Thu, 28 Sep 2006 07:44:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 160DB1A9820; Thu, 28 Sep 2006 07:44:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r450874 - in /incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans: XMLEncoderTest.java beancontext/BeanContextServicesSupportTest.java beancontext/BeanContextSupportTest.java Date: Thu, 28 Sep 2006 14:44:37 -0000 To: harmony-commits@incubator.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060928144438.160DB1A9820@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: hindessm Date: Thu Sep 28 07:44:37 2006 New Revision: 450874 URL: http://svn.apache.org/viewvc?view=rev&rev=450874 Log: Applying patch from '[#HARMONY-1604] [classlib][beans] fixes for "try-catch" bugs in some tests' with minor modification as agree in JIRA discussion. Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java?view=diff&rev=450874&r1=450873&r2=450874 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java Thu Sep 28 07:44:37 2006 @@ -328,13 +328,9 @@ assertNull(enc.get(i)); } - public void testXMLEncoder_Null() { - try { - new XMLEncoder(null); - } catch (NullPointerException e) { - // expected - } - } + public void testXMLEncoder_Null() throws NullPointerException { + new XMLEncoder(null); + } public void testGetOwner() { XMLEncoder enc = new XMLEncoder(System.out); Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java?view=diff&rev=450874&r1=450873&r2=450874 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java Thu Sep 28 07:44:37 2006 @@ -736,6 +736,7 @@ try { support.getService(child, requestor, Collection.class, selector, null); + fail("NPE expected"); } catch (NullPointerException e) { // expected } Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java?view=diff&rev=450874&r1=450873&r2=450874 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Thu Sep 28 07:44:37 2006 @@ -1385,6 +1385,7 @@ support.records.assertRecord("initialize", null); try { support.removeAll(Collections.EMPTY_LIST); + fail("UnsupportedOperationException expected"); } catch (UnsupportedOperationException e) { // expected }