diff -r 67bbd3f37f62 -r 74c4e0c5d936 jdk/test/java/awt/font/NumericShaper/ShapingTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/font/NumericShaper/ShapingTest.java	Thu Nov 12 18:59:19 2009 +0900
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6842557
+ * @summary confirm that shaping works as expected. (Mainly for new characters which were added in Unicode 5)
+ * used where appropriate.
+ */
+
+import java.awt.font.NumericShaper;
+import java.util.EnumSet;
+import static java.awt.font.NumericShaper.*;
+
+public class ShapingTest {
+    public static void main(String[] args) {
+        NumericShaper ns_old = getContextualShaper(ARABIC | TAMIL | ETHIOPIC,
+                                   EUROPEAN);
+        NumericShaper ns_new = getContextualShaper(EnumSet.of(
+                                   Range.ARABIC, Range.TAMIL, Range.ETHIOPIC),
+                                   Range.EUROPEAN);
+
+        boolean err = false;
+
+        String[][] data = {
+           // Arabic "October 10"
+          {"\u0623\u0643\u062a\u0648\u0628\u0631 10",
+           "\u0623\u0643\u062a\u0648\u0628\u0631 \u0661\u0660"},
+
+           // Tamil "Year 2009"
+          {"\u0b86\u0ba3\u0bcd\u0b9f\u0bc1 2009",
+           "\u0b86\u0ba3\u0bcd\u0b9f\u0bc1 \u0be8\u0be6\u0be6\u0bef"},
+           // "\u0be800\u0bef is returned by pre-JDK7 because Tamil zero was not
+           //  included in Unicode 4.0.0.
+
+           // Ethiopic "Syllable<HA> 2009"
+          {"\u1200 2009",
+           "\u1200 \u136a00\u1371"},
+           // Ethiopic zero doesn't exist even in Unicode 5.1.0.
+        };
+
+        for (int i = 0; i < data.length; i++) {
+            String expected = data[i][1];
+
+            char[] text = data[i][0].toCharArray();
+            ns_old.shape(text, 0, text.length);
+            String got = new String(text);
+
+            if (!expected.equals(got)) {
+                err = true;
+                System.err.println("Error with traditional range.");
+                System.err.println("  text = " + data[i][0]);
+                System.err.println("  got = " + got);
+                System.err.println("  expected = " + expected);
+            } else {
+                System.err.println("OK with traditional range.");
+                System.err.println("  text = " + data[i][0]);
+                System.err.println("  got = " + got);
+                System.err.println("  expected = " + expected);
+            }
+
+            text = data[i][0].toCharArray();
+            ns_new.shape(text, 0, text.length);
+            got = new String(text);
+
+            if (!expected.equals(got)) {
+                err = true;
+                System.err.println("Error with new Enum range.");
+                System.err.println("  text = " + data[i][0]);
+                System.err.println("  got = " + got);
+                System.err.println("  expected = " + expected);
+            } else {
+                System.err.println("OK with new Enum range.");
+                System.err.println("  text = " + data[i][0]);
+                System.err.println("  got = " + got);
+                System.err.println("  expected = " + expected);
+            }
+        }
+
+        if (err) {
+            throw new RuntimeException("shape() returned unexpected value.");
+        }
+    }
+
+}