From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27809 invoked by alias); 6 Jul 2008 23:25:48 -0000 Received: (qmail 27798 invoked by uid 22791); 6 Jul 2008 23:25:47 -0000 X-Spam-Check-By: sourceware.org Received: from smtp804.mail.ird.yahoo.com (HELO smtp804.mail.ird.yahoo.com) (217.146.188.64) by sourceware.org (qpsmtpd/0.31) with SMTP; Sun, 06 Jul 2008 23:25:12 +0000 Received: (qmail 54324 invoked from network); 6 Jul 2008 23:25:09 -0000 Received: from unknown (HELO orthanc.middle-earth.co.uk) (hughes2002@btinternet.com@86.137.66.97 with plain) by smtp804.mail.ird.yahoo.com with SMTP; 6 Jul 2008 23:25:09 -0000 X-YMail-OSG: AoriQogVM1kyis4WnA6P_Jdyowz5mr0r0N5dQWQ875TpgkDjqBB1nHvIPB2uSp6XSgF_YDEYAbJ9c4qfrKukjHD6iyVeutWp2mwDES2evy_gI4B2zJ8WkjEQeR.NDaD_HSWG4aizyt938pZgCRBY.nLE X-Yahoo-Newman-Property: ymail-3 Received: from rivendell.middle-earth.co.uk ([192.168.0.1]) by orthanc.middle-earth.co.uk with smtp (Exim 4.63) (envelope-from ) id 1KFdbP-0008PV-UN for mauve-patches@sourceware.org; Mon, 07 Jul 2008 00:25:08 +0100 Received: by rivendell.middle-earth.co.uk (sSMTP sendmail emulation); Mon, 7 Jul 2008 00:25:07 +0100 Date: Sun, 06 Jul 2008 23:25:00 -0000 From: Andrew John Hughes To: mauve-patches@sourceware.org Subject: FYI: Add tests for PR classpath/22851 Message-ID: <20080706232507.GA16830@rivendell.middle-earth.co.uk> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="FL5UXtIhxfXey3p5" 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/msg00052.txt.bz2 --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 615 This adds tests to ensure that the zone strings are returned correctly and in the right slots (in the case of java.text.DateFormatSymbols). ChangeLog: 2008-07-06 Andrew John Hughes * gnu/testlet/java/text/DateFormatSymbols/PR22851.java, * gnu/testlet/java/util/TimeZone/GetDisplayName.java: Add tests raised by issues in PR22851. -- 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 --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pr22851.diff" Content-length: 5133 Index: gnu/testlet/java/text/DateFormatSymbols/PR22851.java =================================================================== RCS file: gnu/testlet/java/text/DateFormatSymbols/PR22851.java diff -N gnu/testlet/java/text/DateFormatSymbols/PR22851.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/testlet/java/text/DateFormatSymbols/PR22851.java 6 Jul 2008 23:20:04 -0000 @@ -0,0 +1,74 @@ +// Tags: JDK1.2 + +// Copyright (C) 2008 Andrew John Hughes (gnu_andrew@member.fsf.org) + +// 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.text.DateFormatSymbols; + +import gnu.testlet.TestHarness; +import gnu.testlet.Testlet; + +import java.text.DateFormatSymbols; +import java.util.Locale; + +/** + * A check for PR22851. This checks that the zone + * strings are allocated to the correct elements in the + * array. The Javadoc for Java 1.6 now specifies this as: + *

+ * + * + * + * + * + * + *
zoneStrings[i][0]time zone ID
zoneStrings[i][1]long name of zone in standard time
zoneStrings[i][2]short name of zone in standard time
zoneStrings[i][3]long name of zone in daylight saving time
zoneStrings[i][4]short name of zone in daylight saving time
+ */ +public class PR22851 + implements Testlet +{ + + /** + * Runs the test using the specified harness. + * + * @param harness the test harness. + */ + public void test(TestHarness harness) + { + String[][] zstrings = DateFormatSymbols.getInstance(Locale.UK).getZoneStrings(); + boolean checked = false; + for (int a = 0; a < zstrings.length; ++a) + { + harness.check(zstrings[a].length >= 5, zstrings[a][0] + " has less than 5 strings."); + if (zstrings[a][0].equals("Europe/London")) + { + if (checked) + harness.fail("Europe/London appears twice."); + harness.check(zstrings[a][1], "Greenwich Mean Time"); + harness.check(zstrings[a][2], "GMT"); + harness.check(zstrings[a][3], "British Summer Time"); + harness.check(zstrings[a][4], "BST"); + checked = true; + } + } + if (!checked) + harness.fail("Europe/London doesn't appear"); + } + +} Index: gnu/testlet/java/util/TimeZone/GetDisplayName.java =================================================================== RCS file: gnu/testlet/java/util/TimeZone/GetDisplayName.java diff -N gnu/testlet/java/util/TimeZone/GetDisplayName.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/testlet/java/util/TimeZone/GetDisplayName.java 6 Jul 2008 23:20:05 -0000 @@ -0,0 +1,53 @@ +// Tags: JDK1.2 + +// Copyright (C) 2008 Andrew John Hughes (gnu_andrew@member.fsf.org) + +// 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.util.TimeZone; + +import gnu.testlet.TestHarness; +import gnu.testlet.Testlet; + +import java.util.Locale; +import java.util.TimeZone; + +/** + * Checks that the correct strings are returned in the appropriate + * slots for TimeZone.getDisplayName. We use Europe/London for these + * tests. + */ +public class GetDisplayName + implements Testlet +{ + + /** + * Runs the test using the specified harness. + * + * @param harness the test harness. + */ + public void test(TestHarness harness) + { + TimeZone zone = TimeZone.getTimeZone("Europe/London"); + harness.check(zone.getDisplayName(false, TimeZone.LONG, Locale.UK), "Greenwich Mean Time"); + harness.check(zone.getDisplayName(false, TimeZone.SHORT, Locale.UK), "GMT"); + harness.check(zone.getDisplayName(true, TimeZone.LONG, Locale.UK), "British Summer Time"); + harness.check(zone.getDisplayName(true, TimeZone.SHORT, Locale.UK), "BST"); + } + +} --FL5UXtIhxfXey3p5--