Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 55272 invoked from network); 30 Jan 2008 15:04:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jan 2008 15:04:29 -0000 Received: (qmail 67114 invoked by uid 500); 30 Jan 2008 15:04:20 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 67098 invoked by uid 500); 30 Jan 2008 15:04:20 -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 67089 invoked by uid 99); 30 Jan 2008 15:04:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2008 07:04:20 -0800 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; Wed, 30 Jan 2008 15:04:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 147331A9832; Wed, 30 Jan 2008 07:04:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r616781 - /harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java Date: Wed, 30 Jan 2008 15:04:06 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080130150408.147331A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Wed Jan 30 07:03:53 2008 New Revision: 616781 URL: http://svn.apache.org/viewvc?rev=616781&view=rev Log: Fix test breakage when getting encoding back from InputStreamReader. Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java?rev=616781&r1=616780&r2=616781&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java Wed Jan 30 07:03:53 2008 @@ -300,8 +300,11 @@ * @tests java.io.InputStreamReader#getEncoding() */ public void test_getEncoding() throws IOException { - is = new InputStreamReader(fis, "8859_1"); - assertEquals("Returned incorrect encoding", "8859_1", is.getEncoding()); + try { + is = new InputStreamReader(fis, "8859_1"); + } catch (UnsupportedEncodingException e) { + assertEquals("Returned incorrect encoding", "8859_1", is.getEncoding()); + } InputStreamReader in = null; byte b[] = new byte[5];