You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2010/09/21 22:21:44 UTC

svn commit: r999591 - in /harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang: SecurityManagerTest.java String2Test.java

Author: tellison
Date: Tue Sep 21 20:21:44 2010
New Revision: 999591

URL: http://svn.apache.org/viewvc?rev=999591&view=rev
Log:
Apply regression test for HARMONY-6649 (String.toLowerCase/toUpperCase incorrect for supplementary characters)

Modified:
    harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java
    harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java?rev=999591&r1=999590&r2=999591&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManagerTest.java Tue Sep 21 20:21:44 2010
@@ -292,6 +292,30 @@ public class SecurityManagerTest extends
     }
 
     /**
+     * @tests {@link java.lang.SecurityManager#checkExit(int)}
+     */
+
+    @SuppressWarnings("nls")
+    public void test_checkExit_int1() {
+        SecurityManager mySecMngr = new SecurityManager(){
+            public void checkPermission(Permission permission) {
+                if (!permission.equals(new RuntimePermission("exitVM.1") )) {
+                    throw new SecurityException("unknown permission");
+                }
+            }
+        };
+
+        mySecMngr.checkExit(1);
+
+        try {
+            mySecMngr.checkExit(2);
+            fail("Should throw SecurityException");
+        } catch (SecurityException se) {
+            // expected
+        }
+    }
+
+    /**
      * @tests {@link java.lang.SecurityManager#checkLink(String)}
      */
     @SuppressWarnings("nls")

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java?rev=999591&r1=999590&r2=999591&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java Tue Sep 21 20:21:44 2010
@@ -793,11 +793,14 @@ public class String2Test extends junit.f
                 .toLowerCase().equals(hwlc));
 
         assertEquals(
-                "a) Sigma has same lower case value at end of word with Unicode 3.0",
+                "a) Sigma has ordinary lower case value when isolated with Unicode 4.0",
                 "\u03c3", "\u03a3".toLowerCase());
         assertEquals(
-                "b) Sigma has same lower case value at end of word with Unicode 3.0",
-                "a \u03c3", "a \u03a3".toLowerCase());
+                "b) Sigma has final form lower case value at end of word with Unicode 4.0",
+                "a\u03c2", "a\u03a3".toLowerCase());
+        
+        assertEquals("toLowerCase case conversion did not succeed",
+        		"\uD801\uDC44", "\uD801\uDC1C".toLowerCase());
     }
 
     /**
@@ -835,6 +838,8 @@ public class String2Test extends junit.f
         String s = "a\u00df\u1f56";
         assertTrue("Invalid conversion", !s.toUpperCase().equals(s));
 
+        assertEquals("toUpperCase case conversion did not succeed",
+        		"\uD801\uDC1C", "\uD801\uDC44".toUpperCase());
     }
 
     /**