You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/15 09:53:51 UTC

[2/6] incubator-netbeans git commit: [NETBEANS-54] Module Review java.completion

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java
index d09756c..038a45a 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java
@@ -32,918 +32,918 @@ public class JavaCompletionTaskAdvancedTest extends CompletionTestBase {
     // constructor tests -------------------------------------------------------
 
     public void testEmptyFileAfterTypingNew() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew ", "declaredTypes.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew ", "declaredTypes.pass");
     }
 
     public void testAfterTypingNew() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew ", "declaredTypes.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew ", "declaredTypes.pass");
     }
     
     public void testAfterNew() throws Exception {
-        performTest("AdvancedMethodBody", 121, null, "declaredTypes.pass");
+        performTest("AdvancedMethodBody", 931, null, "declaredTypes.pass");
     }
     
     public void testEmptyFileTypingConstructorName() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass");
     }
     
     public void testTypingConstructorName() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass");
     }
     
     public void testOnConstructorName() throws Exception {
-        performTest("AdvancedMethodBody", 124, null, "declaredTypesStartingWithStr.pass");
+        performTest("AdvancedMethodBody", 934, null, "declaredTypesStartingWithStr.pass");
     }
 
     public void testEmptyFileAfterTypingConstructorName() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String", "stringConstructors.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String", "stringConstructors.pass");
     }
     
     public void testAfterTypingConstructorName() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String", "stringConstructors.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String", "stringConstructors.pass");
     }
     
     public void testAfterConstructorName() throws Exception {
-        performTest("AdvancedMethodBody", 127, null, "stringConstructors.pass");
+        performTest("AdvancedMethodBody", 937, null, "stringConstructors.pass");
     }
     
     public void testEmptyFileBeforeTypingConstructorParam() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass");
     }
     
     public void testBeforeTypingConstructorParam() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass");
     }
     
     public void testBeforeConstructorParam() throws Exception {
-        performTest("AdvancedMethodBody", 128, null, "typesLocalMembersVarsAndSmartString.pass");
+        performTest("AdvancedMethodBody", 938, null, "typesLocalMembersVarsAndSmartString.pass");
     }
     
     public void testEmptyFileTypingConstructorParam() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(fie", "field.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(fie", "field.pass");
     }
     
     public void testTypingConstructorParam() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(fie", "field.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(fie", "field.pass");
     }
     
     public void testOnConstructorParam() throws Exception {
-        performTest("AdvancedMethodBody", 132, null, "field.pass");
+        performTest("AdvancedMethodBody", 942, null, "field.pass");
     }
     
     public void testEmptyFileAfterTypingConstructorParam() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field", "field.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field", "field.pass");
     }
     
     public void testAfterTypingConstructorParam() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field", "field.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field", "field.pass");
     }
     
     public void testAfterConstructorParam() throws Exception {
-        performTest("AdvancedMethodBody", 133, null, "field.pass");
+        performTest("AdvancedMethodBody", 943, null, "field.pass");
     }
     
     public void testEmptyFileAfterTypingConstructorParamAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field ", "empty.pass");
     }
     
     public void testAfterTypingConstructorParamAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field ", "empty.pass");
     }
     
     public void testAfterConstructorParamAndSpace() throws Exception {
-        performTest("AdvancedMethodBody", 133, " ", "empty.pass");
+        performTest("AdvancedMethodBody", 943, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingConstructor() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field)", "instanceOf.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field)", "instanceOf.pass");
     }
     
     public void testAfterTypingConstructor() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field)", "instanceOf.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field)", "instanceOf.pass");
     }
     
     public void testAfterConstructor() throws Exception {
-        performTest("AdvancedMethodBody", 134, null, "instanceOf.pass");
+        performTest("AdvancedMethodBody", 944, null, "instanceOf.pass");
     }
     
     public void testEmptyFileAfterTypingConstructorAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field) ", "instanceOf.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field) ", "instanceOf.pass");
     }
     
     public void testAfterTypingConstructorAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field) ", "instanceOf.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field) ", "instanceOf.pass");
     }
     
     public void testAfterConstructorAndSpace() throws Exception {
-        performTest("AdvancedMethodBody", 134, " ", "instanceOf.pass");
+        performTest("AdvancedMethodBody", 944, " ", "instanceOf.pass");
     }
     
     public void testEmptyFileAfterTypingConstructorAndDot() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field).", "stringContent.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field).", "stringContent.pass");
     }
     
     public void testAfterTypingConstructorAndDot() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field).", "stringContent.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field).", "stringContent.pass");
     }
     
     public void testAfterConstructorAndDot() throws Exception {
-        performTest("AdvancedMethodBody", 135, null, "stringContent.pass");
+        performTest("AdvancedMethodBody", 945, null, "stringContent.pass");
     }
     
     // primitive_type.class tests ----------------------------------------------
    
     public void testEmptyFileAfterTypingPrimitiveTypeAndDot() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean.", "classKeyword.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean.", "classKeyword.pass");
     }
     
     public void testAfterTypingPrimitiveTypeAndDot() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean.", "classKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean.", "classKeyword.pass");
     }
     
     public void testAfterPrimitiveTypeAndDot() throws Exception {
-        performTest("AdvancedMethodBody", 169, null, "classKeyword.pass");
+        performTest("AdvancedMethodBody", 979, null, "classKeyword.pass");
     }
     
     public void testEmptyFileTypingPrimitiveTypeDotClass() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean.c", "classKeyword.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean.c", "classKeyword.pass");
     }
     
     public void testTypingPrimitiveTypeDotClass() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean.c", "classKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean.c", "classKeyword.pass");
     }
     
     public void testOnPrimitiveTypeDotClass() throws Exception {
-        performTest("AdvancedMethodBody", 170, null, "classKeyword.pass");
+        performTest("AdvancedMethodBody", 980, null, "classKeyword.pass");
     }
 
     public void testEmptyFileAfterTypingPrimitiveTypeDotClass() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "boolean.class", "classKeyword.pass");
