Cherry-pick: ticket:11479: do not ask the Java system what the canonical name should be, just figure it out from ICU data

http://bugs.icu-project.org/trac/changeset/36982

Change-Id: Ib18d4f20ffbb760d68b9522c1a82e2b29dab393c

1 files changed, 1 insertions, 24 deletions

diff --git a/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java b/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
index c9bc69bcf..3fe4d8ded 100644
--- a/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
+++ b/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
@@ -1610,30 +1610,7 @@ public class TestCharset extends TestFmwk {
         }
         logln("Total Number of chasets = " + map.size());
     }
-    /* ticket 5580 */
-    public void TestJavaCanonicalNameOnAvailableCharsets() {
-        CharsetProviderICU provider = new CharsetProviderICU();
-        Iterator allCharsets = provider.charsets();
-        String errorMessage = null;
-        
-        while (allCharsets.hasNext()) {
-            Charset _chset = (Charset)allCharsets.next();
-            Charset chset = Charset.forName(_chset.name());
-            
-            if (!chset.name().equals(_chset.name())) {
-                if (errorMessage == null) {
-                    errorMessage = new String("Error: Charset.forName( " + _chset.name() + " ) returned " + chset + " instead of " + _chset);
-                } else {
-                    errorMessage = errorMessage + "\nError: Charset.forName( " + _chset.name() + " ) returned " + chset + " instead of " + _chset;
-                }
-            }
-        }
-        
-        if (errorMessage != null) {
-            errln(errorMessage);
-        }
-    }
-    
+
     public void TestWindows936(){
         CharsetProviderICU icu = new CharsetProviderICU();
         Charset cs = icu.charsetForName("windows-936-2000");