FYI: ChoiceFormat fixes

FYI: ChoiceFormat fixes

[Andrew John Hughes]

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

This fixes a bug in the format14 test where the ChoiceFormat used
for the test is invalid.  A further test is added to ensure such
invalid formats are correctly handled.  Sun's JDK currently fails to
catch some invalid formats and thus was wrongly passing the format14
test.

ChangeLog:

2009-01-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/testlet/java/text/ChoiceFormat/Bad.java:
	New test for bad ChoiceFormats.
	* gnu/testlet/java/text/MessageFormat/format14.java:
	Correct ChoiceFormat used.

-- 
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

[-- Attachment #2: choiceformat-01.diff --]
[-- Type: text/plain, Size: 3228 bytes --]

Index: gnu/testlet/java/text/ChoiceFormat/Bad.java
===================================================================
RCS file: gnu/testlet/java/text/ChoiceFormat/Bad.java
diff -N gnu/testlet/java/text/ChoiceFormat/Bad.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/text/ChoiceFormat/Bad.java	2 Jan 2009 12:47:32 -0000
@@ -0,0 +1,75 @@
+// Test handling of bad ChoiceFormats.
+
+// Copyright (c) 2009 Red Hat
+// Written by Andrew John Hughes (ahughes@redhat.com)
+
+// 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.
+
+// Tags: JDK1.1
+
+package gnu.testlet.java.text.ChoiceFormat;
+
+import gnu.testlet.Testlet;
+import gnu.testlet.TestHarness;
+
+import java.text.ChoiceFormat;
+
+public class Bad
+  implements Testlet
+{
+  public void test (TestHarness h)
+  {
+    try
+      {
+	ChoiceFormat f = new ChoiceFormat("0#zero|1#one|1>many");
+	h.fail("Failed to catch bad limit 1>");
+      }
+    catch (IllegalArgumentException e)
+      {
+	h.check(true);
+      }
+    try
+      {
+	ChoiceFormat f = new ChoiceFormat("0#zero|1#one|1>many|");
+	h.fail("Failed to catch bad limit 1> with trailing |");
+      }
+    catch (IllegalArgumentException e)
+      {
+	h.check(true);
+      }
+    try
+      {
+	ChoiceFormat f = new ChoiceFormat("0#zero|1#one|1<many|");
+	h.fail("Failed to catch trailing |");
+      }
+    catch (IllegalArgumentException e)
+      {
+	h.check(true);
+      }
+    try
+      {
+	ChoiceFormat f = new ChoiceFormat("0#zero|1#one|1>many|1<many");
+	h.fail("Failed to catch enclosed bad limit");
+      }
+    catch (IllegalArgumentException e)
+      {
+	h.check(true);
+      }
+  }
+}
+
Index: gnu/testlet/java/text/MessageFormat/format14.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/text/MessageFormat/format14.java,v
retrieving revision 1.2
diff -u -u -r1.2 format14.java
--- gnu/testlet/java/text/MessageFormat/format14.java	18 Jan 2005 00:50:08 -0000	1.2
+++ gnu/testlet/java/text/MessageFormat/format14.java	2 Jan 2009 12:47:33 -0000
@@ -160,8 +160,8 @@
     
     try
     {
-      s = MessageFormat.format("{0,choice,0#zero|1#one|1>many}", new Object[]{new Double(2.0)});
-      expected = new ChoiceFormat("0#zero|1#one|1>many").format(new Double(2.0));
+      s = MessageFormat.format("{0,choice,0#zero|1#one|1<many}", new Object[]{new Double(2.0)});
+      expected = new ChoiceFormat("0#zero|1#one|1<many").format(new Double(2.0));
       harness.check(s, expected);
     }
     catch (Exception e)