+        performTest("SimpleMethodBodyStart", 899, "boolean.class", "classKeyword.pass");
     }
     
     public void testAfterTypingPrimitiveTypeDotClass() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "boolean.class", "classKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 899, "boolean.class", "classKeyword.pass");
     }
     
     public void testAfterPrimitiveTypeDotClass() throws Exception {
-        performTest("AdvancedMethodBody", 174, null, "classKeyword.pass");
+        performTest("AdvancedMethodBody", 984, null, "classKeyword.pass");
     }
     
     // Boolean.FALSE.booleanValue() like tests ---------------------------------
     
     public void testEmptyFileTypingBooleanValue() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, "Boolean.FALSE.boolean", "booleanValue.pass");
+        performTest("SimpleMethodBodyStart", 899, "Boolean.FALSE.boolean", "booleanValue.pass");
     }
     
     public void testTypingBooleanValue() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, "Boolean.FALSE.boolean", "booleanValue.pass");
+        performTest("SimpleEmptyMethodBody", 899, "Boolean.FALSE.boolean", "booleanValue.pass");
     }
     
     public void testOnBooleanValue() throws Exception {
-        performTest("AdvancedMethodBody", 198, null, "booleanValue.pass");
+        performTest("AdvancedMethodBody", 1008, null, "booleanValue.pass");
     }
 
     // Expression in field init tests ------------------------------------------
     
     public void testEmptyFileTypingParenWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = (", "typesLocalMembersAndSmartNumber.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = (", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testTypingParenWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = (", "typesLocalMembersAndSmartNumber.pass");
+        performTest("FieldNoInit", 924, " = (", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testAfterParenWithinInitOfField() throws Exception {
-        performTest("Field", 141, null, "typesLocalMembersAndSmartNumber.pass");
+        performTest("Field", 951, null, "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testEmptyFileTypingSecondParenWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((", "typesLocalMembersAndSmartNumber.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testTypingSecondParenWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((", "typesLocalMembersAndSmartNumber.pass");
+        performTest("FieldNoInit", 924, " = ((", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testAfterSecondParenWithinInitOfField() throws Exception {
-        performTest("Field", 142, null, "typesLocalMembersAndSmartNumber.pass");
+        performTest("Field", 952, null, "typesLocalMembersAndSmartNumber.pass");
     }
 
     public void testEmptyFileTypingSecondParenAndSpaceWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = (( ", "typesLocalMembersAndSmartNumber.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = (( ", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testTypingSecondParenAndSpaceWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = (( ", "typesLocalMembersAndSmartNumber.pass");
+        performTest("FieldNoInit", 924, " = (( ", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testAfterSecondParenAndSpaceWithinInitOfField() throws Exception {
-        performTest("Field", 142, " ", "typesLocalMembersAndSmartNumber.pass");
+        performTest("Field", 952, " ", "typesLocalMembersAndSmartNumber.pass");
     }
     
     public void testEmptyFileTypingCastTypeWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number ", "empty.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number ", "empty.pass");
     }
     
     public void testTypingCastTypeWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((Number ", "empty.pass");
+        performTest("FieldNoInit", 924, " = ((Number ", "empty.pass");
     }
     
     public void testOnCastTypeWithinInitOfField() throws Exception {
-        performTest("Field", 148, " ", "empty.pass");
+        performTest("Field", 958, " ", "empty.pass");
     }
 
     public void testEmptyFileAfterTypingCastTypeWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)", "typesAndLocalMembers1.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)", "typesAndLocalMembers1.pass");
     }
     
     public void testAfterTypingCastTypeWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((Number)", "typesAndLocalMembers1.pass");
+        performTest("FieldNoInit", 924, " = ((Number)", "typesAndLocalMembers1.pass");
     }
     
     public void testAfterCastTypeWithinInitOfField() throws Exception {
-        performTest("Field", 149, null, "typesAndLocalMembers1.pass");
+        performTest("Field", 959, null, "typesAndLocalMembers1.pass");
     }
 
     public void testEmptyFileTypingCastAndSpaceWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number) ", "typesAndLocalMembers1.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number) ", "typesAndLocalMembers1.pass");
     }
     
     public void testTypingCastAndSpaceWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((Number) ", "typesAndLocalMembers1.pass");
+        performTest("FieldNoInit", 924, " = ((Number) ", "typesAndLocalMembers1.pass");
     }
     
     public void testAfterCastAndSpaceWithinInitOfField() throws Exception {
-        performTest("Field", 149, " ", "typesAndLocalMembers1.pass");
+        performTest("Field", 959, " ", "typesAndLocalMembers1.pass");
     }
 
     public void testEmptyFileTypingCastAndMethodWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)h", "hashCode.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)h", "hashCode.pass");
     }
     
     public void testTypingCastAndMethodWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((Number)h", "hashCode.pass");
+        performTest("FieldNoInit", 924, " = ((Number)h", "hashCode.pass");
     }
     
     public void testOnCastAndMethodWithinInitOfField() throws Exception {
-        performTest("Field", 150, null, "hashCode.pass");
+        performTest("Field", 960, null, "hashCode.pass");
     }
 
     public void testEmptyFileAfterTypingCastAndMethodWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode())", "instanceOf.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode())", "instanceOf.pass");
     }
     
     public void testAfterTypingCastAndMethodWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((Number)hashCode())", "instanceOf.pass");
