harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r373510 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src: main/java/java/nio/charset/ test/java/org/apache/harmony/tests/java/ test/java/org/apache/harmony/tests/java/nio/ test/java/org/apache/harmony/tests/java/nio/char...
Date Mon, 30 Jan 2006 13:29:06 GMT
Author: tellison
Date: Mon Jan 30 05:28:59 2006
New Revision: 373510

URL: http://svn.apache.org/viewcvs?rev=373510&view=rev
Log:
Fix for HARMONY-45 (Charset.isRegistered() method always return true)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/AllTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/nio_char/AllTests.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java?rev=373510&r1=373509&r2=373510&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/java/nio/charset/Charset.java
Mon Jan 30 05:28:59 2006
@@ -559,12 +559,15 @@
 	}
 
 	/**
-	 * Answers whether this charset is registered in the IANA Charset Registry.
+	 * Answers whether this charset is known to be registered in the
+	 * IANA Charset Registry.
 	 * 
-	 * @return true
+	 * @return true if the charset is known to be registered, otherwise
+	 * 	returns false.
 	 */
 	public final boolean isRegistered() {
-		return true;
+		return !canonicalName.startsWith("x-") &&
+			!canonicalName.startsWith("X-");
 	}
 
 	/**

Added: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/AllTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/AllTests.java?rev=373510&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/AllTests.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/AllTests.java
Mon Jan 30 05:28:59 2006
@@ -0,0 +1,36 @@
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.tests.java.nio.charset;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(AllTests.suite());
+	}
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.apache.harmony.tests.java.nio.charset");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(CharsetTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}

Added: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java?rev=373510&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java
Mon Jan 30 05:28:59 2006
@@ -0,0 +1,64 @@
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.tests.java.nio.charset;
+
+import java.nio.charset.Charset;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+public class CharsetTest extends TestCase {
+
+	// Will contain names of charsets registered with IANA
+	Set knownRegisteredCharsets = new HashSet();
+
+	// Will contain names of charsets not known to be registered with IANA
+	Set unknownRegisteredCharsets = new HashSet();
+
+	/**
+	 * JUnit set-up method
+	 */
+	public void setUp() {
+		// Populate the known charset vars
+		Set names = Charset.availableCharsets().keySet();
+		for (Iterator nameItr = names.iterator(); nameItr.hasNext();) {
+			String name = (String) nameItr.next();
+			if (name.toLowerCase().startsWith("x-"))
+				unknownRegisteredCharsets.add(name);
+			else
+				knownRegisteredCharsets.add(name);
+		}
+	}
+
+	/**
+	 * @tests java.nio.charset.Charset#isRegistered()
+	 */
+	public void test_isRegistered() {
+		// Regression for HARMONY-45
+		for (Iterator nameItr = knownRegisteredCharsets.iterator(); nameItr.hasNext();) {
+			String name = (String) nameItr.next();
+			assertTrue("Assert 0: isRegistered() failed for " + name,
+					Charset.forName(name).isRegistered());
+		}
+		for (Iterator nameItr = unknownRegisteredCharsets.iterator(); nameItr.hasNext();) {
+			String name = (String) nameItr.next();
+			assertFalse("Assert 0: isRegistered() failed for " + name,
+					Charset.forName(name).isRegistered());
+		}
+	}
+}

Added: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/nio_char/AllTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/nio_char/AllTests.java?rev=373510&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/nio_char/AllTests.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/src/test/java/org/apache/harmony/tests/nio_char/AllTests.java
Mon Jan 30 05:28:59 2006
@@ -0,0 +1,35 @@
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed 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.tests.nio_char;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(AllTests.suite());
+	}
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test for org.apache.harmony.tests.nio_char");
+		// $JUnit-BEGIN$
+		suite.addTest(org.apache.harmony.tests.java.nio.charset.AllTests.suite());
+		// $JUnit-END$
+		return suite;
+	}
+
+}



Mime
View raw message