From: Markus Scherer <markus.icu@gmail.com>
Date: Fri, 1 Jul 2011 22:39:23 +0000 (+0000)
Subject: ICU-8676 remove the range check and Exception throwing from getCombiningClass()
X-Git-Tag: milestone-59-0-1~4688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab842070fd77fb04b5fc17bd08ffd98ca6853b61;p=icu

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 ba424ae0089..5b4613df429 100644
--- 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 12b4aa02057..473f854c6bf 100644
--- 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]);
             }
         }
     }