+        performTest("FieldNoInit", 924, " = ((Number)hashCode())", "instanceOf.pass");
     }
     
     public void testAfterCastAndMethodWithinInitOfField() throws Exception {
-        performTest("Field", 160, null, "instanceOf.pass");
+        performTest("Field", 970, null, "instanceOf.pass");
     }
 
     public void testEmptyFileAfterTypingCastWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).", "numberContent.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).", "numberContent.pass");
     }
     
     public void testAfterTypingCastWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 114, " = ((Number)hashCode()).", "numberContent.pass");
+        performTest("FieldNoInit", 924, " = ((Number)hashCode()).", "numberContent.pass");
     }
     
     public void testAfterCastWithinInitOfField() throws Exception {
-        performTest("Field", 161, null, "numberContent.pass");
+        performTest("Field", 971, null, "numberContent.pass");
     }
 
     public void testEmptyFileBeforeTypingInstanceofWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num ", "instanceOf.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num ", "instanceOf.pass");
     }
     
     public void testBeforeTypingInstanceofWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 136, " = num ", "instanceOf.pass");
+        performTest("FieldNoInit", 946, " = num ", "instanceOf.pass");
     }
     
     public void testBeforeInstanceofWithinInitOfField() throws Exception {
-        performTest("Field", 200, null, "instanceOf.pass");
+        performTest("Field", 1010, null, "instanceOf.pass");
     }
 
     public void testEmptyFileTypingInstanceofWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num i", "instanceOf.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num i", "instanceOf.pass");
     }
     
     public void testTypingInstanceofWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 136, " = num i", "instanceOf.pass");
+        performTest("FieldNoInit", 946, " = num i", "instanceOf.pass");
     }
     
     public void testInstanceofWithinInitOfField() throws Exception {
-        performTest("Field", 201, null, "instanceOf.pass");
+        performTest("Field", 1011, null, "instanceOf.pass");
     }
 
     public void testEmptyFileAfterTypingInstanceofWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof ", "declaredTypes.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof ", "declaredTypes.pass");
     }
     
     public void testAfterTypingInstanceofWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 136, " = num instanceof ", "declaredTypes.pass");
+        performTest("FieldNoInit", 946, " = num instanceof ", "declaredTypes.pass");
     }
     
     public void testAfterInstanceofWithinInitOfField() throws Exception {
-        performTest("Field", 211, null, "declaredTypes.pass");
+        performTest("Field", 1021, null, "declaredTypes.pass");
     }
 
     public void testEmptyFileTypingInstanceofTypeWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof I", "javaLangContentStartingWithI.pass");
