Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 79208 invoked from network); 16 Dec 2008 04:02:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Dec 2008 04:02:26 -0000 Received: (qmail 40694 invoked by uid 500); 16 Dec 2008 04:02:38 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 40675 invoked by uid 500); 16 Dec 2008 04:02:38 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 40666 invoked by uid 99); 16 Dec 2008 04:02:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2008 20:02:38 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2008 04:02:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A68142388886; Mon, 15 Dec 2008 20:02:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r726938 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/io/ main/java/org/apache/harmony/luni/util/ test/api/common/org/apache/harmony/luni/tests/util/ Date: Tue, 16 Dec 2008 04:02:04 -0000 To: commits@harmony.apache.org From: qiuxx@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081216040204.A68142388886@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: qiuxx Date: Mon Dec 15 20:02:03 2008 New Revision: 726938 URL: http://svn.apache.org/viewvc?rev=726938&view=rev Log: Apply for HARMONY-6048,([classlib] [luni] Refactor InputStreamReader.HistoricalNamesUtil to org.apache.harmony.luni.util.HistoricalNamesUtil ) Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java (with props) harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java (with props) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java?rev=726938&r1=726937&r2=726938&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java Mon Dec 15 20:02:03 2008 @@ -26,8 +26,8 @@ import java.nio.charset.MalformedInputException; import java.nio.charset.UnmappableCharacterException; import java.security.AccessController; -import java.util.HashMap; +import org.apache.harmony.luni.util.HistoricalNamesUtil; import org.apache.harmony.luni.util.Msg; import org.apache.harmony.luni.util.PriviAction; @@ -177,160 +177,6 @@ return HistoricalNamesUtil.getHistoricalName(decoder.charset().name()); } - /* - * helper for getEncoding() - */ - @SuppressWarnings("nls") - static class HistoricalNamesUtil { - private static HashMap historicalNames = new HashMap(); - static { - historicalNames.put("Big5-HKSCS", "Big5_HKSCS"); - historicalNames.put("EUC-JP", "EUC_JP"); - historicalNames.put("EUC-KR", "EUC_KR"); - historicalNames.put("GB2312", "EUC_CN"); - historicalNames.put("IBM-Thai", "Cp838"); - historicalNames.put("IBM00858", "Cp858"); - historicalNames.put("IBM01140", "Cp1140"); - historicalNames.put("IBM01141", "Cp1141"); - historicalNames.put("IBM01142", "Cp1142"); - historicalNames.put("IBM01143", "Cp1143"); - historicalNames.put("IBM01144", "Cp1144"); - historicalNames.put("IBM01145", "Cp1145"); - historicalNames.put("IBM01146", "Cp1146"); - historicalNames.put("IBM01147", "Cp1147"); - historicalNames.put("IBM01148", "Cp1148"); - historicalNames.put("IBM01149", "Cp1149"); - historicalNames.put("IBM037", "Cp037"); - historicalNames.put("IBM1026", "Cp1026"); - historicalNames.put("IBM1047", "Cp1047"); - historicalNames.put("IBM273", "Cp273"); - historicalNames.put("IBM277", "Cp277"); - historicalNames.put("IBM278", "Cp278"); - historicalNames.put("IBM280", "Cp280"); - historicalNames.put("IBM284", "Cp284"); - historicalNames.put("IBM285", "Cp285"); - historicalNames.put("IBM297", "Cp297"); - historicalNames.put("IBM420", "Cp420"); - historicalNames.put("IBM424", "Cp424"); - historicalNames.put("IBM437", "Cp437"); - historicalNames.put("IBM500", "Cp500"); - historicalNames.put("IBM775", "Cp775"); - historicalNames.put("IBM850", "Cp850"); - historicalNames.put("IBM852", "Cp852"); - historicalNames.put("IBM855", "Cp855"); - historicalNames.put("IBM857", "Cp857"); - historicalNames.put("IBM860", "Cp860"); - historicalNames.put("IBM861", "Cp861"); - historicalNames.put("IBM862", "Cp862"); - historicalNames.put("IBM863", "Cp863"); - historicalNames.put("IBM864", "Cp864"); - historicalNames.put("IBM865", "Cp865"); - historicalNames.put("IBM866", "Cp866"); - historicalNames.put("IBM868", "Cp868"); - historicalNames.put("IBM869", "Cp869"); - historicalNames.put("IBM870", "Cp870"); - historicalNames.put("IBM871", "Cp871"); - historicalNames.put("IBM918", "Cp918"); - historicalNames.put("ISO-2022-CN", "ISO2022CN"); - historicalNames.put("ISO-2022-JP", "ISO2022JP"); - historicalNames.put("ISO-2022-KR", "ISO2022KR"); - historicalNames.put("ISO-8859-1", "ISO8859_1"); - historicalNames.put("ISO-8859-13", "ISO8859_13"); - historicalNames.put("ISO-8859-15", "ISO8859_15"); - historicalNames.put("ISO-8859-2", "ISO8859_2"); - historicalNames.put("ISO-8859-3", "ISO8859_3"); - historicalNames.put("ISO-8859-4", "ISO8859_4"); - historicalNames.put("ISO-8859-5", "ISO8859_5"); - historicalNames.put("ISO-8859-6", "ISO8859_6"); - historicalNames.put("ISO-8859-7", "ISO8859_7"); - historicalNames.put("ISO-8859-8", "ISO8859_8"); - historicalNames.put("ISO-8859-9", "ISO8859_9"); - historicalNames.put("KOI8-R", "KOI8_R"); - historicalNames.put("Shift_JIS", "SJIS"); - historicalNames.put("TIS-620", "TIS620"); - historicalNames.put("US-ASCII", "ASCII"); - historicalNames.put("UTF-16BE", "UnicodeBigUnmarked"); - historicalNames.put("UTF-16LE", "UnicodeLittleUnmarked"); - historicalNames.put("UTF-8", "UTF8"); - historicalNames.put("windows-1250", "Cp1250"); - historicalNames.put("windows-1251", "Cp1251"); - historicalNames.put("windows-1252", "Cp1252"); - historicalNames.put("windows-1253", "Cp1253"); - historicalNames.put("windows-1254", "Cp1254"); - historicalNames.put("windows-1255", "Cp1255"); - historicalNames.put("windows-1256", "Cp1256"); - historicalNames.put("windows-1257", "Cp1257"); - historicalNames.put("windows-1258", "Cp1258"); - historicalNames.put("windows-31j", "MS932"); - historicalNames.put("x-Big5-Solaris", "Big5_Solaris"); - historicalNames.put("x-euc-jp-linux", "EUC_JP_LINUX"); - historicalNames.put("x-EUC-TW", "EUC_TW"); - historicalNames.put("x-eucJP-Open", "EUC_JP_Solaris"); - historicalNames.put("x-IBM1006", "Cp1006"); - historicalNames.put("x-IBM1025", "Cp1025"); - historicalNames.put("x-IBM1046", "Cp1046"); - historicalNames.put("x-IBM1097", "Cp1097"); - historicalNames.put("x-IBM1098", "Cp1098"); - historicalNames.put("x-IBM1112", "Cp1112"); - historicalNames.put("x-IBM1122", "Cp1122"); - historicalNames.put("x-IBM1123", "Cp1123"); - historicalNames.put("x-IBM1124", "Cp1124"); - historicalNames.put("x-IBM1381", "Cp1381"); - historicalNames.put("x-IBM1383", "Cp1383"); - historicalNames.put("x-IBM33722", "Cp33722"); - historicalNames.put("x-IBM737", "Cp737"); - historicalNames.put("x-IBM856", "Cp856"); - historicalNames.put("x-IBM874", "Cp874"); - historicalNames.put("x-IBM875", "Cp875"); - historicalNames.put("x-IBM921", "Cp921"); - historicalNames.put("x-IBM922", "Cp922"); - historicalNames.put("x-IBM930", "Cp930"); - historicalNames.put("x-IBM933", "Cp933"); - historicalNames.put("x-IBM935", "Cp935"); - historicalNames.put("x-IBM937", "Cp937"); - historicalNames.put("x-IBM939", "Cp939"); - historicalNames.put("x-IBM942", "Cp942"); - historicalNames.put("x-IBM942C", "Cp942C"); - historicalNames.put("x-IBM943", "Cp943"); - historicalNames.put("x-IBM943C", "Cp943C"); - historicalNames.put("x-IBM948", "Cp948"); - historicalNames.put("x-IBM949", "Cp949"); - historicalNames.put("x-IBM949C", "Cp949C"); - historicalNames.put("x-IBM950", "Cp950"); - historicalNames.put("x-IBM964", "Cp964"); - historicalNames.put("x-IBM970", "Cp970"); - historicalNames.put("x-ISCII91", "ISCII91"); - historicalNames.put("x-ISO-2022-CN-CNS", "ISO2022CN"); - historicalNames.put("x-ISO-2022-CN-GB", "ISO2022CN"); - historicalNames.put("x-JISAutoDetect", "JISAutoDetect"); - historicalNames.put("x-MacArabic", "MacArabic"); - historicalNames.put("x-MacCentralEurope", "MacCentralEurope"); - historicalNames.put("x-MacCroatian", "MacCroatian"); - historicalNames.put("x-MacCyrillic", "MacCyrillic"); - historicalNames.put("x-MacDingbat", "MacDingbat"); - historicalNames.put("x-MacGreek", "MacGreek"); - historicalNames.put("x-MacHebrew", "MacHebrew"); - historicalNames.put("x-MacIceland", "MacIceland"); - historicalNames.put("x-MacRoman", "MacRoman"); - historicalNames.put("x-MacRomania", "MacRomania"); - historicalNames.put("x-MacSymbol", "MacSymbol"); - historicalNames.put("x-MacThai", "MacThai"); - historicalNames.put("x-MacTurkish", "MacTurkish"); - historicalNames.put("x-MacUkraine", "MacUkraine"); - historicalNames.put("x-MS950-HKSCS", "MS950_HKSCS"); - historicalNames.put("x-mswin-936", "MS936"); - historicalNames.put("x-PCK", "PCK"); - historicalNames.put("x-windows-874", "MS874"); - historicalNames.put("x-windows-949", "MS949"); - historicalNames.put("x-windows-950", "MS950"); - } - - public static String getHistoricalName(String name) { - return (!historicalNames.containsKey(name) ? name : historicalNames - .get(name)); - } - } - /** * Reads a single character from this InputStreamReader and returns the * result as an int. The 2 higher-order characters are set to 0. If the end Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java?rev=726938&r1=726937&r2=726938&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java Mon Dec 15 20:02:03 2008 @@ -25,6 +25,7 @@ import java.nio.charset.CodingErrorAction; import java.security.AccessController; +import org.apache.harmony.luni.util.HistoricalNamesUtil; import org.apache.harmony.luni.util.Msg; import org.apache.harmony.luni.util.PriviAction; @@ -200,8 +201,7 @@ if (encoder == null) { return null; } - return InputStreamReader.HistoricalNamesUtil.getHistoricalName(encoder - .charset().name()); + return HistoricalNamesUtil.getHistoricalName(encoder.charset().name()); } /** Added: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java?rev=726938&view=auto ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java (added) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java Mon Dec 15 20:02:03 2008 @@ -0,0 +1,170 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.harmony.luni.util; + +import java.util.HashMap; + +public class HistoricalNamesUtil { + private static HashMap historicalNames = new HashMap(); + + static { + historicalNames.put("Big5-HKSCS", "Big5_HKSCS"); + historicalNames.put("EUC-JP", "EUC_JP"); + historicalNames.put("EUC-KR", "EUC_KR"); + historicalNames.put("GB2312", "EUC_CN"); + historicalNames.put("IBM-Thai", "Cp838"); + historicalNames.put("IBM00858", "Cp858"); + historicalNames.put("IBM01140", "Cp1140"); + historicalNames.put("IBM01141", "Cp1141"); + historicalNames.put("IBM01142", "Cp1142"); + historicalNames.put("IBM01143", "Cp1143"); + historicalNames.put("IBM01144", "Cp1144"); + historicalNames.put("IBM01145", "Cp1145"); + historicalNames.put("IBM01146", "Cp1146"); + historicalNames.put("IBM01147", "Cp1147"); + historicalNames.put("IBM01148", "Cp1148"); + historicalNames.put("IBM01149", "Cp1149"); + historicalNames.put("IBM037", "Cp037"); + historicalNames.put("IBM1026", "Cp1026"); + historicalNames.put("IBM1047", "Cp1047"); + historicalNames.put("IBM273", "Cp273"); + historicalNames.put("IBM277", "Cp277"); + historicalNames.put("IBM278", "Cp278"); + historicalNames.put("IBM280", "Cp280"); + historicalNames.put("IBM284", "Cp284"); + historicalNames.put("IBM285", "Cp285"); + historicalNames.put("IBM297", "Cp297"); + historicalNames.put("IBM420", "Cp420"); + historicalNames.put("IBM424", "Cp424"); + historicalNames.put("IBM437", "Cp437"); + historicalNames.put("IBM500", "Cp500"); + historicalNames.put("IBM775", "Cp775"); + historicalNames.put("IBM850", "Cp850"); + historicalNames.put("IBM852", "Cp852"); + historicalNames.put("IBM855", "Cp855"); + historicalNames.put("IBM857", "Cp857"); + historicalNames.put("IBM860", "Cp860"); + historicalNames.put("IBM861", "Cp861"); + historicalNames.put("IBM862", "Cp862"); + historicalNames.put("IBM863", "Cp863"); + historicalNames.put("IBM864", "Cp864"); + historicalNames.put("IBM865", "Cp865"); + historicalNames.put("IBM866", "Cp866"); + historicalNames.put("IBM868", "Cp868"); + historicalNames.put("IBM869", "Cp869"); + historicalNames.put("IBM870", "Cp870"); + historicalNames.put("IBM871", "Cp871"); + historicalNames.put("IBM918", "Cp918"); + historicalNames.put("ISO-2022-CN", "ISO2022CN"); + historicalNames.put("ISO-2022-JP", "ISO2022JP"); + historicalNames.put("ISO-2022-KR", "ISO2022KR"); + historicalNames.put("ISO-8859-1", "ISO8859_1"); + historicalNames.put("ISO-8859-13", "ISO8859_13"); + historicalNames.put("ISO-8859-15", "ISO8859_15"); + historicalNames.put("ISO-8859-2", "ISO8859_2"); + historicalNames.put("ISO-8859-3", "ISO8859_3"); + historicalNames.put("ISO-8859-4", "ISO8859_4"); + historicalNames.put("ISO-8859-5", "ISO8859_5"); + historicalNames.put("ISO-8859-6", "ISO8859_6"); + historicalNames.put("ISO-8859-7", "ISO8859_7"); + historicalNames.put("ISO-8859-8", "ISO8859_8"); + historicalNames.put("ISO-8859-9", "ISO8859_9"); + historicalNames.put("KOI8-R", "KOI8_R"); + historicalNames.put("Shift_JIS", "SJIS"); + historicalNames.put("TIS-620", "TIS620"); + historicalNames.put("US-ASCII", "ASCII"); + historicalNames.put("UTF-16BE", "UnicodeBigUnmarked"); + historicalNames.put("UTF-16LE", "UnicodeLittleUnmarked"); + historicalNames.put("UTF-8", "UTF8"); + historicalNames.put("windows-1250", "Cp1250"); + historicalNames.put("windows-1251", "Cp1251"); + historicalNames.put("windows-1252", "Cp1252"); + historicalNames.put("windows-1253", "Cp1253"); + historicalNames.put("windows-1254", "Cp1254"); + historicalNames.put("windows-1255", "Cp1255"); + historicalNames.put("windows-1256", "Cp1256"); + historicalNames.put("windows-1257", "Cp1257"); + historicalNames.put("windows-1258", "Cp1258"); + historicalNames.put("windows-31j", "MS932"); + historicalNames.put("x-Big5-Solaris", "Big5_Solaris"); + historicalNames.put("x-euc-jp-linux", "EUC_JP_LINUX"); + historicalNames.put("x-EUC-TW", "EUC_TW"); + historicalNames.put("x-eucJP-Open", "EUC_JP_Solaris"); + historicalNames.put("x-IBM1006", "Cp1006"); + historicalNames.put("x-IBM1025", "Cp1025"); + historicalNames.put("x-IBM1046", "Cp1046"); + historicalNames.put("x-IBM1097", "Cp1097"); + historicalNames.put("x-IBM1098", "Cp1098"); + historicalNames.put("x-IBM1112", "Cp1112"); + historicalNames.put("x-IBM1122", "Cp1122"); + historicalNames.put("x-IBM1123", "Cp1123"); + historicalNames.put("x-IBM1124", "Cp1124"); + historicalNames.put("x-IBM1381", "Cp1381"); + historicalNames.put("x-IBM1383", "Cp1383"); + historicalNames.put("x-IBM33722", "Cp33722"); + historicalNames.put("x-IBM737", "Cp737"); + historicalNames.put("x-IBM856", "Cp856"); + historicalNames.put("x-IBM874", "Cp874"); + historicalNames.put("x-IBM875", "Cp875"); + historicalNames.put("x-IBM921", "Cp921"); + historicalNames.put("x-IBM922", "Cp922"); + historicalNames.put("x-IBM930", "Cp930"); + historicalNames.put("x-IBM933", "Cp933"); + historicalNames.put("x-IBM935", "Cp935"); + historicalNames.put("x-IBM937", "Cp937"); + historicalNames.put("x-IBM939", "Cp939"); + historicalNames.put("x-IBM942", "Cp942"); + historicalNames.put("x-IBM942C", "Cp942C"); + historicalNames.put("x-IBM943", "Cp943"); + historicalNames.put("x-IBM943C", "Cp943C"); + historicalNames.put("x-IBM948", "Cp948"); + historicalNames.put("x-IBM949", "Cp949"); + historicalNames.put("x-IBM949C", "Cp949C"); + historicalNames.put("x-IBM950", "Cp950"); + historicalNames.put("x-IBM964", "Cp964"); + historicalNames.put("x-IBM970", "Cp970"); + historicalNames.put("x-ISCII91", "ISCII91"); + historicalNames.put("x-ISO-2022-CN-CNS", "ISO2022CN"); + historicalNames.put("x-ISO-2022-CN-GB", "ISO2022CN"); + historicalNames.put("x-JISAutoDetect", "JISAutoDetect"); + historicalNames.put("x-MacArabic", "MacArabic"); + historicalNames.put("x-MacCentralEurope", "MacCentralEurope"); + historicalNames.put("x-MacCroatian", "MacCroatian"); + historicalNames.put("x-MacCyrillic", "MacCyrillic"); + historicalNames.put("x-MacDingbat", "MacDingbat"); + historicalNames.put("x-MacGreek", "MacGreek"); + historicalNames.put("x-MacHebrew", "MacHebrew"); + historicalNames.put("x-MacIceland", "MacIceland"); + historicalNames.put("x-MacRoman", "MacRoman"); + historicalNames.put("x-MacRomania", "MacRomania"); + historicalNames.put("x-MacSymbol", "MacSymbol"); + historicalNames.put("x-MacThai", "MacThai"); + historicalNames.put("x-MacTurkish", "MacTurkish"); + historicalNames.put("x-MacUkraine", "MacUkraine"); + historicalNames.put("x-MS950-HKSCS", "MS950_HKSCS"); + historicalNames.put("x-mswin-936", "MS936"); + historicalNames.put("x-PCK", "PCK"); + historicalNames.put("x-windows-874", "MS874"); + historicalNames.put("x-windows-949", "MS949"); + historicalNames.put("x-windows-950", "MS950"); + } + + public static String getHistoricalName(String name) { + return (!historicalNames.containsKey(name) ? name : historicalNames + .get(name)); + } +} Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/HistoricalNamesUtil.java ------------------------------------------------------------------------------ svn:eol-style = native Added: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java?rev=726938&view=auto ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java (added) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java Mon Dec 15 20:02:03 2008 @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.harmony.luni.tests.util; + +import org.apache.harmony.luni.util.HistoricalNamesUtil; + +import junit.framework.TestCase; + +public class HistoricalNamesUtilTest extends TestCase { + + public void test_getHistoricalName_Exist() { + assertEquals("Big5_HKSCS", HistoricalNamesUtil + .getHistoricalName("Big5_HKSCS")); + assertEquals("EUC_JP", HistoricalNamesUtil.getHistoricalName("EUC-JP")); + assertEquals("EUC_KR", HistoricalNamesUtil.getHistoricalName("EUC-KR")); + assertEquals("EUC_CN", HistoricalNamesUtil.getHistoricalName("GB2312")); + assertEquals("Cp838", HistoricalNamesUtil.getHistoricalName("IBM-Thai")); + assertEquals("SJIS", HistoricalNamesUtil.getHistoricalName("Shift_JIS")); + assertEquals("UnicodeBigUnmarked", HistoricalNamesUtil + .getHistoricalName("UTF-16BE")); + assertEquals("MS932", HistoricalNamesUtil + .getHistoricalName("windows-31j")); + assertEquals("Big5_Solaris", HistoricalNamesUtil + .getHistoricalName("x-Big5-Solaris")); + assertEquals("MacCroatian", HistoricalNamesUtil + .getHistoricalName("x-MacCroatian")); + } + + public void test_getHistoricalName_NotExist() { + assertEquals("notexist", HistoricalNamesUtil + .getHistoricalName("notexist")); + } + + public void test_getHistoricalName_Null() { + assertNull(HistoricalNamesUtil.getHistoricalName(null)); + } +} Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/HistoricalNamesUtilTest.java ------------------------------------------------------------------------------ svn:eol-style = native