ICU-8676 remove the range check and Exception throwing from getCombiningClass()

X-SVN-Rev: 30270

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
index ba424ae008916e846204bda73799b1832b723ab4..5b4613df429f01c715f65e3438caaf1064128b37 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
@@ -3886,9 +3886,6 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
      */
     public static int getCombiningClass(int ch)
     {
-        if (ch < MIN_VALUE || ch > MAX_VALUE) {
-            throw new IllegalArgumentException("Codepoint out of bounds");
-        }
         return Norm2AllModes.getNFCInstance().decomp.getCombiningClass(ch);
     }
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
index 12b4aa020577dea25a9a973415d8bc4fed2781be..473f854c6bf1370c6888cd30005643d838d47b59 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
@@ -2651,17 +2651,18 @@ public final class UCharacterTest extends TestFmwk
             try{
                 UCharacter.getCombiningClass(valid_tests[i]);
             } catch(Exception e){
-                errln("UCharacter.getCombiningClass(int) was not suppose to have " +
+                errln("UCharacter.getCombiningClass(int) was not supposed to have " +
                         "an exception. Value passed: " + valid_tests[i]);
             }
         }
             
         for(int i=0; i< invalid_tests.length; i++){
             try{
-                UCharacter.getCombiningClass(invalid_tests[i]);
-                errln("UCharacter.getCombiningClass(int) was suppose to have " +
-                        "an exception. Value passed: " + invalid_tests[i]);
+                assertEquals("getCombiningClass(out of range)",
+                             0, UCharacter.getCombiningClass(invalid_tests[i]));
             } catch(Exception e){
+                errln("UCharacter.getCombiningClass(int) was not supposed to have " +
+                        "an exception. Value passed: " + invalid_tests[i]);
             }
         }
     }