+        performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof I", "javaLangContentStartingWithI.pass");
     }
     
     public void testTypingInstanceofTypeWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 136, " = num instanceof I", "javaLangContentStartingWithI.pass");
+        performTest("FieldNoInit", 946, " = num instanceof I", "javaLangContentStartingWithI.pass");
     }
     
     public void testOnInstanceofTypeWithinInitOfField() throws Exception {
-        performTest("Field", 212, null, "javaLangContentStartingWithI.pass");
+        performTest("Field", 1022, null, "javaLangContentStartingWithI.pass");
     }
 
     // For loop tests ----------------------------------------------------------
     
     public void testEmptyFileAfterTypingForKeywordAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "for ", "empty.pass");
     }
     
     public void testAfterTypingForKeywordAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for ", "empty.pass");
     }
     
     public void testAfterForKeywordAndSpace() throws Exception {
-        performTest("For", 102, null, "empty.pass");
+        performTest("For", 912, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingForKeywordAndParen() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (", "typesLocalFieldsAndVars.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (", "typesLocalFieldsAndVars.pass");
     }
     
     public void testAfterTypingForKeywordAndParen() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (", "typesLocalFieldsAndVars.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (", "typesLocalFieldsAndVars.pass");
     }
     
     public void testAfterForKeywordAndParen() throws Exception {
-        performTest("For", 103, null, "typesLocalFieldsAndVars.pass");
+        performTest("For", 913, null, "typesLocalFieldsAndVars.pass");
     }
     
     public void testEmptyFileAfterTypingForVarTypeAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int ", "intVarName.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int ", "intVarName.pass");
     }
     
     public void testAfterTypingForVarTypeAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int ", "intVarName.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int ", "intVarName.pass");
     }
     
     public void testAfterForVarTypeAndSpace() throws Exception {
-        performTest("For", 107, null, "intVarName.pass");
+        performTest("For", 917, null, "intVarName.pass");
     }
     
     public void testEmptyFileAfterTypingForVarAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i ", "empty.pass");
     }
     
     public void testAfterTypingForVarAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i ", "empty.pass");
     }
     
     public void testAfterForVarAndSpace() throws Exception {
-        performTest("For", 109, null, "empty.pass");
+        performTest("For", 919, null, "empty.pass");
     }
     
     public void testEmptyFileBeforTypingForVarInit() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass");
     }
     
     public void testBeforTypingForVarInit() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass");
     }
     
     public void testBeforeForVarInit() throws Exception {
-        performTest("For", 111, null, "typesLocalMembersVarsAndSmartInt.pass");
+        performTest("For", 921, null, "typesLocalMembersVarsAndSmartInt.pass");
     }
     
     public void testEmptyFileAfterTypingForVarInitAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0 ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0 ", "empty.pass");
     }
     
     public void testAfterTypingForVarInitAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0 ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0 ", "empty.pass");
     }
     
     public void testAfterForVarInitAndSpace() throws Exception {
-        performTest("For", 112, " ", "empty.pass");
+        performTest("For", 922, " ", "empty.pass");
     }
     
     public void testEmptyFileBeforTypingForCondition() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass");
     }
     
     public void testBeforTypingForCondition() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass");
     }
     
     public void testBeforeForCondition() throws Exception {
-        performTest("For", 113, null, "typesLocalMembersVarsAndSmartBoolean.pass");
+        performTest("For", 923, null, "typesLocalMembersVarsAndSmartBoolean.pass");
     }
     
     public void testEmptyFileBeforTypingForConditionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass");
     }
     
     public void testBeforTypingForConditionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass");
     }
     
     public void testBeforeForConditionAndSpace() throws Exception {
-        performTest("For", 114, null, "typesLocalMembersVarsAndSmartBoolean.pass");
+        performTest("For", 924, null, "typesLocalMembersVarsAndSmartBoolean.pass");
     }
     
     public void testEmptyFileAfterTypingForConditionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a ", "empty.pass");
     }
     
     public void testAfterTypingForConditionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a ", "empty.pass");
     }
     
     public void testAfterForConditionAndSpace() throws Exception {
-        performTest("For", 119, " ", "empty.pass");
+        performTest("For", 929, " ", "empty.pass");
     }
     
     public void testEmptyFileBeforTypingForUpdateExpression() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass");
     }
     
     public void testBeforTypingForUpdateExpression() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass");
     }
     
     public void testBeforeForUpdateExpression() throws Exception {
-        performTest("For", 120, null, "typesLocalMembersAndVars2.pass");
+        performTest("For", 930, null, "typesLocalMembersAndVars2.pass");
     }
     
     public void testEmptyFileBeforTypingForUpdateExpressionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass");
     }
     
     public void testBeforTypingForUpdateExpressionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass");
     }
     
     public void testBeforeForUpdateExpressionAndSpace() throws Exception {
-        performTest("For", 121, null, "typesLocalMembersAndVars2.pass");
+        performTest("For", 931, null, "typesLocalMembersAndVars2.pass");
     }
     
     public void testEmptyFileAfterTypingForUpdateExpressionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++ ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++ ", "empty.pass");
     }
     
     public void testAfterTypingForUpdateExpressionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0 ; i < a; i++ ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0 ; i < a; i++ ", "empty.pass");
     }
     
     public void testAfterForUpdateExpressionAndSpace() throws Exception {
-        performTest("For", 124, " ", "empty.pass");
+        performTest("For", 934, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingForUpdateExpressionAndParen() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass");
     }
     
     public void testAfterTypingForUpdateExpressionAndParen() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass");
     }
     
     public void testAfterForUpdateExpressionAndParen() throws Exception {
-        performTest("For", 125, null, "methodBodyContentAfterFor.pass");
+        performTest("For", 935, null, "methodBodyContentAfterFor.pass");
     }
     
     public void testEmptyFileAfterTypingForUpdateExpressionParenAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass");
     }
     
     public void testAfterTypingForUpdateExpressionParenAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass");
     }
     
     public void testAfterForUpdateExpressionParenAndSpace() throws Exception {
-        performTest("For", 126, null, "methodBodyContentAfterFor.pass");
+        performTest("For", 936, null, "methodBodyContentAfterFor.pass");
     }
 
     public void testEmptyFileInsideForBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass");
     }
     
     public void testTypingInsideForBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass");
     }
     
     public void testInsideForBody() throws Exception {
-        performTest("For", 127, null, "blockContentAfterFor.pass");
+        performTest("For", 937, null, "blockContentAfterFor.pass");
     }
     
     // For-each loop tests -----------------------------------------------------
     
     public void testEmptyFileBeforTypingForEachExpression() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (Byte b :", "typesLocalMembersAndVars1.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (Byte b :", "typesLocalMembersAndVars1.pass");
     }
     
     public void testBeforTypingForEachExpression() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (Byte b :", "typesLocalMembersAndVars1.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (Byte b :", "typesLocalMembersAndVars1.pass");
     }
     
     public void testBeforeForEachExpression() throws Exception {
-        performTest("ForEach", 111, null, "typesLocalMembersAndVars1.pass");
+        performTest("ForEach", 921, null, "typesLocalMembersAndVars1.pass");
     }
     
     public void testEmptyFileBeforTypingForEachExpressionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (Byte b : ", "typesLocalMembersAndVars1.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (Byte b : ", "typesLocalMembersAndVars1.pass");
     }
     
     public void testBeforTypingForEachExpressionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (Byte b : ", "typesLocalMembersAndVars1.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (Byte b : ", "typesLocalMembersAndVars1.pass");
     }
     
     public void testBeforeForEachExpressionAndSpace() throws Exception {
-        performTest("ForEach", 112, null, "typesLocalMembersAndVars1.pass");
+        performTest("ForEach", 922, null, "typesLocalMembersAndVars1.pass");
     }
     
     public void testEmptyFileAfterTypingForEachExpressionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes() ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes() ", "empty.pass");
     }
     
     public void testAfterTypingForEachExpressionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes() ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes() ", "empty.pass");
     }
     
     public void testAfterForEachExpressionAndSpace() throws Exception {
-        performTest("ForEach", 128, " ", "empty.pass");
+        performTest("ForEach", 938, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingForEachExpressionAndParen() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass");
     }
     
     public void testAfterTypingForEachExpressionAndParen() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass");
     }
     
     public void testAfterForEachExpressionAndParen() throws Exception {
-        performTest("ForEach", 129, null, "methodBodyContentAfterForEach.pass");
+        performTest("ForEach", 939, null, "methodBodyContentAfterForEach.pass");
     }
     
     public void testEmptyFileAfterTypingForEachExpressionParenAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass");
     }
     
     public void testAfterTypingForEachExpressionParenAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass");
     }
     
     public void testAfterForEachExpressionParenAndSpace() throws Exception {
-        performTest("ForEach", 130, null, "methodBodyContentAfterForEach.pass");
+        performTest("ForEach", 940, null, "methodBodyContentAfterForEach.pass");
     }
     
     public void testEmptyFileInsideForEachBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass");
