From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13932 invoked by alias); 26 Jan 2009 22:46:16 -0000 Received: (qmail 13924 invoked by uid 22791); 26 Jan 2009 22:46:15 -0000 X-SWARE-Spam-Status: No, hits=1.3 required=5.0 tests=AWL,BAYES_40,J_CHICKENPOX_12,SPF_PASS X-Spam-Check-By: sourceware.org Received: from ey-out-1920.google.com (HELO ey-out-1920.google.com) (74.125.78.150) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 26 Jan 2009 22:46:10 +0000 Received: by ey-out-1920.google.com with SMTP id 13so835707eye.26 for ; Mon, 26 Jan 2009 14:46:07 -0800 (PST) Received: by 10.210.137.14 with SMTP id k14mr440891ebd.175.1233009967390; Mon, 26 Jan 2009 14:46:07 -0800 (PST) Received: from rivendell.middle-earth.co.uk (host86-149-19-157.range86-149.btcentralplus.com [86.149.19.157]) by mx.google.com with ESMTPS id g9sm7046349gvc.16.2009.01.26.14.46.03 (version=SSLv3 cipher=RC4-MD5); Mon, 26 Jan 2009 14:46:06 -0800 (PST) Date: Mon, 26 Jan 2009 22:46:00 -0000 From: Andrew John Hughes To: mauve-patches@sources.redhat.com Subject: FYI: Add test for new String constructor Message-ID: <20090126224129.GA10691@rivendell.middle-earth.co.uk> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="xB0nW4MQa6jZONgY" Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-09) X-IsSubscribed: yes Mailing-List: contact mauve-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: mauve-patches-owner@sourceware.org X-SW-Source: 2009/txt/msg00001.txt.bz2 --xB0nW4MQa6jZONgY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 607 This adds a test to ensure the String constructor (byte[], java.nio.charset.Charset) works as specified. Test passes on JamVM with Classpath CVS and IcedTea6. ChangeLog: 2009-01-26 Andrew John Hughes * gnu/testlet/java/lang/String/ConsCharset.java: New test for constructor which takes a java.nio.charset.Charset as an argument. -- Andrew :) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 --xB0nW4MQa6jZONgY Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="string-01.diff" Content-length: 2671 Index: gnu/testlet/java/lang/String/ConsCharset.java =================================================================== RCS file: gnu/testlet/java/lang/String/ConsCharset.java diff -N gnu/testlet/java/lang/String/ConsCharset.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/testlet/java/lang/String/ConsCharset.java 26 Jan 2009 22:34:45 -0000 @@ -0,0 +1,72 @@ +// Tags: JDK1.6 + +// Copyright (C) 2009 Red Hat, Inc. + +// This file is part of Mauve. + +// Mauve is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2, or (at your option) +// any later version. + +// Mauve is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Mauve; see the file COPYING. If not, write to +// the Free Software Foundation, 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. */ + +package gnu.testlet.java.lang.String; + +import gnu.testlet.Testlet; +import gnu.testlet.TestHarness; + +import java.nio.charset.Charset; +import java.nio.charset.UnsupportedCharsetException; + +public class ConsCharset + implements Testlet +{ + public void test (TestHarness h) + { + try + { + byte[] cp437Bytes = asByteArray(new int[] { 224, 226, 227, 228, 156 }); + checkString(h, new String(cp437Bytes, Charset.forName("CP437")), + "\u03b1\u0393\u03c0\u03a3\u00a3"); + } + catch (UnsupportedCharsetException e) + { + // Skip tests as CP437 is not required by the spec. + } + + byte[] utf8Bytes = asByteArray(new int[] { 0xC3,0x9F,0xE2,0x85,0x93,0xE2,0x82,0xAF,0xF0,0x90,0x85,0x80 }); + checkString(h, new String(utf8Bytes, Charset.forName("UTF8")), + "\u00DF\u2153\u20AF\uD800\uDD40"); + + byte[] isoBytes = asByteArray(new int[] {0x48,0x65,0x6C,0x6C,0x6F,0x20,0x57,0x6F,0x72,0x6C,0x64,0x21}); + checkString(h, new String(isoBytes, Charset.forName("ISO-8859-1")), + "Hello World!"); + } + + private void checkString(TestHarness h, String result, String expected) + { + for (int a = 0; a < result.length(); ++a) + { + h.check(result.charAt(a), expected.charAt(a)); + } + h.check(result, expected); + } + + private byte[] asByteArray(int[] ints) + { + byte[] bytes = new byte[ints.length]; + for (int a = 0; a < ints.length; ++a) + bytes[a] = Integer.valueOf(ints[a]).byteValue(); + return bytes; + } + +} --xB0nW4MQa6jZONgY--