test/java/util/regex/RegExTest.java

*** 30,40 ****
   * @bug 4481568 4482696 4495089 4504687 4527731 4599621 4631553 4619345
   * 4630911 4672616 4711773 4727935 4750573 4792284 4803197 4757029 4808962
   * 4872664 4803179 4892980 4900747 4945394 4938995 4979006 4994840 4997476
   * 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940
   * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
!  * 6350801 6676425 6878475 6919132 6931676
   */
  
  import java.util.regex.*;
  import java.util.Random;
  import java.io.*;
--- 30,40 ----
   * @bug 4481568 4482696 4495089 4504687 4527731 4599621 4631553 4619345
   * 4630911 4672616 4711773 4727935 4750573 4792284 4803197 4757029 4808962
   * 4872664 4803179 4892980 4900747 4945394 4938995 4979006 4994840 4997476
   * 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940
   * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
!  * 6350801 6676425 6878475 6919132 6931676 6948903
   */
  
  import java.util.regex.*;
  import java.util.Random;
  import java.io.*;
*** 133,143 ****
          hitEndTest();
          toMatchResultTest();
          surrogatesInClassTest();
          namedGroupCaptureTest();
          nonBmpClassComplementTest();
! 
          if (failure)
              throw new RuntimeException("Failure in the RE handling.");
          else
              System.err.println("OKAY: All tests passed.");
      }
--- 133,143 ----
          hitEndTest();
          toMatchResultTest();
          surrogatesInClassTest();
          namedGroupCaptureTest();
          nonBmpClassComplementTest();
!         unicodePropertiesTest();
          if (failure)
              throw new RuntimeException("Failure in the RE handling.");
          else
              System.err.println("OKAY: All tests passed.");
      }
*** 3513,3523 ****
          checkExpectedFail(Pattern.compile("(?<gname>abc)(def)").matcher("abcdef"),
                            null);
          report("NamedGroupCapture");
      }
  
!     // This is for bug 6919132
      private static void nonBmpClassComplementTest() throws Exception {
          Pattern p = Pattern.compile("\\P{Lu}");
          Matcher m = p.matcher(new String(new int[] {0x1d400}, 0, 1));
          if (m.find() && m.start() == 1)
              failCount++;
--- 3513,3523 ----
          checkExpectedFail(Pattern.compile("(?<gname>abc)(def)").matcher("abcdef"),
                            null);
          report("NamedGroupCapture");
      }
  
!     // This is for bug 6969132
      private static void nonBmpClassComplementTest() throws Exception {
          Pattern p = Pattern.compile("\\P{Lu}");
          Matcher m = p.matcher(new String(new int[] {0x1d400}, 0, 1));
          if (m.find() && m.start() == 1)
              failCount++;
*** 3537,3542 ****
--- 3537,3617 ----
              failCount++;
  
          report("NonBmpClassComplement");
      }
  
+     private static void unicodePropertiesTest() throws Exception {
+         // different forms
+         if (!Pattern.compile("\\p{IsLu}").matcher("A").matches() ||
+             !Pattern.compile("\\p{Lu}").matcher("A").matches() ||
+             !Pattern.compile("\\p{gc=Lu}").matcher("A").matches() ||
+             !Pattern.compile("\\p{general_category=Lu}").matcher("A").matches() ||
+             !Pattern.compile("\\p{IsLatin}").matcher("B").matches() ||
+             !Pattern.compile("\\p{sc=Latin}").matcher("B").matches() ||
+             !Pattern.compile("\\p{script=Latin}").matcher("B").matches() ||
+             !Pattern.compile("\\p{InBasicLatin}").matcher("c").matches() ||
+             !Pattern.compile("\\p{blk=BasicLatin}").matcher("c").matches() ||
+             !Pattern.compile("\\p{block=BasicLatin}").matcher("c").matches())
+             failCount++;
+ 
+         Matcher common  = Pattern.compile("\\p{script=Common}").matcher("");
+         Matcher unknown = Pattern.compile("\\p{IsUnknown}").matcher("");
+         Matcher lastSM  = common;
+         Character.UnicodeScript lastScript = Character.UnicodeScript.of(0);
+ 
+         Matcher latin  = Pattern.compile("\\p{block=basic_latin}").matcher("");
+         Matcher greek  = Pattern.compile("\\p{InGreek}").matcher("");
+         Matcher lastBM = latin;
+         Character.UnicodeBlock lastBlock = Character.UnicodeBlock.of(0);
+ 
+         for (int cp = 1; cp < Character.MAX_CODE_POINT; cp++) {
+             if (cp >= 0x30000 && (cp & 0x70) == 0){
+                 continue;  // only pick couple code points, they are the same
+             }
+ 
+             // Unicode Script
+             Character.UnicodeScript script = Character.UnicodeScript.of(cp);
+             Matcher m;
+             String str = new String(Character.toChars(cp));
+             if (script == lastScript) {
+                  m = lastSM;
+                  m.reset(str);
+             } else {
+                  m  = Pattern.compile("\\p{Is" + script.name() + "}").matcher(str);
+             }
+             if (!m.matches()) {
+                 failCount++;
+             }
+             Matcher other = (script == Character.UnicodeScript.COMMON)? unknown : common;
+             other.reset(str);
+             if (other.matches()) {
+                 failCount++;
+             }
+             lastSM = m;
+             lastScript = script;
+ 
+             // Unicode Block
+             Character.UnicodeBlock block = Character.UnicodeBlock.of(cp);
+             if (block == null) {
+                 //System.out.printf("Not a Block: cp=%x%n", cp);
+                 continue;
+             }
+             if (block == lastBlock) {
+                  m = lastBM;
+                  m.reset(str);
+             } else {
+                  m  = Pattern.compile("\\p{block=" + block.toString() + "}").matcher(str);
+             }
+             if (!m.matches()) {
+                 failCount++;
+             }
+             other = (block == Character.UnicodeBlock.BASIC_LATIN)? greek : latin;
+             other.reset(str);
+             if (other.matches()) {
+                 failCount++;
+             }
+             lastBM = m;
+             lastBlock = block;
+         }
+         report("unicodeProperties");
+     }
  }