+        performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass");
     }
     
     public void testTypingInsideForEachBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass");
+        performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass");
     }
     
     public void testInsideForEachBody() throws Exception {
-        performTest("ForEach", 131, null, "blockContentAfterForEach.pass");
+        performTest("ForEach", 941, null, "blockContentAfterForEach.pass");
     }
     
     // Switch-case statement tests ---------------------------------------------
     
     public void testEmptyFileAfterTypingSwitchKeyword() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch", "switchKeyword.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch", "switchKeyword.pass");
     }
     
     public void testAfterTypingSwitchKeyword() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch", "switchKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch", "switchKeyword.pass");
     }
     
     public void testAfterSwitchKeyword() throws Exception {
-        performTest("Switch", 104, null, "switchKeyword.pass");
+        performTest("Switch", 914, null, "switchKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingSwitchKeywordAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch ", "empty.pass");
     }
     
     public void testAfterTypingSwitchKeywordAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch ", "empty.pass");
     }
     
     public void testAfterSwitchKeywordAndSpace() throws Exception {
-        performTest("Switch", 105, null, "empty.pass");
+        performTest("Switch", 915, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingSwitchKeywordAndParen() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass");
     }
     
     public void testAfterTypingSwitchKeywordAndParen() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass");
     }
     
     public void testAfterSwitchKeywordAndParen() throws Exception {
-        performTest("Switch", 106, null, "typesLocalMembersVarsAndSmartEnumAndInt.pass");
+        performTest("Switch", 916, null, "typesLocalMembersVarsAndSmartEnumAndInt.pass");
     }
     
     public void testEmptyFileAfterTypingSwitchExpression() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a", "a.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a", "a.pass");
     }
     
     public void testAfterTypingSwitchExpression() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a", "a.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a", "a.pass");
     }
     
     public void testAfterSwitchExpression() throws Exception {
-        performTest("Switch", 107, null, "a.pass");
+        performTest("Switch", 917, null, "a.pass");
     }
     
     public void testEmptyFileAfterTypingSwitchExpressionAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a ", "empty.pass");
     }
     
     public void testAfterTypingSwitchExpressionAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a ", "empty.pass");
     }
     
     public void testAfterSwitchExpressionAndSpace() throws Exception {
-        performTest("Switch", 107, " ", "empty.pass");
+        performTest("Switch", 917, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingSwitchExpressionAndParen() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) ", "empty.pass");
     }
     
     public void testAfterTypingSwitchExpressionAndParen() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) ", "empty.pass");
     }
     
     public void testAfterSwitchExpressionAndParen() throws Exception {
-        performTest("Switch", 108, null, "empty.pass");
+        performTest("Switch", 918, null, "empty.pass");
     }
     
     public void testEmptyFileInsideSwitchBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\n", "caseAndDefaultKeywords.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\n", "caseAndDefaultKeywords.pass");
     }
     
     public void testTypingInsideSwitchBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\n", "caseAndDefaultKeywords.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\n", "caseAndDefaultKeywords.pass");
     }
     
     public void testInsideSwitchBody() throws Exception {
-        performTest("Switch", 123, null, "caseAndDefaultKeywords.pass");
+        performTest("Switch", 933, null, "caseAndDefaultKeywords.pass");
     }
     
     public void testEmptyFileAfterTypingCaseKeyword() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase", "caseKeyword.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase", "caseKeyword.pass");
     }
     
     public void testAfterTypingCaseKeyword() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase", "caseKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase", "caseKeyword.pass");
     }
     
     public void testAfterCaseKeyword() throws Exception {
-        performTest("Switch", 127, null, "caseKeyword.pass");
+        performTest("Switch", 937, null, "caseKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingCaseKeywordAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass");
     }
     
     public void testAfterTypingCaseKeywordAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass");
     }
     
     public void testAfterCaseKeywordAndSpace() throws Exception {
-        performTest("Switch", 127, " ", "declaredTypesAndSmartInt.pass");
+        performTest("Switch", 937, " ", "declaredTypesAndSmartInt.pass");
     }
     
     public void testEmptyFileAfterTypingCaseKeywordAndColon() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass");
     }
     
     public void testAfterTypingCaseKeywordAndColon() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass");
     }
     
     public void testAfterCaseKeywordAndColon() throws Exception {
-        performTest("Switch", 130, null, "methodBodyContentAfterCase.pass");
+        performTest("Switch", 940, null, "methodBodyContentAfterCase.pass");
     }
     
     public void testEmptyFileAfterTypingCaseKeywordAndColonAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass");
     }
     
     public void testAfterTypingCaseKeywordAndColonAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass");
     }
     
     public void testAfterCaseKeywordAndColonAndSpace() throws Exception {
-        performTest("Switch", 131, null, "methodBodyContentAfterCase.pass");
+        performTest("Switch", 941, null, "methodBodyContentAfterCase.pass");
     }
     
     public void testEmptyFileAfterTypingVarInCaseBlock() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass");
     }
 
     public void testAfterTypingVarInCaseBlock() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass");
     }
 
     public void testAfterVarInCaseBlock() throws Exception {
-        performTest("Switch", 158, null, "methodBodyContentAfterCaseAndVar.pass");
+        performTest("Switch", 968, null, "methodBodyContentAfterCaseAndVar.pass");
     }
 
     public void testEmptyFileAfterTypingBreakKeyword() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass");
     }
     
     public void testAfterTypingBreakKeyword() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass");
     }
     
     public void testAfterBreakKeyword() throws Exception {
-        performTest("Switch", 179, null, "breakKeyword.pass");
+        performTest("Switch", 989, null, "breakKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingDefaultKeyword() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault", "defaultKeyword.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault", "defaultKeyword.pass");
     }
     
     public void testAfterTypingDefaultKeyword() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault", "defaultKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault", "defaultKeyword.pass");
     }
     
     public void testAfterDefaultKeyword() throws Exception {
-        performTest("Switch", 200, null, "defaultKeyword.pass");
+        performTest("Switch", 1010, null, "defaultKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingDefaultKeywordAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault ", "empty.pass");
     }
     
     public void testAfterTypingDefaultKeywordAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault ", "empty.pass");
     }
     
     public void testAfterDefaultKeywordAndSpace() throws Exception {
-        performTest("Switch", 200, " ", "empty.pass");
+        performTest("Switch", 1010, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingDefaultKeywordAndColon() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass");
     }
     
     public void testAfterTypingDefaultKeywordAndColon() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass");
     }
     
     public void testAfterDefaultKeywordAndColon() throws Exception {
-        performTest("Switch", 201, null, "methodBodyContentAfterDefault.pass");
+        performTest("Switch", 1011, null, "methodBodyContentAfterDefault.pass");
     }
     
     public void testEmptyFileAfterTypingDefaultKeywordAndColonAndSpace() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass");
