commit 64aee2b910b6f224003e6f29eea2a583de21e49d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 25 17:32:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 25 17:32:59 2018 +0000
tree 5cd21b10b3edbec0c9b61d87ca3307495207631a
parent 4bbec76841077a51b59978fcb7973bb6d96f3433
parent 25ebaa052bae22bd658de5ca71b431f4e16ce910

Merge "Libcore: Suppress InvalidPatternSyntax warning in tests"

luni/src/test/java/libcore/java/lang/OldStringTest.java

diff --git a/luni/src/test/java/libcore/java/lang/OldStringTest.java b/luni/src/test/java/libcore/java/lang/OldStringTest.java
index 33c3215..2913a63 100644
--- a/luni/src/test/java/libcore/java/lang/OldStringTest.java
+++ b/luni/src/test/java/libcore/java/lang/OldStringTest.java
@@ -166,6 +166,7 @@
         assertEquals("Returned incorrect string.", hw1, hw1.replace("!", "."));
     }
 
+    @SuppressWarnings("InvalidPatternSyntax")
     public void test_replaceAll() {
         String str = "!'123123.123HelloWorld!123123helloworld#";
         String [] patterns = {"[hw\\p{Upper}]", "(o|l){2,}", "([\'\"]?)(\\d+)",
@@ -188,6 +189,7 @@
         }
     }
 
+    @SuppressWarnings("InvalidPatternSyntax")
     public void test_replaceFirst() {
         String str = "!'123123.123HelloWorld!123123helloworld#";
         String [] patterns = {"[hw\\p{Upper}]", "(o|l){2,}", "([\'\"]?)(\\d+)",
@@ -210,6 +212,7 @@
         }
     }
 
+    @SuppressWarnings("InvalidPatternSyntax")
     public void test_splitLString() {
         String str = "!'123123.123HelloWorld!123123helloworld#";
         String [] patterns = {"[!.1]", "(\\d+).*e(l+)o.*orld"};
@@ -230,6 +233,7 @@
         }
     }
 
+    @SuppressWarnings("InvalidPatternSyntax")
     public void test_splitLStringLint() {
         String str = "!'123123.123HelloWorld!123123helloworld#";
         String pattern = "[!.1]";

luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java

diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
index 16ca126..5c8996a 100644
--- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
@@ -15,6 +15,7 @@
         assertArraysEqual(expected, results);
     }
 
+    @SuppressWarnings("InvalidPatternSyntax")
     public void testEmptySplits() {
         // Trailing empty matches are removed.
         assertArraysEqual(new String[0], "hello".split("."));