Code drop from //branches/cupcake/...@124589

12 files changed, 399 insertions, 360 deletions

diff --git a/regex/src/main/java/java/util/regex/MatchResult.java b/regex/src/main/java/java/util/regex/MatchResult.java
index a9b87c6..fa67ba6 100644
--- a/regex/src/main/java/java/util/regex/MatchResult.java
+++ b/regex/src/main/java/java/util/regex/MatchResult.java
@@ -28,8 +28,8 @@ package java.util.regex;
  * 
  * @since Android 1.0
  */
-public interface MatchResult
-{
+public interface MatchResult {
+
     /**
      * Returns the index of the first character following the text that matched
      * the whole regular expression. 
@@ -38,7 +38,7 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public int end();
+    int end();
 
     /**
      * Returns the index of the first character following the text that matched
@@ -52,7 +52,7 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public int end(int group);
+    int end(int group);
 
     /**
      * Returns the text that matched the whole regular expression. 
@@ -61,7 +61,7 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public String group();
+    String group();
 
     /**
      * Returns the text that matched a given group of the regular expression.
@@ -74,7 +74,7 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public String group(int group);
+    String group(int group);
 
     /**
      * Returns the number of groups in the result, which is always equal to
@@ -84,7 +84,7 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public int groupCount();
+    int groupCount();
 
     /**
      * Returns the index of the first character of the text that matched
@@ -94,7 +94,7 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public int start();
+    int start();
 
     /**
      * Returns the index of the first character of the text that matched a given
@@ -108,6 +108,5 @@ public interface MatchResult
      * 
      * @since Android 1.0
      */
-    public int start(int group);
-
+    int start(int group);
 }
diff --git a/regex/src/main/java/java/util/regex/Matcher.java b/regex/src/main/java/java/util/regex/Matcher.java
index a65977a..e3e4874 100644
--- a/regex/src/main/java/java/util/regex/Matcher.java
+++ b/regex/src/main/java/java/util/regex/Matcher.java
@@ -765,9 +765,14 @@ public final class Matcher implements MatchResult {
     }
 
     @Override
-    protected void finalize() {
-        if (nativePattern != 0) {
-            NativeRegEx.close(nativePattern);
+    protected void finalize() throws Throwable {
+        try {
+            if (nativePattern != 0) {
+                NativeRegEx.close(nativePattern);
+            }
+        }
+        finally {
+            super.finalize();
         }
     }
     
diff --git a/regex/src/main/java/java/util/regex/Pattern.java b/regex/src/main/java/java/util/regex/Pattern.java
index 88be77b..c058db8 100644
--- a/regex/src/main/java/java/util/regex/Pattern.java
+++ b/regex/src/main/java/java/util/regex/Pattern.java
@@ -455,9 +455,14 @@ public final class Pattern implements Serializable {
     }
 
     @Override
-    protected void finalize() {
-        if (mNativePattern != 0) {
-            NativeRegEx.close(mNativePattern);
+    protected void finalize() throws Throwable {
+        try {
+            if (mNativePattern != 0) {
+                NativeRegEx.close(mNativePattern);
+            }
+        }
+        finally {
+            super.finalize();
         }
     }
 
diff --git a/regex/src/main/java/java/util/regex/package.html b/regex/src/main/java/java/util/regex/package.html
index 1a1e653..0508f3e 100644
--- a/regex/src/main/java/java/util/regex/package.html
+++ b/regex/src/main/java/java/util/regex/package.html
@@ -409,7 +409,7 @@
           [a]
         </td>
         <td>
-          The character set consisting of the letter 'x' only.
+          The character set consisting of the letter 'a' only.
         </td>
       </tr>
       <tr>
@@ -418,7 +418,7 @@
         </td>
         <td>
           The character set consisting of the letters 'x', 'y', and 'z',
-          described by explicit enmeration.
+          described by explicit enumeration.
         </td>
       </tr>
       <tr>
@@ -528,8 +528,8 @@
         </td>
         <td>
           The Posix set with the specified NAME (\p{}) or the opposite
-          of it (\P{})- Legal values for NAME are 'Alnum', 'Alpha', 'ASCII',
-          'Blank', 'Cntrl', 'Digit', 'Graph', 'Lower', 'Print', 'Prunct',
+          of it (\P{}) - Legal values for NAME are 'Alnum', 'Alpha', 'ASCII',
+          'Blank', 'Cntrl', 'Digit', 'Graph', 'Lower', 'Print', 'Punct',
           'Upper', 'XDigit' .
         </td>
       </tr>
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java
index 8cd8841..a15adae 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java
@@ -19,7 +19,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import junit.framework.TestCase;
 import java.util.regex.*;
@@ -32,8 +32,8 @@ import java.util.regex.*;
 public class Matcher2Test extends TestCase {
     
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the basic functionality of toString() method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies the basic functionality of toString() method.",
             targets = { @TestTarget(methodName = "toString", 
                                     methodArgs = {})                                    
             }
@@ -45,8 +45,8 @@ public class Matcher2Test extends TestCase {
     }
    
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies start, end, group, usePattern methods " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies start, end, group, usePattern methods " +
                     "with wrong conditions, IllegalStateException should be " +
                     "thrown",
             targets = { @TestTarget(methodName = "start", 
@@ -117,8 +117,8 @@ public class Matcher2Test extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies end, start, group methods with wrong " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies end, start, group methods with wrong " +
                     "conditions, IndexOutOfBoundsException, " +
                     "IllegalStateException should be thrown",
             targets = { @TestTarget(methodName = "start", 
@@ -269,8 +269,8 @@ public class Matcher2Test extends TestCase {
      * Regression test for HARMONY-997
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that IndexOutOfBoundsException " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies that IndexOutOfBoundsException " +
                     "exception is thrown while calling of replaceAll " +
                     "method with incorrect string.",
             targets = { @TestTarget(methodName = "replaceAll", 
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
index 187c1e5..91da9e4 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
@@ -20,7 +20,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import junit.framework.TestCase;
 import java.util.regex.Matcher;
@@ -42,9 +42,9 @@ public class MatcherTest extends TestCase {
             "(((a)|(b))*)aabb", "(((a)|(b))*)aa(b)b", "(((a)|(b))*)a(a(b)b)" };
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies appendReplacement(StringBuffer sb, " +
-                    "String replacement) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies appendReplacement(StringBuffer sb, " +
+                    "String replacement) method. Doesn't verify exceptions.",
             targets = { @TestTarget(methodName = "appendReplacement", 
                                     methodArgs = { java.lang.StringBuffer.class,
                                                    java.lang.String.class })                         
@@ -63,9 +63,9 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies appendReplacement(StringBuffer sb, " +
-                    "String replacement) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies appendReplacement(StringBuffer sb, " +
+                    "String replacement) method. Doesn\'t verify exceptions.",
             targets = { @TestTarget(methodName = "appendReplacement", 
                                     methodArgs = { java.lang.StringBuffer.class,
                                                    java.lang.String.class })                         
@@ -84,8 +84,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies replaceAll(String replacement) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies replaceAll(String replacement) method.",
             targets = { @TestTarget(methodName = "replaceAll", 
                                     methodArgs = {java.lang.String.class}) 
             }
@@ -104,8 +104,8 @@ public class MatcherTest extends TestCase {
      * test reset(String) method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the reset(CharSequence input) method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the reset(CharSequence input) method.",
             targets = { @TestTarget(methodName = "reset", 
                                     methodArgs = {java.lang.CharSequence.class})                         
             }
@@ -125,9 +125,10 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies appendReplacement(StringBuffer sb, " +
-                    "String replacement) method with string of slashes as a parameter.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies appendReplacement(StringBuffer sb, " +
+                    "String replacement) method with string of slashes as a parameter." +
+                    "Doesn't verify exceptions.",
             targets = { @TestTarget(methodName = "appendReplacement", 
                                     methodArgs = { java.lang.StringBuffer.class,
                                                    java.lang.String.class })                         
@@ -145,8 +146,8 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies replaceFirst(String replacement) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies replaceFirst(String replacement) method. ",
             targets = { @TestTarget(methodName = "replaceFirst", 
                                     methodArgs = {java.lang.String.class}) 
             }
@@ -160,8 +161,8 @@ public class MatcherTest extends TestCase {
         assertEquals("zzzcatzzzdogzzz", mat.replaceFirst("cat"));
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies pattern() method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies pattern() method.",
             targets = { @TestTarget(methodName = "pattern", 
                                     methodArgs = {})
             }
@@ -183,8 +184,8 @@ public class MatcherTest extends TestCase {
      * test reset() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the reset() method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the reset() method. ",
             targets = { @TestTarget(methodName = "reset", 
                                     methodArgs = {})                         
             }
@@ -204,8 +205,8 @@ public class MatcherTest extends TestCase {
      * Class under test for String group(int)
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies group(int group) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies group(int group) method.",
             targets = { @TestTarget(methodName = "group", 
                                     methodArgs = { int.class })                                            
             }
@@ -254,8 +255,8 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies group() and group(int group) methods.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies group() and group(int group) methods.",
             targets = { @TestTarget(methodName = "group", 
                                     methodArgs = {}),
                         @TestTarget(methodName = "group", 
@@ -289,8 +290,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies group(int group) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies group(int group) method.",
             targets = { @TestTarget(methodName = "group", 
                                     methodArgs = { int.class })                                            
             }
@@ -308,8 +309,8 @@ public class MatcherTest extends TestCase {
      * test hasAnchoringBounds() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that hasAnchoringBounds method returns" +
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies that hasAnchoringBounds method returns" +
                     " correct value.",
             targets = { @TestTarget(methodName = "hasAnchoringBounds", 
                                     methodArgs = {})                         
@@ -338,10 +339,10 @@ public class MatcherTest extends TestCase {
      * test hasTransparentBounds() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that hasTransparentBound method returns" +
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies that hasTransparentBound method returns" +
                     " correct value.",
-            targets = { @TestTarget(methodName = "hasTransparentBound", 
+            targets = { @TestTarget(methodName = "hasTransparentBounds", 
                                     methodArgs = {})                         
             }
     )  
@@ -368,8 +369,8 @@ public class MatcherTest extends TestCase {
      * test start(int) method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the start(int group) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies the start(int group) method.",
             targets = { @TestTarget(methodName = "start", 
                                     methodArgs = {int.class})                         
             }
@@ -401,8 +402,8 @@ public class MatcherTest extends TestCase {
      * test end(int) method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the basic functionality of end(int group) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies the basic functionality of end(int group) method.",
             targets = { @TestTarget(methodName = "end", 
                                     methodArgs = {int.class})                         
             }
@@ -429,8 +430,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() method in miscellaneous cases.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() method in miscellaneous cases.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})                                            
             }
@@ -464,8 +465,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "Stress test for matches() method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Stress test for matches() method.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})                                            
             }
@@ -510,8 +511,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() and group(int group) methods" +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() and group(int group) methods" +
                     " for specific pattern.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {}),
@@ -540,8 +541,8 @@ public class MatcherTest extends TestCase {
      * test lookingAt() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that lookingAt() method returns" +
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies that lookingAt() method returns" +
                     " correct value.",
             targets = { @TestTarget(methodName = "lookingAt", 
                                     methodArgs = {})                         
@@ -565,8 +566,8 @@ public class MatcherTest extends TestCase {
      * Class under test for boolean find()
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that find() method returns" +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies that find() method returns" +
                     " correct value.",
             targets = { @TestTarget(methodName = "find", 
                                     methodArgs = {})                         
@@ -606,8 +607,9 @@ public class MatcherTest extends TestCase {
      * test find (int) method. Created via modifying method for find
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the basic functionality of find(int start) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies the basic functionality of find(int start) " +
+                    "method. Doesn't verify IndexOutOfBoundsException.",
             targets = { @TestTarget(methodName = "find", 
                                     methodArgs = {int.class})                         
             }
@@ -648,9 +650,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies matches() method for predefined " +
-                    "characters in sequence.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() method for predefined.",
             targets = { @TestTarget(methodName = "replaceFirst", 
                                     methodArgs = {java.lang.String.class}) 
             }
@@ -667,8 +668,8 @@ public class MatcherTest extends TestCase {
      * test start() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the start() method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies the start() method.",
             targets = { @TestTarget(methodName = "start", 
                                     methodArgs = {})                         
             }
@@ -697,8 +698,8 @@ public class MatcherTest extends TestCase {
      * test end() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the basic functionality of end() method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies the basic functionality of end() method. ",
             targets = { @TestTarget(methodName = "end", 
                                     methodArgs = {})                         
             }
@@ -722,8 +723,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies groupCount() method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies groupCount() method.",
             targets = { @TestTarget(methodName = "groupCount", 
                                     methodArgs = {})                                    
             }
@@ -737,8 +738,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() and group(int group) methods" +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() and group(int group) methods" +
                     " for specific pattern.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {}),
@@ -757,8 +758,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies find() method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies find() method.",
             targets = { @TestTarget(methodName = "find", 
                                     methodArgs = {})                         
             }
@@ -774,8 +775,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies matches method for input sequence " +
+            level = TestLevel.TODO,
+            purpose = "Verifies matches method for input sequence " +
                     "specified by URL.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})                         
@@ -821,8 +822,8 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "TODO there is no any testing.",
+            level = TestLevel.TODO,
+            purpose = "TODO there is no any testing.",
             targets = { @TestTarget(methodName = "", 
                                     methodArgs = {})                         
             }
@@ -837,8 +838,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "TODO there is no any testing.",
+            level = TestLevel.TODO,
+            purpose = "DOesn't verify anything.",
             targets = { @TestTarget(methodName = "", 
                                     methodArgs = {})                         
             }
@@ -851,8 +852,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() method for " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() method for " +
                     "composite pattern groups.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})                         
@@ -879,8 +880,8 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies  matches() method for specific patterns.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies  matches() method for specific patterns.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})
             }
@@ -905,8 +906,8 @@ public class MatcherTest extends TestCase {
         assertTrue(Pattern.matches("(aa|bb)?+bb", "aabb"));
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() and group(int group) methods" +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() and group(int group) methods" +
                     " for specific pattern.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {}),
@@ -928,8 +929,8 @@ public class MatcherTest extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() and group(int group) methods" +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() and group(int group) methods" +
                     " for specific pattern.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {}),
@@ -954,8 +955,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() method for case insensitive " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() method for case insensitive " +
                     "pattern.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})                                            
@@ -977,8 +978,9 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies quoteReplacement(String s) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies quoteReplacement(String s) method. " +
+                    "Doesn't check negative cases.",
             targets = { @TestTarget(methodName = "quoteReplacement", 
                                     methodArgs = {java.lang.String.class}) 
             }
@@ -988,8 +990,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() and group(int group) methods.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() and group(int group) methods.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {}),
                         @TestTarget(methodName = "group", 
@@ -1022,8 +1024,9 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test doesn't verify Matcher and should be moved to PatterTest",
+            level = TestLevel.PARTIAL,
+            purpose = "The test doesn't verify Matcher and should be moved " +
+                    "to PatterTest",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = { java.lang.String.class, 
                                                    java.lang.CharSequence.class }) 
@@ -1038,8 +1041,9 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test doesn't verify Matcher and should be moved to PatterTest",
+            level = TestLevel.PARTIAL,
+            purpose = "Doesn't verify Matcher and should be moved " +
+                    "to PatterTest",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = { java.lang.String.class, 
                                                    java.lang.CharSequence.class }) 
@@ -1073,8 +1077,9 @@ public class MatcherTest extends TestCase {
 
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test doesn't verify Matcher and should be moved to PatterTest",
+            level = TestLevel.PARTIAL,
+            purpose = "The test doesn't verify Matcher and should be moved to " +
+                    "PatterTest.",
             targets = { @TestTarget(methodName = "split", 
                                     methodArgs = { java.lang.CharSequence.class, 
                                                    int.class }) 
@@ -1090,8 +1095,8 @@ public class MatcherTest extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that find() method works correctly " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies that find() method works correctly " +
                     "with $ pattern.",
             targets = { @TestTarget(methodName = "find", 
                                     methodArgs = {})                         
@@ -1107,8 +1112,8 @@ public class MatcherTest extends TestCase {
      * Verify if the Matcher can match the input when region is changed
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matches() method for the specified region.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies matches() method for the specified region.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})                                            
             }
@@ -1126,8 +1131,8 @@ public class MatcherTest extends TestCase {
     // Test took ages, now going in steps of 16 code points to speed things up.
     // END android-note
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The stress test for matches(String regex) method from String class.",
+            level = TestLevel.PARTIAL,
+            purpose = "The stress test for matches(String regex) method from String class.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {java.lang.String.class})                         
             }
@@ -1171,8 +1176,8 @@ public class MatcherTest extends TestCase {
      * Verify if the Matcher behaves correct when region is changed
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies find() method for specified region in " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies find() method for specified region in " +
                     "positive case.",
             targets = { @TestTarget(methodName = "find", 
                                     methodArgs = {})                         
@@ -1197,8 +1202,8 @@ public class MatcherTest extends TestCase {
      * changed
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies find() method for specified region in " +
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies find() method for specified region in " +
                     "negative case.",
             targets = { @TestTarget(methodName = "find", 
                                     methodArgs = {})                         
@@ -1220,8 +1225,8 @@ public class MatcherTest extends TestCase {
      * test quoteReplacement(String) method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the quoteReplacement(String s) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies the quoteReplacement(String s) method.",
             targets = { @TestTarget(methodName = "lookingAt", 
                                     methodArgs = {java.lang.String.class})                         
             }
@@ -1240,8 +1245,8 @@ public class MatcherTest extends TestCase {
      * test regionStart() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the regionStart() method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the regionStart() method.",
             targets = { @TestTarget(methodName = "regionStart", 
                                     methodArgs = {})                         
             }
@@ -1264,8 +1269,8 @@ public class MatcherTest extends TestCase {
      * test regionEnd() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the regionEnd() method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the regionEnd() method.",
             targets = { @TestTarget(methodName = "regionEnd", 
                                     methodArgs = {})                         
             }
@@ -1288,8 +1293,8 @@ public class MatcherTest extends TestCase {
      * test toMatchResult() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the toMatchResult method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the toMatchResult method.",
             targets = { @TestTarget(methodName = "toMatchResult", 
                                     methodArgs = {})                         
             }
@@ -1316,8 +1321,8 @@ public class MatcherTest extends TestCase {
      * test usePattern(Pattern newPattern) method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the usePattern(Pattern newPattern) method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Verifies the usePattern(Pattern newPattern) method.",
             targets = { @TestTarget(methodName = "usePattern", 
                                     methodArgs = {java.util.regex.Pattern.class})                         
             }
@@ -1343,9 +1348,11 @@ public class MatcherTest extends TestCase {
      * test useAchoringBounds() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies useAnchoringBounds method.",
-            targets = { @TestTarget(methodName = " useAnchoringBounds", 
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies useAnchoringBounds method. " +
+                    "The same verification in assert methods for different " +
+                    "cases.",
+            targets = { @TestTarget(methodName = "useAnchoringBounds", 
                                     methodArgs = {boolean.class})                         
             }
     )    
@@ -1369,8 +1376,8 @@ public class MatcherTest extends TestCase {
      * test useTransparentBounds() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the useTransparentBounds(boolean b) method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the useTransparentBounds(boolean b) method.",
             targets = { @TestTarget(methodName = "useTransparentBounds", 
                                     methodArgs = {boolean.class})                         
             }
@@ -1406,9 +1413,9 @@ public class MatcherTest extends TestCase {
      * test hitEnd() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies that hitEnd() method returns" +
-                    " correct value.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies that hitEnd() method returns" +
+                    " correct value. ",
             targets = { @TestTarget(methodName = "hitEnd", 
                                     methodArgs = {})                         
             }
@@ -1430,8 +1437,8 @@ public class MatcherTest extends TestCase {
      * test requireEnd() method.
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies the requireEnd() method.",
+            level = TestLevel.COMPLETE,
+            purpose = "Verifies the requireEnd() method.",
             targets = { @TestTarget(methodName = "requireEnd", 
                                     methodArgs = {})                         
             }
@@ -1458,8 +1465,8 @@ public class MatcherTest extends TestCase {
      * Regression test for HARMONY-674
      */
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "Special regression test for matches() method.",
+            level = TestLevel.PARTIAL_OK,
+            purpose = "Special regression test for matches() method.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = {})
             }
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java
index 43e4373..e01122d 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java
@@ -19,7 +19,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import junit.framework.TestCase;
 import java.util.regex.Pattern;
@@ -33,8 +33,8 @@ import java.util.regex.PatternSyntaxException;
 @TestTargetClass(Pattern.class)
 public class ModeTest extends TestCase {
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) and " +
+            level = TestLevel.PARTIAL,
+            purpose = "The test verifies compile(String regex) and " +
                     "compile(String regex, int flags) methods with " +
                     "Pattern.CASE_INSENSITIVE mode.",
             targets = { @TestTarget(methodName = "compile", 
@@ -73,8 +73,8 @@ public class ModeTest extends TestCase {
         assertFalse(m.find());
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) and " +
+            level = TestLevel.PARTIAL,
+            purpose = "The test verifies compile(String regex) and " +
                     "compile(String regex, int flags) methods with " +
                     "Pattern.MULTILINE mode.",
             targets = { @TestTarget(methodName = "compile", 
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java
index d5fd425..66b0056 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java
@@ -19,7 +19,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -34,8 +34,8 @@ import junit.framework.TestCase;
 public class Pattern2Test extends TestCase {
     
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies " +
                     "matches(String regex, CharSequence input) method.",
             targets = { @TestTarget(methodName = "matches", 
                                     methodArgs = { java.lang.String.class,
@@ -63,8 +63,8 @@ public class Pattern2Test extends TestCase {
         assertTrue(Pattern.matches("", ""));
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies compile(String regex) method and matcher " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method and matcher " +
                     "for created pattern.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
@@ -127,8 +127,8 @@ public class Pattern2Test extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies compile(String regex) method and matcher " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method and matcher " +
                     "for created pattern.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
@@ -190,8 +190,8 @@ public class Pattern2Test extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies compile(String regex) method and matcher " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method and matcher " +
                     "for created pattern.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
@@ -247,8 +247,8 @@ public class Pattern2Test extends TestCase {
     }
 
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies compile(String regex) method and matcher " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method and matcher " +
                     "for created pattern.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
@@ -453,8 +453,8 @@ public class Pattern2Test extends TestCase {
 //        }
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies patterns with different ranges of characters.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies patterns with different ranges of characters.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
                         @TestTarget(methodName = "matcher", 
@@ -728,8 +728,8 @@ public class Pattern2Test extends TestCase {
         // TODO
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) method and matcher " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method and matcher " +
                     "for patterns with POSIX characters.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
@@ -880,8 +880,8 @@ public class Pattern2Test extends TestCase {
         // TODO
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "TODO empty test.",
+            level = TestLevel.TODO,
+            purpose = "TODO empty test.",
             targets = { @TestTarget(methodName = "", 
                                     methodArgs = {})
                }
@@ -934,8 +934,8 @@ public class Pattern2Test extends TestCase {
         // Cn
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies matcher(CharSequence input) method " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies matcher(CharSequence input) method " +
                     "for input specified by Unicode blocks.",
             targets = { @TestTarget(methodName = "matcher", 
                                     methodArgs = { java.lang.CharSequence.class })
@@ -1011,8 +1011,8 @@ public class Pattern2Test extends TestCase {
         }
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "TODO empty test",
+            level = TestLevel.TODO,
+            purpose = "TODO empty test",
             targets = { @TestTarget(methodName = "", 
                                     methodArgs = {})                                    
             }
@@ -1034,8 +1034,8 @@ public class Pattern2Test extends TestCase {
         // TODO
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "TODO empty test.",
+            level = TestLevel.TODO,
+            purpose = "TODO empty test.",
             targets = { @TestTarget(methodName = "", 
                                     methodArgs = {})
             }
@@ -1060,8 +1060,8 @@ public class Pattern2Test extends TestCase {
         // TODO
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "TODO empty test",
+            level = TestLevel.TODO,
+            purpose = "TODO empty test",
             targets = { @TestTarget(methodName = "", 
                                     methodArgs = {})                                    
             }
@@ -1104,8 +1104,8 @@ public class Pattern2Test extends TestCase {
         // TODO
     }
     @TestInfo(
-            status = TestStatus.TODO,
-            notes = "The test verifies compile(String regex) method and matcher " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method and matcher " +
                     "for created pattern.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class}),
@@ -1173,8 +1173,8 @@ public class Pattern2Test extends TestCase {
         // TODO
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class})
             }
@@ -1186,8 +1186,8 @@ public class Pattern2Test extends TestCase {
         assertTrue(pattern.matcher(name).matches());
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex, int flag) method.",
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex, int flag) method.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class, 
                                                   int.class})
@@ -1203,9 +1203,9 @@ public class Pattern2Test extends TestCase {
         assertTrue(matcher.find(0));
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) and " +
-                    "compile(String regex, int flag) method for" +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) and " +
+                    "compile(String regex, int flag) method for " +
                     "specific patterns.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = { java.lang.String.class }),
@@ -1296,8 +1296,8 @@ public class Pattern2Test extends TestCase {
         assertFalse(m.find());
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex, int flag) method" +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex, int flag) method " +
                     "for specific string.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class, 
@@ -1326,8 +1326,8 @@ public class Pattern2Test extends TestCase {
         assertFalse(found);
     }
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) method" +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) method" +
                     "for specific string.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = {java.lang.String.class})
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java
index b75170a..3b1c6fc 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java
@@ -19,7 +19,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import java.util.regex.Pattern;
 import junit.framework.TestCase;
@@ -31,10 +31,11 @@ import junit.framework.TestCase;
  */
 public class PatternErrorTest extends TestCase {
     @TestInfo(
-            status = TestStatus.LGTM,
-            notes = "The test verifies compile(String regex) and " +
+            level = TestLevel.PARTIAL,
+            purpose = "Verifies compile(String regex) and " +
                     "compile(String regex, int flag) method with " +
-                    "invalid parameters.",
+                    "invalid parameters. Doesn't verify " +
+                    "IllegalArgumentException, PatternSyntaxException.",
             targets = { @TestTarget(methodName = "compile", 
                                     methodArgs = { java.lang.String.class }),
                         @TestTarget(methodName = "compile", 
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
index 7eb6a8e..52e0a84 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
@@ -20,7 +20,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import java.io.Serializable;
 import java.util.regex.Matcher;
@@ -86,8 +86,8 @@ public class PatternTest extends TestCase {
 
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "", targets = {} 
+             level = TestLevel.TODO,
+             purpose = "", targets = {} 
            )          
     public void testMatcher() {
     }
@@ -96,8 +96,8 @@ public class PatternTest extends TestCase {
      * Class under test for String[] split(CharSequence, int)
      */
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of split" +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of split" +
                      "split(java.lang.String, int) method.",
              targets = { @TestTarget(methodName = "split",
                    methodArgs = {java.lang.String.class, int.class})      
@@ -181,8 +181,8 @@ public class PatternTest extends TestCase {
      * Class under test for String[] split(CharSequence)
      */
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of split" +
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of split" +
                      "split(java.lang.String) method.",
              targets = { @TestTarget(methodName = "split",
                    methodArgs = {java.lang.String.class})      
@@ -208,8 +208,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of pattern() method.",
+             level = TestLevel.COMPLETE,
+             purpose = "Verifies the functionality of pattern() method.",
              targets = { @TestTarget(methodName = "pattern",
                    methodArgs = {})      
              }
@@ -227,8 +227,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -266,8 +266,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String)" +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String)" +
                      " method for different flags.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
@@ -447,8 +447,8 @@ public class PatternTest extends TestCase {
      */
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of flags()" +
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of flags()" +
                      " method for default flags.",
              targets = { @TestTarget(methodName = "flags",
                    methodArgs = {})      
@@ -472,8 +472,8 @@ public class PatternTest extends TestCase {
      */
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String, int) &" +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String, int) &" +
                      " flags() methods. Checks that copmilation was corect.",
              targets = { @TestTarget(methodName = "flags",
                    methodArgs = {}),
@@ -499,8 +499,8 @@ public class PatternTest extends TestCase {
      */
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method." +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method." +
                      "Checks that correct exceptions were thrown.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
@@ -562,8 +562,8 @@ public class PatternTest extends TestCase {
      * Class under test for Pattern compile(String)
      */
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method." +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method." +
                      "Checks that correct exceptions were thrown.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
@@ -592,8 +592,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -606,8 +606,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "The test verifies the functionality of compile() method." +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile() method." +
                      " Also tested methods from matcher: matches(), start(int), group(int)",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
@@ -623,9 +623,10 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of matches(java.lang.String," +
-                     "java.lang.CharSequence) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of matches(java.lang.String," +
+                     "java.lang.CharSequence) method. Doesn't verify " +
+                     "PatternSyntaxException.",
              targets = { @TestTarget(methodName = "matches",
                    methodArgs = {java.lang.String.class,
                      java.lang.CharSequence.class})      
@@ -660,8 +661,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of matches(java.lang.String," +
+             level = TestLevel.PARTIAL,
+             purpose = "The test verifies the functionality of matches(java.lang.String," +
                      "java.lang.CharSequence) method.",
              targets = { @TestTarget(methodName = "matches",
                    methodArgs = {java.lang.String.class,
@@ -681,8 +682,8 @@ public class PatternTest extends TestCase {
 // BEGIN android-changed
 // Removed one pattern that is buggy on the JDK. We don't want to duplicate that.
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of matches(java.lang.String," +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of matches(java.lang.String," +
                      "java.lang.CharSequence) method.",
              targets = { @TestTarget(methodName = "matches",
                    methodArgs = {java.lang.String.class,
@@ -723,8 +724,8 @@ public class PatternTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of matches(java.lang.String," +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of matches(java.lang.String," +
                      "java.lang.CharSequence) method for ranged patterns.",
              targets = { @TestTarget(methodName = "matches",
                    methodArgs = {java.lang.String.class,
@@ -755,8 +756,8 @@ public class PatternTest extends TestCase {
  // END android-changed
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of matches(java.lang.String," +
+             level = TestLevel.PARTIAL,
+             purpose = "The test verifies the functionality of matches(java.lang.String," +
                      "java.lang.CharSequence) method.",
              targets = { @TestTarget(methodName = "matches",
                    methodArgs = {java.lang.String.class,
@@ -768,8 +769,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of matcher(java.lang.String) method.",
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of matcher(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "matcher",
                    methodArgs = {java.lang.String.class})      
              }
@@ -782,8 +784,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -793,20 +795,20 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
            )          
-    public void _testBug187() {
+    public void disabled_testBug187() {
         Pattern
                 .compile("|(?idmsux-idmsux)|(?idmsux-idmsux)|[^|\\[-\\0274|\\,-\\\\[^|W\\}\\nq\\x65\\002\\xFE\\05\\06\\00\\x66\\x47i\\,\\xF2\\=\\06\\u0EA4\\x9B\\x3C\\f\\|\\{\\xE5\\05\\r\\u944A\\xCA\\e|\\x19\\04\\x07\\04\\u607B\\023\\0073\\x91Tr\\0150\\x83]]?(?idmsux-idmsux:\\p{Alpha}{7}?)||(?<=[^\\uEC47\\01\\02\\u3421\\a\\f\\a\\013q\\035w\\e])(?<=\\p{Punct}{0,}?)(?=^\\p{Lower})(?!\\b{8,14})(?<![|\\00-\\0146[^|\\04\\01\\04\\060\\f\\u224DO\\x1A\\xC4\\00\\02\\0315\\0351\\u84A8\\xCBt\\xCC\\06|\\0141\\00\\=\\e\\f\\x6B\\0026Tb\\040\\x76xJ&&[\\\\-\\]\\05\\07\\02\\u2DAF\\t\\x9C\\e\\0023\\02\\,X\\e|\\u6058flY\\u954C]]]{5}?)(?<=\\p{Sc}{8}+)[^|\\026-\\u89BA|o\\u6277\\t\\07\\x50&&\\p{Punct}]{8,14}+((?<=^\\p{Punct})|(?idmsux-idmsux)||(?>[\\x3E-\\]])|(?idmsux-idmsux:\\p{Punct})|(?<![\\0111\\0371\\xDF\\u6A49\\07\\u2A4D\\00\\0212\\02Xd-\\xED[^\\a-\\0061|\\0257\\04\\f\\[\\0266\\043\\03\\x2D\\042&&[^\\f-\\]&&\\s]]])|(?>[|\\n\\042\\uB09F\\06\\u0F2B\\uC96D\\x89\\uC166\\xAA|\\04-\\][^|\\a\\|\\rx\\04\\uA770\\n\\02\\t\\052\\056\\0274\\|\\=\\07\\e|\\00-\\x1D&&[^\\005\\uB15B\\uCDAC\\n\\x74\\0103\\0147\\uD91B\\n\\062G\\u9B4B\\077\\}\\0324&&[^\\0302\\,\\0221\\04\\u6D16\\04xy\\uD193\\[\\061\\06\\045\\x0F|\\e\\xBB\\f\\u1B52\\023\\u3AD2\\033\\007\\022\\}\\x66\\uA63FJ-\\0304]]]]{0,0})||(?<![^|\\0154U\\u0877\\03\\fy\\n\\|\\0147\\07-\\=[|q\\u69BE\\0243\\rp\\053\\02\\x33I\\u5E39\\u9C40\\052-\\xBC[|\\0064-\\?|\\uFC0C\\x30\\0060\\x45\\\\\\02\\?p\\xD8\\0155\\07\\0367\\04\\uF07B\\000J[^|\\0051-\\{|\\u9E4E\\u7328\\]\\u6AB8\\06\\x71\\a\\]\\e\\|KN\\u06AA\\0000\\063\\u2523&&[\\005\\0277\\x41U\\034\\}R\\u14C7\\u4767\\x09\\n\\054Ev\\0144\\<\\f\\,Q-\\xE4]]]]]{3}+)|(?>^+)|(?![^|\\|\\nJ\\t\\<\\04E\\\\\\t\\01\\\\\\02\\|\\=\\}\\xF3\\uBEC2\\032K\\014\\uCC5F\\072q\\|\\0153\\xD9\\0322\\uC6C8[^\\t\\0342\\x34\\x91\\06\\{\\xF1\\a\\u1710\\?\\xE7\\uC106\\02pF\\<&&[^|\\]\\064\\u381D\\u50CF\\eO&&[^|\\06\\x2F\\04\\045\\032\\u8536W\\0377\\0017|\\x06\\uE5FA\\05\\xD4\\020\\04c\\xFC\\02H\\x0A\\r]]]]+?)(?idmsux-idmsux)|(?<![|\\r-\\,&&[I\\t\\r\\0201\\xDB\\e&&[^|\\02\\06\\00\\<\\a\\u7952\\064\\051\\073\\x41\\?n\\040\\0053\\031&&[\\x15-\\|]]]]{8,11}?)(?![^|\\<-\\uA74B\\xFA\\u7CD2\\024\\07n\\<\\x6A\\0042\\uE4FF\\r\\u896B\\[\\=\\042Y&&^\\p{ASCII}]++)|(?<![R-\\|&&[\\a\\0120A\\u6145\\<\\050-d[|\\e-\\uA07C|\\016-\\u80D9]]]{1,}+)|(?idmsux-idmsux)|(?idmsux-idmsux)|(?idmsux-idmsux:\\B{6,}?)|(?<=\\D{5,8}?)|(?>[\\{-\\0207|\\06-\\0276\\p{XDigit}])(?idmsux-idmsux:[^|\\x52\\0012\\]u\\xAD\\0051f\\0142\\\\l\\|\\050\\05\\f\\t\\u7B91\\r\\u7763\\{|h\\0104\\a\\f\\0234\\u2D4F&&^\\P{InGreek}]))");
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -820,8 +822,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -836,12 +838,12 @@ public void testZeroSymbols() {
 
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
-                         @TestTarget(methodName = "toString",
-                   methodArgs = {})      
+                         @TestTarget(methodName = "compile",
+                   methodArgs = {String.class})      
              }
            )          
     public void testBug197() {
@@ -871,8 +873,8 @@ public void testZeroSymbols() {
 
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "The test verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -896,8 +898,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -911,8 +914,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -926,8 +930,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -941,8 +946,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -956,8 +962,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -974,8 +981,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
@@ -992,13 +1000,14 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of " +
+                    "compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})      
              }
            )          
-    public void _testFindBoundaryCases7() {
+    public void disabled_testFindBoundaryCases7() {
         String[] res = { "", "a", "", "" };
         Pattern pat = Pattern.compile(".*");
         Matcher mat = pat.matcher("\na\n");
@@ -1011,8 +1020,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1038,8 +1047,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1047,7 +1056,7 @@ public void testZeroSymbols() {
                    methodArgs = {java.lang.CharSequence.class})
              }
            )          
-    public void _testBackReferences1() {
+    public void disabled_testBackReferences1() {
         Pattern pat = Pattern.compile("(\\((\\w*):(.*):(\\2)\\))");
         Matcher mat = pat
                 .matcher("(start1: word :start1)(start2: word :start2)");
@@ -1062,8 +1071,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String, int) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String, int) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class, java.lang.Integer.class}),
@@ -1082,8 +1091,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String, int) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String, int) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class, java.lang.Integer.class}),
@@ -1097,13 +1106,19 @@ public void testZeroSymbols() {
         mat.matches();
         assertEquals(15, mat.end());
     }
-//
-    //TODO
-    //TODO
-    //TODO
-    //TODO
-    //TODO
-    //TODO
+    @TestInfo(
+      level = TestLevel.PARTIAL,
+      purpose = "Verifies serialization/deserialization.",
+      targets = {
+        @TestTarget(
+          methodName = "!SerializationSelf",
+          methodArgs = {}
+        ),
+        @TestTarget(
+          methodName = "!SerializationGolden",
+          methodArgs = {}
+        )
+    })
     public void testSerialization() throws Exception {
         Pattern pat = Pattern.compile("a*bc");
         SerializableAssert comparator = new SerializableAssert() {
@@ -1118,8 +1133,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String, int) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String, int) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class, java.lang.Integer.class}),
@@ -1139,8 +1154,9 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) " +
+                    "method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})
              }
@@ -1154,8 +1170,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})
              }
@@ -1166,8 +1182,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1245,13 +1261,13 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})
              }
            )          
-    public void _testCorrectReplacementBackreferencedJointSet() {
+    public void disabled_testCorrectReplacementBackreferencedJointSet() {
         Pattern pat = Pattern.compile("ab(a)*\\1");
         pat = Pattern.compile("abc(cd)fg");
         pat = Pattern.compile("aba*cd");
@@ -1270,8 +1286,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1286,8 +1302,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1364,8 +1380,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1385,10 +1401,14 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "",
-             targets = {}
-           )          
+      level = TestLevel.PARTIAL_OK,
+      purpose = "Verifies split method for empty string.",
+      targets = {
+        @TestTarget(
+          methodName = "split",
+          methodArgs = {java.lang.CharSequence.class}
+        )
+    })
     public void testSplitEmptyCharSequence() {
         String s1 = "";
         String[] arr = s1.split(":");
@@ -1396,8 +1416,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "The test verifies the functionality of compile(java.lang.String) & " +
                      "split(java.lang.CharSequence, int) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1414,8 +1434,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO,
-             notes = "The test verifies the functionality of matches(java.lang.String), " +
+             level = TestLevel.PARTIAL,
+             purpose = "The test verifies the functionality of matches(java.lang.String), " +
                      "java.lang.CharSequence) method for case insensitive flags.",
              targets = { @TestTarget(methodName = "matches",
                    methodArgs = {java.lang.String.class, java.lang.CharSequence.class})
@@ -1426,8 +1446,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1450,8 +1470,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO, //isCompiled checking not needed test should fail in case of exception
-             notes = "The test verifies the functionality of compile(java.lang.String) &" +
+             level = TestLevel.PARTIAL, //isCompiled checking not needed test should fail in case of exception
+             purpose = "Verifies the functionality of compile(java.lang.String) &" +
                      " compile(java.lang.String, int) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}), 
@@ -1478,8 +1498,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1520,8 +1540,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.TODO, //isCompiled checking not needed test should fail in case of exception
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL, //isCompiled checking not needed test should fail in case of exception
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})
              }
@@ -1539,8 +1559,8 @@ public void testZeroSymbols() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1562,8 +1582,8 @@ public void testRestoreFlagsAfterGroup() {
      * \p{javaLowerCase} \p{javaUpperCase} \p{javaWhitespace} \p{javaMirrored}
      */
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) method.",
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) method.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class})
              }
@@ -1890,8 +1910,8 @@ public void testRestoreFlagsAfterGroup() {
 // END android-removed
     
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -1966,8 +1986,8 @@ public void testRestoreFlagsAfterGroup() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2018,8 +2038,8 @@ public void testRestoreFlagsAfterGroup() {
      */
     
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2129,8 +2149,8 @@ public void testRestoreFlagsAfterGroup() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      " compile(java.lang.String, int) matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2179,7 +2199,15 @@ public void testRestoreFlagsAfterGroup() {
     /**
      * s java.util.regex.Pattern.quote(String)
      */
-    
+    @TestInfo(
+      level = TestLevel.COMPLETE,
+      purpose = "",
+      targets = {
+        @TestTarget(
+          methodName = "quote",
+          methodArgs = {java.lang.String.class}
+        )
+    })
     public void test_quoteLjava_lang_String() {
         for (String aPattern : testPatterns) {
             Pattern p = Pattern.compile(aPattern);
@@ -2202,8 +2230,8 @@ public void testRestoreFlagsAfterGroup() {
      */
     
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2240,8 +2268,8 @@ public void testRestoreFlagsAfterGroup() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2262,8 +2290,8 @@ public void testRestoreFlagsAfterGroup() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2292,8 +2320,8 @@ public void testRestoreFlagsAfterGroup() {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of compile(java.lang.String) & " +
                      "compile(java.lang.String, int) & matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
@@ -2323,8 +2351,8 @@ public void testRestoreFlagsAfterGroup() {
      * Regression test for HARMONY-688
      */
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of compile(java.lang.String) & " +
+             level = TestLevel.PARTIAL,
+             purpose = "The test verifies the functionality of compile(java.lang.String) & " +
                      "matcher(java.lang.CharSequence) methods.",
              targets = { @TestTarget(methodName = "compile",
                    methodArgs = {java.lang.String.class}),
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java
index da779fb..077978b 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java
@@ -19,7 +19,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import junit.framework.TestCase;
 import java.util.regex.Pattern;
@@ -29,8 +29,8 @@ import java.util.regex.PatternSyntaxException;
 @TestTargetClass(Matcher.class)
 public class ReplaceTest extends TestCase {
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the basic functionality of " +
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the basic functionality of " +
                      "replaceFirst(java.lang.String) & replaceAll(java.lang.String)" +
                      " methods.",
              targets = { @TestTarget(methodName = "replaceFirst",
@@ -54,8 +54,8 @@ public class ReplaceTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of " +
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of " +
                      "replaceFirst(java.lang.String) & replaceAll(java.lang.String)" +
                      " methods.",
              targets = { @TestTarget(methodName = "replaceFirst",
@@ -96,8 +96,8 @@ public class ReplaceTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of " +
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of " +
                      "replaceAll(java.lang.String) method with backslash chars.",
              targets = { @TestTarget(methodName = "replaceAll",
                    methodArgs = {java.lang.String.class})      
diff --git a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java
index 7f254b5..4fd2243 100644
--- a/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java
+++ b/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java
@@ -3,7 +3,7 @@ package org.apache.harmony.tests.java.util.regex;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestInfo;
 import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestLevel;
 
 import junit.framework.TestCase;
 import java.util.regex.*;
@@ -15,8 +15,8 @@ import java.util.regex.*;
  */
 public class SplitTest extends TestCase {
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the basic functionality of " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the basic functionality of " +
                      "split(java.lang.CharSequence) & compile(java.lang.String)" +
                      "methods.",
              targets = { @TestTarget(methodName = "split",
@@ -36,14 +36,11 @@ public class SplitTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of " +
-                     "split(java.lang.CharSequence) & compile(java.lang.String," +
-                     " int) methods. Test uses not empty pattern.",
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of " +
+                     "split(java.lang.CharSequence). Test uses not empty pattern.",
              targets = { @TestTarget(methodName = "split",
-                   methodArgs = {java.lang.CharSequence.class, int.class}),
-                         @TestTarget(methodName = "compile",
-                   methodArgs = {java.lang.String.class})      
+                   methodArgs = {java.lang.CharSequence.class, int.class})
              }
            )          
     public void testSplit1() throws PatternSyntaxException {
@@ -138,14 +135,11 @@ public class SplitTest extends TestCase {
     }
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of " +
-                     "split(java.lang.CharSequence) & compile(java.lang.String," +
-                     " int methods. Test uses empty pattern.",
+             level = TestLevel.PARTIAL_OK,
+             purpose = "Verifies the functionality of " +
+                     "split(java.lang.CharSequence). Test uses empty pattern.",
              targets = { @TestTarget(methodName = "split",
-                   methodArgs = {java.lang.CharSequence.class, int.class}),
-                         @TestTarget(methodName = "compile",
-                   methodArgs = {java.lang.String.class})      
+                   methodArgs = {java.lang.CharSequence.class, int.class})     
              }
            )          
     public void testSplit2() {
@@ -176,8 +170,8 @@ public class SplitTest extends TestCase {
 
 
     @TestInfo(
-             status = TestStatus.LGTM,
-             notes = "The test verifies the functionality of " +
+             level = TestLevel.PARTIAL,
+             purpose = "Verifies the functionality of " +
                      "split(java.lang.CharSequence) & compile(java.lang.String," +
                      " int) methods. Test uses empty pattern and supplementary chars.",
              targets = { @TestTarget(methodName = "split",