+        performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass");
     }
     
     public void testAfterTypingDefaultKeywordAndColonAndSpace() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass");
+        performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass");
     }
     
     public void testAfterDefaultKeywordAndColonAndSpace() throws Exception {
-        performTest("Switch", 201, null, "methodBodyContentAfterDefault.pass");
+        performTest("Switch", 1011, null, "methodBodyContentAfterDefault.pass");
     }
     
     // Static initializer tests ------------------------------------------------
     
     public void testEmptyFileAfterTypingStaticKeyword() throws Exception {
-        performTest("InitializersStart", 220, "static", "staticKeyword.pass");
+        performTest("InitializersStart", 1030, "static", "staticKeyword.pass");
     }
     
     public void testAfterTypingStaticKeyword() throws Exception {
-        performTest("Field", 220, "static", "staticKeyword.pass");
+        performTest("Field", 1030, "static", "staticKeyword.pass");
     }
     
     public void testAfterStaticKeyword() throws Exception {
-        performTest("Initializers", 235, null, "staticKeyword.pass");
+        performTest("Initializers", 1045, null, "staticKeyword.pass");
     }
 
     public void testEmptyFileAfterTypingStaticKeywordAndSpace() throws Exception {
-        performTest("InitializersStart", 220, "static ", "memberModifiersAndTypesWithoutStatic.pass");
+        performTest("InitializersStart", 1030, "static ", "memberModifiersAndTypesWithoutStatic.pass");
     }
     
     public void testAfterTypingStaticKeywordAndSpace() throws Exception {
-        performTest("Field", 220, "static ", "memberModifiersAndTypesWithoutStatic.pass");
+        performTest("Field", 1030, "static ", "memberModifiersAndTypesWithoutStatic.pass");
     }
     
     public void testAfterStaticKeywordAndSpace() throws Exception {
-        performTest("Initializers", 236, null, "memberModifiersAndTypesWithoutStatic.pass");
+        performTest("Initializers", 1046, null, "memberModifiersAndTypesWithoutStatic.pass");
     }
 
     public void testEmptyFileTypingStaticBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "static {", "staticBlockContent.pass");
