Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 40752 invoked from network); 10 Jun 2010 17:57:47 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Jun 2010 17:57:47 -0000 Received: (qmail 77599 invoked by uid 500); 10 Jun 2010 17:57:47 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 77578 invoked by uid 500); 10 Jun 2010 17:57:47 -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 77571 invoked by uid 99); 10 Jun 2010 17:57:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jun 2010 17:57:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 10 Jun 2010 17:57:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6614B238899C; Thu, 10 Jun 2010 17:57:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r953412 - in /harmony/enhanced/java/trunk/classlib/modules/luni/src: main/java/java/io/ test/api/common/org/apache/harmony/luni/tests/java/io/ Date: Thu, 10 Jun 2010 17:57:01 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100610175701.6614B238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Thu Jun 10 17:57:00 2010 New Revision: 953412 URL: http://svn.apache.org/viewvc?rev=953412&view=rev Log: Applied patch and created tests for HARMONY-6534 ([classlib][luni] construct UnsupportedEncodingException with name of encoding) Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/InputStreamReader.java harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/PrintStream.java harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintStreamTest.java Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/InputStreamReader.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/InputStreamReader.java?rev=953412&r1=953411&r2=953412&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/InputStreamReader.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/InputStreamReader.java Thu Jun 10 17:57:00 2010 @@ -101,7 +101,7 @@ public class InputStreamReader extends R CodingErrorAction.REPLACE); } catch (IllegalArgumentException e) { throw (UnsupportedEncodingException) - new UnsupportedEncodingException().initCause(e); + new UnsupportedEncodingException(enc).initCause(e); } bytes.limit(0); } Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/PrintStream.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/PrintStream.java?rev=953412&r1=953411&r2=953412&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/PrintStream.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/PrintStream.java Thu Jun 10 17:57:00 2010 @@ -175,7 +175,7 @@ public class PrintStream extends FilterO throw new NullPointerException(); } if (!Charset.isSupported(csn)) { - throw new UnsupportedEncodingException(); + throw new UnsupportedEncodingException(csn); } encoding = csn; } Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java?rev=953412&r1=953411&r2=953412&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java Thu Jun 10 17:57:00 2010 @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.io.PrintStream; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; @@ -211,7 +212,7 @@ public class InputStreamReaderTest exten is = new InputStreamReader(fis, "Bogus"); fail("Failed to throw Unsupported Encoding exception"); } catch (UnsupportedEncodingException e) { - // Expected + assertNotNull(e.getMessage()); } try { Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintStreamTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintStreamTest.java?rev=953412&r1=953411&r2=953412&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintStreamTest.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PrintStreamTest.java Thu Jun 10 17:57:00 2010 @@ -77,6 +77,14 @@ public class PrintStreamTest extends jun MockPrintStream os = new MockPrintStream(testFilePath, "utf-8"); assertNotNull(os); os.close(); + + // Test that a bogus charset is mentioned in the exception + try { + new PrintStream(testFilePath, "Bogus"); + fail("Exception expected"); + } catch (UnsupportedEncodingException e) { + assertNotNull(e.getMessage()); + } } /**