Index: trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java =================================================================== --- trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java (revision 438847) +++ trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java (working copy) @@ -26,6 +26,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.Set; +import java.util.SortedMap; import junit.framework.TestCase; @@ -81,6 +82,22 @@ // Expected } } + + /** + * @tests java.nio.charset.Charset#isSupported(String) + */ + public void testAvailableCharsets() { + // Regression for HARMONY-1360 + SortedMap allCharsets = Charset.availableCharsets(); + Object[] names = allCharsets.keySet().toArray(); + + for (int i = 0; i < names.length; ++i){ + Charset _chset = (Charset) allCharsets.get(names[i]); + Charset chset = Charset.forName((String) names[i]); + assertTrue("forName(" + names[i] + ") returned '" + + chset + "', instead of '" + _chset + "'", chset.name().equals(_chset.name())); + } + } /** * @tests java.nio.charset.Charset#defaultCharset()