+        performTest("InitializersStart", 1030, "static {", "staticBlockContent.pass");
     }
     
     public void testTypingStaticBlockBody() throws Exception {
-        performTest("Field", 220, "static {", "staticBlockContent.pass");
+        performTest("Field", 1030, "static {", "staticBlockContent.pass");
     }
     
     public void testInStaticBlockBody() throws Exception {
-        performTest("Initializers", 237, null, "staticBlockContent.pass");
+        performTest("Initializers", 1047, null, "staticBlockContent.pass");
     }
 
     public void testEmptyFileTypingVarTypeInStaticBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "static {\nin", "intKeyword.pass");
+        performTest("InitializersStart", 1030, "static {\nin", "intKeyword.pass");
     }
     
     public void testTypingVarTypeInStaticBlockBody() throws Exception {
-        performTest("Field", 220, "static {\nin", "intKeyword.pass");
+        performTest("Field", 1030, "static {\nin", "intKeyword.pass");
     }
     
     public void testOnVarTypeInStaticBlockBody() throws Exception {
-        performTest("Initializers", 248, null, "intKeyword.pass");
+        performTest("Initializers", 1058, null, "intKeyword.pass");
     }
 
     public void testEmptyFileBeforeTypingVarInitInStaticBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass");
+        performTest("InitializersStart", 1030, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass");
     }
     
     public void testBeforeTypingVarInitInStaticBlockBody() throws Exception {
-        performTest("Field", 220, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass");
+        performTest("Field", 1030, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass");
     }
     
     public void testBeforeVarInitInStaticBlockBody() throws Exception {
-        performTest("Initializers", 254, null, "staticBlockTypesAndLocalMembers.pass");
+        performTest("Initializers", 1064, null, "staticBlockTypesAndLocalMembers.pass");
     }
 
     public void testEmptyFileTypingVarInitInStaticBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "static {\nint i = f", "falseAndFloatKeywords.pass");
+        performTest("InitializersStart", 1030, "static {\nint i = f", "falseAndFloatKeywords.pass");
     }
     
     public void testTypingVarInitInStaticBlockBody() throws Exception {
-        performTest("Field", 220, "static {\nint i = f", "falseAndFloatKeywords.pass");
+        performTest("Field", 1030, "static {\nint i = f", "falseAndFloatKeywords.pass");
     }
     
     public void testOnVarInitInStaticBlockBody() throws Exception {
-        performTest("Initializers", 255, null, "falseAndFloatKeywords.pass");
+        performTest("Initializers", 1065, null, "falseAndFloatKeywords.pass");
     }
 
     // Instance initializer tests ----------------------------------------------
     
     public void testEmptyFileTypingInitializerBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "{", "initBlockContent.pass");
