From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23487 invoked by alias); 31 Dec 2008 10:41:32 -0000 Received: (qmail 23479 invoked by uid 22791); 31 Dec 2008 10:41:31 -0000 X-SWARE-Spam-Status: No, hits=1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_12,J_CHICKENPOX_44,J_CHICKENPOX_47,J_CHICKENPOX_82,J_CHICKENPOX_84,J_CHICKENPOX_93,SPF_PASS X-Spam-Check-By: sourceware.org Received: from nf-out-0910.google.com (HELO nf-out-0910.google.com) (64.233.182.186) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 31 Dec 2008 10:40:17 +0000 Received: by nf-out-0910.google.com with SMTP id e27so1603844nfd.30 for ; Wed, 31 Dec 2008 02:40:12 -0800 (PST) Received: by 10.210.12.13 with SMTP id 13mr3172264ebl.160.1230720012263; Wed, 31 Dec 2008 02:40:12 -0800 (PST) Received: from rivendell.middle-earth.co.uk (host81-152-163-192.range81-152.btcentralplus.com [81.152.163.192]) by mx.google.com with ESMTPS id g9sm16789204gvc.17.2008.12.31.02.40.10 (version=SSLv3 cipher=RC4-MD5); Wed, 31 Dec 2008 02:40:11 -0800 (PST) Date: Wed, 31 Dec 2008 10:41:00 -0000 From: Andrew John Hughes To: mauve-patches@sources.redhat.com Subject: FYI: Fix Calendar.ampm test to use localised strings Message-ID: <20081231104005.GA17760@rivendell.middle-earth.co.uk> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="qDbXVdCdHGoSgWSk" 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: 2008/txt/msg00063.txt.bz2 --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 613 This fixes the Calendar.ampm test so it passes on both GNU Classpath and OpenJDK. The AM/PM strings are localised and so should be retrieved from the locale data. ChangeLog: 2008-12-31 Andrew John Hughes * gnu/testlet/java/util/Calendar/ampm.java: Use the localised am/pm strings from DateFormatSymbols rather than hardcoding. -- 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 --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="calendar-01.diff" Content-length: 2260 Index: gnu/testlet/java/util/Calendar/ampm.java =================================================================== RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Calendar/ampm.java,v retrieving revision 1.2 diff -u -u -r1.2 ampm.java --- gnu/testlet/java/util/Calendar/ampm.java 21 Mar 2005 08:26:05 -0000 1.2 +++ gnu/testlet/java/util/Calendar/ampm.java 31 Dec 2008 10:36:26 -0000 @@ -13,13 +13,14 @@ public class ampm implements Testlet { - private DateFormat format; + private SimpleDateFormat format; private TestHarness harness; public void test (TestHarness harness) { // AM/PM mark is locale-dependent. We use Locale.US. format = new SimpleDateFormat("hh:mm a", Locale.US); + String[] ampm = format.getDateFormatSymbols().getAmPmStrings(); this.harness = harness; // According to the API document of java.util.Calendar, @@ -31,19 +32,19 @@ // Whereas the 'h' flag is 1-12 time // I.e. 12 AM (midnight), 1 AM, .. , 12 PM (midday), 1 PM, .. 11 PM - checkTime("12:00 AM", "12:00 AM"); - checkTime("12:10 AM", "12:10 AM"); - checkTime(0, 0, Calendar.AM, "12:00 AM"); - checkTime("0:00 AM", "12:00 AM"); - checkTime(0, 10, Calendar.AM, "12:10 AM"); - checkTime("0:10 AM", "12:10 AM"); - - checkTime("12:00 PM", "12:00 PM"); - checkTime("12:10 PM", "12:10 PM"); - checkTime(0, 0, Calendar.PM, "12:00 PM"); - checkTime("0:00 PM", "12:00 PM"); - checkTime(0, 10, Calendar.PM, "12:10 PM"); - checkTime("0:10 PM", "12:10 PM"); + checkTime("12:00 " + ampm[0], "12:00 " + ampm[0]); + checkTime("12:10 " + ampm[0], "12:10 " + ampm[0]); + checkTime(0, 0, Calendar.AM, "12:00 " + ampm[0]); + checkTime("0:00 " + ampm[0], "12:00 " + ampm[0]); + checkTime(0, 10, Calendar.AM, "12:10 " + ampm[0]); + checkTime("0:10 " + ampm[0], "12:10 " + ampm[0]); + + checkTime("12:00 " + ampm[1], "12:00 " + ampm[1]); + checkTime("12:10 " + ampm[1], "12:10 " + ampm[1]); + checkTime(0, 0, Calendar.PM, "12:00 " + ampm[1]); + checkTime("0:00 " + ampm[1], "12:00 " + ampm[1]); + checkTime(0, 10, Calendar.PM, "12:10 " + ampm[1]); + checkTime("0:10 " + ampm[1], "12:10 " + ampm[1]); } private void checkTime(int hh, int mm, int ampm, String expect) --qDbXVdCdHGoSgWSk--