+        performTest("InitializersStart", 1030, "{", "initBlockContent.pass");
     }
     
     public void testTypingInitializerBlockBody() throws Exception {
-        performTest("Field", 220, "{", "initBlockContent.pass");
+        performTest("Field", 1030, "{", "initBlockContent.pass");
     }
     
     public void testInInitializerBlockBody() throws Exception {
-        performTest("Initializers", 277, null, "initBlockContent.pass");
+        performTest("Initializers", 1087, null, "initBlockContent.pass");
     }
 
     public void testEmptyFileTypingVarTypeInInitializerBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "{\nbo", "booleanKeyword.pass");
+        performTest("InitializersStart", 1030, "{\nbo", "booleanKeyword.pass");
     }
     
     public void testTypingVarTypeInInitializerBlockBody() throws Exception {
-        performTest("Field", 220, "{\nbo", "booleanKeyword.pass");
+        performTest("Field", 1030, "{\nbo", "booleanKeyword.pass");
     }
     
     public void testOnVarTypeInInitializerBlockBody() throws Exception {
-        performTest("Initializers", 288, null, "booleanKeyword.pass");
+        performTest("Initializers", 1098, null, "booleanKeyword.pass");
     }
 
     public void testEmptyFileBeforeTypingVarInitInInitializerBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass");
+        performTest("InitializersStart", 1030, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass");
     }
     
     public void testBeforeTypingVarInitInInitializerBlockBody() throws Exception {
-        performTest("Field", 220, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass");
+        performTest("Field", 1030, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass");
     }
     
     public void testBeforeVarInitInInitializerBlockBody() throws Exception {
-        performTest("Initializers", 299, null, "initBlockTypesAndLocalMembers.pass");
+        performTest("Initializers", 1109, null, "initBlockTypesAndLocalMembers.pass");
     }
 
     public void testEmptyFileTypingVarInitInInitializerBlockBody() throws Exception {
-        performTest("InitializersStart", 220, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass");
+        performTest("InitializersStart", 1030, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass");
     }
     
     public void testTypingVarInitInInitializerBlockBody() throws Exception {
-        performTest("Field", 220, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass");
+        performTest("Field", 1030, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass");
     }
     
     public void testOnVarInitInInitializerBlockBody() throws Exception {
-        performTest("Initializers", 300, null, "initBlockContentStartingWithB.pass");
+        performTest("Initializers", 1110, null, "initBlockContentStartingWithB.pass");
     }
 }