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:50 UTC

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

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master c3fcc0a3f -> 5c1b73d17


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java
index d17c1ed..38afe93 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java
@@ -32,1270 +32,1270 @@ public class JavaCompletionTaskBasicTest extends CompletionTestBase {
     // file beginning tests ----------------------------------------------------
 
     public void testEmptyFile() throws Exception {
-        performTest("Empty", 0, null, "topLevelKeywords.pass");
+        performTest("Empty", 809, null, "topLevelKeywords.pass");
     }
 
     public void testFileBeginning() throws Exception {
-        performTest("Simple", 0, null, "topLevelKeywords.pass");
+        performTest("Simple", 809, null, "topLevelKeywords.pass");
     }
     
     // package declaration tests -----------------------------------------------
     
     public void testEmptyFileTypingPackageKeyword() throws Exception {
-        performTest("Empty", 0, "p", "topLevelKeywordsStartingWithP.pass");
+        performTest("Empty", 809, "p", "topLevelKeywordsStartingWithP.pass");
     }
     
     public void testTypingPackageKeyword() throws Exception {
-        performTest("SimpleNoPackage", 0, "p", "topLevelKeywordsStartingWithP.pass");
+        performTest("SimpleNoPackage", 809, "p", "topLevelKeywordsStartingWithP.pass");
     }
     
     public void testOnPackageKeyword() throws Exception {
-        performTest("Simple", 1, null, "topLevelKeywordsStartingWithP.pass");
+        performTest("Simple", 811, null, "topLevelKeywordsStartingWithP.pass");
     }
     
     public void testEmptyFileAfterTypingPackageKeyword() throws Exception {
-        performTest("Empty", 0, "package", "packageKeyword.pass");
+        performTest("Empty", 809, "package", "packageKeyword.pass");
     }
     
     public void testAfterTypingPackageKeyword() throws Exception {
-        performTest("SimpleNoPackage", 0, "package", "packageKeyword.pass");
+        performTest("SimpleNoPackage", 809, "package", "packageKeyword.pass");
     }
     
     public void testAfterPackageKeyword() throws Exception {
-        performTest("Simple", 7, null, "packageKeyword.pass");
+        performTest("Simple", 817, null, "packageKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingPackageId() throws Exception {
-        performTest("Empty", 0, "package ", "empty.pass");
+        performTest("Empty", 809, "package ", "empty.pass");
     }
     
     public void testBeforeTypingPackageId() throws Exception {
-        performTest("SimpleNoPackage", 0, "package ", "empty.pass");
+        performTest("SimpleNoPackage", 809, "package ", "empty.pass");
     }
     
     public void testBeforePackageId() throws Exception {
-        performTest("Simple", 8, null, "empty.pass");
+        performTest("Simple", 818, null, "empty.pass");
     }
     
     public void testEmptyFileTypingPackageId() throws Exception {
-        performTest("Empty", 0, "package t", "empty.pass");
+        performTest("Empty", 809, "package t", "empty.pass");
     }
     
     public void testTypingPackageId() throws Exception {
-        performTest("SimpleNoPackage", 0, "package t", "empty.pass");
+        performTest("SimpleNoPackage", 809, "package t", "empty.pass");
     }
     
     public void testOnPackageId() throws Exception {
-        performTest("Simple", 9, null, "empty.pass");
+        performTest("Simple", 819, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingPackageId() throws Exception {
-        performTest("Empty", 0, "package test", "empty.pass");
+        performTest("Empty", 809, "package test", "empty.pass");
     }
     
     public void testAfterTypingPackageId() throws Exception {
-        performTest("SimpleNoPackage", 0, "package test", "empty.pass");
+        performTest("SimpleNoPackage", 809, "package test", "empty.pass");
     }
     
     public void testAfterPackageId() throws Exception {
-        performTest("Simple", 12, null, "empty.pass");
+        performTest("Simple", 822, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingPackageIdAndSpace() throws Exception {
-        performTest("Empty", 0, "package test ", "empty.pass");
+        performTest("Empty", 809, "package test ", "empty.pass");
     }
     
     public void testAfterTypingPackageIdAndSpace() throws Exception {
-        performTest("SimpleNoPackage", 0, "package test ", "empty.pass");
+        performTest("SimpleNoPackage", 809, "package test ", "empty.pass");
     }
     
     public void testAfterPackageIdAndSpace() throws Exception {
-        performTest("Simple", 12, " ", "empty.pass");
+        performTest("Simple", 822, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingPackageDecl() throws Exception {
-        performTest("Empty", 0, "package test;", "topLevelKeywordsWithoutPackage.pass");
+        performTest("Empty", 809, "package test;", "topLevelKeywordsWithoutPackage.pass");
     }
     
     public void testAfterTypingPackageDecl() throws Exception {
-        performTest("SimpleNoPackage", 0, "package test;", "topLevelKeywordsWithoutPackage.pass");
+        performTest("SimpleNoPackage", 809, "package test;", "topLevelKeywordsWithoutPackage.pass");
     }
     
     public void testAfterPackageDecl() throws Exception {
-        performTest("Simple", 13,  null, "topLevelKeywordsWithoutPackage.pass");
+        performTest("Simple", 823,  null, "topLevelKeywordsWithoutPackage.pass");
     }
     
     // import declaration tests ------------------------------------------------
     
     public void testEmptyFileAfterTypingImportKeyword() throws Exception {
-        performTest("Empty", 0, "import", "importKeyword.pass");
+        performTest("Empty", 809, "import", "importKeyword.pass");
     }
     
     public void testAfterTypingImportKeyword() throws Exception {
-        performTest("Simple", 14, "import", "importKeyword.pass");
+        performTest("Simple", 824, "import", "importKeyword.pass");
     }
     
     public void testAfterImportKeyword() throws Exception {
-        performTest("Import", 21, null, "importKeyword.pass");
+        performTest("Import", 831, null, "importKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingImportedPackage() throws Exception {
-        performTest("Empty", 0, "import ", "staticKeywordAndAllPackages.pass");
+        performTest("Empty", 809, "import ", "staticKeywordAndAllPackages.pass");
     }
     
     public void testBeforeTypingImportedPackage() throws Exception {
-        performTest("Simple", 14, "import ", "staticKeywordAndAllPackages.pass");
+        performTest("Simple", 824, "import ", "staticKeywordAndAllPackages.pass");
     }
     
     public void testBeforeImportedPackage() throws Exception {
-        performTest("Import", 22, null, "staticKeywordAndAllPackages.pass");
+        performTest("Import", 832, null, "staticKeywordAndAllPackages.pass");
     }
     
     public void testEmptyFileTypingImportedPackage() throws Exception {
-        performTest("Empty", 0, "import j", "packagesStartingWithJ.pass");
+        performTest("Empty", 809, "import j", "packagesStartingWithJ.pass");
     }
     
     public void testTypingImportedPackage() throws Exception {
-        performTest("Simple", 14, "import j", "packagesStartingWithJ.pass");
+        performTest("Simple", 824, "import j", "packagesStartingWithJ.pass");
     }
     
     public void testOnImportedPackage() throws Exception {
-        performTest("Import", 23, null, "packagesStartingWithJ.pass");
+        performTest("Import", 833, null, "packagesStartingWithJ.pass");
     }
     
     public void testEmptyFileTypingImportedPackageBeforeStar() throws Exception {
-        performTest("Empty", 0, "import java.util.", "javaUtilContent.pass");
+        performTest("Empty", 809, "import java.util.", "javaUtilContent.pass");
     }
     
     public void testTypingImportedPackageBeforeStar() throws Exception {
-        performTest("Simple", 14, "import java.util.", "javaUtilContent.pass");
+        performTest("Simple", 824, "import java.util.", "javaUtilContent.pass");
     }
     
     public void testOnImportedPackageBeforeStar() throws Exception {
-        performTest("Import", 54, null, "javaUtilContent.pass");
+        performTest("Import", 864, null, "javaUtilContent.pass");
     }
     
     public void testEmptyFileAfterTypingImportedPackage() throws Exception {
-        performTest("Empty", 0, "import java.util.*", "empty.pass");
+        performTest("Empty", 809, "import java.util.*", "empty.pass");
     }
     
     public void testAfterTypingImportedPackage() throws Exception {
-        performTest("Simple", 14, "import java.util.*", "empty.pass");
+        performTest("Simple", 824, "import java.util.*", "empty.pass");
     }
     
     public void testAfterImportedPackage() throws Exception {
-        performTest("Import", 55, null, "empty.pass");
+        performTest("Import", 865, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingImportedClass() throws Exception {
-        performTest("Empty", 0, "import java.awt.List", "list.pass");
+        performTest("Empty", 809, "import java.awt.List", "list.pass");
     }
     
     public void testAfterTypingImportedClass() throws Exception {
-        performTest("Simple", 14, "import java.awt.List", "list.pass");
+        performTest("Simple", 824, "import java.awt.List", "list.pass");
     }
     
     public void testAfterImportedClass() throws Exception {
-        performTest("Import", 35, null, "list.pass");
+        performTest("Import", 845, null, "list.pass");
     }
     
     public void testEmptyFileAfterTypingImportedClassAndSpace() throws Exception {
-        performTest("Empty", 0, "import java.awt.List ", "empty.pass");
+        performTest("Empty", 809, "import java.awt.List ", "empty.pass");
     }
     
     public void testAfterTypingImportedClassAndSpace() throws Exception {
-        performTest("Simple", 14, "import java.awt.List ", "empty.pass");
+        performTest("Simple", 824, "import java.awt.List ", "empty.pass");
     }
     
     public void testAfterImportedClassAndSpace() throws Exception {
-        performTest("Import", 35, " ", "empty.pass");
+        performTest("Import", 845, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingImportStatement() throws Exception {
-        performTest("Empty", 0, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass");
+        performTest("Empty", 809, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass");
     }
     
     public void testAfterTypingImportStatement() throws Exception {
-        performTest("Simple", 14, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass");
+        performTest("Simple", 824, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass");
     }
     
     public void testAfterImportStatement() throws Exception {
-        performTest("Import", 36,  null, "topLevelKeywordsWithoutPackage.pass");
+        performTest("Import", 846,  null, "topLevelKeywordsWithoutPackage.pass");
     }
     
     public void testEmptyFileTypingStaticImportKeyword() throws Exception {
-        performTest("Empty", 0, "import st", "staticKeyword.pass");
+        performTest("Empty", 809, "import st", "staticKeyword.pass");
     }
     
     public void testTypingStaticImportKeyword() throws Exception {
-        performTest("Simple", 14, "import st", "staticKeyword.pass");
+        performTest("Simple", 824, "import st", "staticKeyword.pass");
     }
     
     public void testOnStaticImportKeyword() throws Exception {
-        performTest("Import", 66, null, "staticKeyword.pass");
+        performTest("Import", 876, null, "staticKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingStaticImportKeyword() throws Exception {
-        performTest("Empty", 0, "import static", "staticKeyword.pass");
+        performTest("Empty", 809, "import static", "staticKeyword.pass");
     }
     
     public void testAfterTypingStaticImportKeyword() throws Exception {
-        performTest("Simple", 14, "import static", "staticKeyword.pass");
+        performTest("Simple", 824, "import static", "staticKeyword.pass");
     }
     
     public void testAfterStaticImportKeyword() throws Exception {
-        performTest("Import", 70, null, "staticKeyword.pass");
+        performTest("Import", 880, null, "staticKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingStaticallyImportedClass() throws Exception {
-        performTest("Empty", 0, "import static ", "allPackages.pass");
+        performTest("Empty", 809, "import static ", "allPackages.pass");
     }
     
     public void testBeforeTypingStaticallyImportedClass() throws Exception {
-        performTest("Simple", 14, "import static ", "allPackages.pass");
+        performTest("Simple", 824, "import static ", "allPackages.pass");
     }
     
     public void testBeforeStaticallyImportedClass() throws Exception {
-        performTest("Import", 71, null, "allPackages.pass");
+        performTest("Import", 881, null, "allPackages.pass");
     }
     
     public void testEmptyFileTypingImportedPackageAfterErrorInPackageDeclaration() throws Exception {
-        performTest("Empty", 0, "package \nimport j", "packagesStartingWithJ.pass");
+        performTest("Empty", 809, "package \nimport j", "packagesStartingWithJ.pass");
     }
     
     public void testTypingStaticImportAfterErrorInPackageDeclaration() throws Exception {
-        performTest("SimpleNoPackage", 0, "package \nimport ", "staticKeywordAndAllPackages.pass");
+        performTest("SimpleNoPackage", 809, "package \nimport ", "staticKeywordAndAllPackages.pass");
     }
 
     public void testTypingStaticImportAfterErrorInPreviousImportDeclaration() throws Exception {
-        performTest("Simple", 14, "im\nimport ", "staticKeywordAndAllPackages.pass");
+        performTest("Simple", 824, "im\nimport ", "staticKeywordAndAllPackages.pass");
     }
     
     // class declaration tests -------------------------------------------------
     
     public void testEmptyFileAfterTypingPublicKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic", "publicKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic", "publicKeyword.pass");
     }
     
     public void testAfterPublicKeyword() throws Exception {
-        performTest("Simple", 21, null, "publicKeyword.pass");
+        performTest("Simple", 831, null, "publicKeyword.pass");
     }
     
     public void testTypingFinalClass() throws Exception {
-        performTest("Simple", 21, " f", "finalKeyword.pass");
+        performTest("Simple", 831, " f", "finalKeyword.pass");
     }
     
     public void testAfterTypingFinalClass() throws Exception {
-        performTest("Simple", 21, " final", "finalKeyword.pass");
+        performTest("Simple", 831, " final", "finalKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingClassKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic ", "classModifiersWithoutPublic.pass");
+        performTest("Empty", 809, "package test;\npublic ", "classModifiersWithoutPublic.pass");
     }
     
     public void testBeforeClassKeyword() throws Exception {
-        performTest("Simple", 22, null, "classModifiersWithoutPublic.pass");
+        performTest("Simple", 832, null, "classModifiersWithoutPublic.pass");
     }
     
     public void testEmptyFileTypingClassKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic c", "classKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic c", "classKeyword.pass");
     }
     
     public void testOnClassKeyword() throws Exception {
-        performTest("Simple", 23, null, "classKeyword.pass");
+        performTest("Simple", 833, null, "classKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingClassKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class", "classKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class", "classKeyword.pass");
     }
     
     public void testAfterClassKeyword() throws Exception {
-        performTest("Simple", 27, null, "classKeyword.pass");
+        performTest("Simple", 837, null, "classKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingClassName() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class ", "empty.pass");
+        performTest("Empty", 809, "package test;\npublic class ", "empty.pass");
     }
     
     public void testBeforeClassName() throws Exception {
-        performTest("Simple", 28, null, "empty.pass");
+        performTest("Simple", 838, null, "empty.pass");
     }
     
     public void testEmptyFileTypingClassName() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class T", "empty.pass");
+        performTest("Empty", 809, "package test;\npublic class T", "empty.pass");
     }
     
     public void testOnClassName() throws Exception {
-        performTest("Simple", 29, null, "empty.pass");
+        performTest("Simple", 839, null, "empty.pass");
     }
     
     public void testEmptyAfterFileTypingClassName() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test", "empty.pass");
+        performTest("Empty", 809, "package test;\npublic class Test", "empty.pass");
     }
     
     public void testAfterClassName() throws Exception {
-        performTest("Simple", 32, null, "empty.pass");
+        performTest("Simple", 842, null, "empty.pass");
     }
     
     public void testEmptyFileBeforeTypingExtendsKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test ", "extendsAndImplementsKeywords.pass");
+        performTest("Empty", 809, "package test;\npublic class Test ", "extendsAndImplementsKeywords.pass");
     }
     
     public void testBeforeTypingExtendsKeyword() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, null, "extendsAndImplementsKeywords.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, null, "extendsAndImplementsKeywords.pass");
     }
     
     public void testBeforeExtendsKeyword() throws Exception {
-        performTest("Simple", 33, null, "extendsAndImplementsKeywords.pass");
+        performTest("Simple", 843, null, "extendsAndImplementsKeywords.pass");
     }
     
     public void testEmptyFileTypingExtendsKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test e", "extendsKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class Test e", "extendsKeyword.pass");
     }
     
     public void testTypingExtendsKeyword() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "e", "extendsKeyword.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "e", "extendsKeyword.pass");
     }
     
     public void testOnExtendsKeyword() throws Exception {
-        performTest("Simple", 34, null, "extendsKeyword.pass");
+        performTest("Simple", 844, null, "extendsKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingExtendsKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends", "extendsKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends", "extendsKeyword.pass");
     }
     
     public void testAfterTypingExtendsKeyword() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "extends", "extendsKeyword.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "extends", "extendsKeyword.pass");
     }
     
     public void testAfterExtendsKeyword() throws Exception {
-        performTest("Simple", 40, null, "extendsKeyword.pass");
+        performTest("Simple", 850, null, "extendsKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingExtendedObject() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends ", "javaLangClasses.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends ", "javaLangClasses.pass");
     }
     
     public void testBeforeTypingExtendedObject() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "extends ", "javaLangClasses.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "extends ", "javaLangClasses.pass");
     }
     
     public void testBeforeExtendedObject() throws Exception {
-        performTest("Simple", 41, null, "javaLangClasses.pass");
+        performTest("Simple", 851, null, "javaLangClasses.pass");
     }
     
     public void testEmptyFileTypingExtendedObject() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends O", "javaLangClassesStartingWithO.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends O", "javaLangClassesStartingWithO.pass");
     }
     
     public void testTypingExtendedObject() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "extends O", "javaLangClassesStartingWithO.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "extends O", "javaLangClassesStartingWithO.pass");
     }
     
     public void testOnExtendedObject() throws Exception {
-        performTest("Simple", 42, null, "javaLangClassesStartingWithO.pass");
+        performTest("Simple", 852, null, "javaLangClassesStartingWithO.pass");
     }
     
     public void testEmptyFileAfterTypingExtendedObject() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object", "object.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object", "object.pass");
     }
     
     public void testAfterTypingExtendedObject() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "extends Object", "object.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "extends Object", "object.pass");
     }
     
     public void testAfterExtendedObject() throws Exception {
-        performTest("Simple", 47, null, "object.pass");
+        performTest("Simple", 857, null, "object.pass");
     }
     
     public void testEmptyFileBeforeTypingImplementsKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object ", "implementsKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object ", "implementsKeyword.pass");
     }
     
     public void testBeforeTypingImplementsKeyword() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "extends Object ", "implementsKeyword.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "extends Object ", "implementsKeyword.pass");
     }
     
     public void testBeforeImplementsKeyword() throws Exception {
-        performTest("Simple", 48, null, "implementsKeyword.pass");
+        performTest("Simple", 858, null, "implementsKeyword.pass");
     }
     
     public void testEmptyFileTypingImplementsKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object i", "implementsKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object i", "implementsKeyword.pass");
     }
     
     public void testTypingImplementsKeyword() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "i", "implementsKeyword.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "i", "implementsKeyword.pass");
     }
     
     public void testOnImplementsKeyword() throws Exception {
-        performTest("Simple", 49, null, "implementsKeyword.pass");
+        performTest("Simple", 859, null, "implementsKeyword.pass");
     }
     
     public void testEmptyFileAfteTypingImplementsKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object implements", "implementsKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object implements", "implementsKeyword.pass");
     }
     
     public void testAfterTypingImplementsKeyword() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "implements", "implementsKeyword.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "implements", "implementsKeyword.pass");
     }
     
     public void testAfterImplementsKeyword() throws Exception {
-        performTest("Simple", 58, null, "implementsKeyword.pass");
+        performTest("Simple", 868, null, "implementsKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingImplementedInterface() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object implements ", "javaLangInterfaces.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object implements ", "javaLangInterfaces.pass");
     }
     
     public void testBeforeTypingImplementedInterface() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "implements ", "javaLangInterfaces.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "implements ", "javaLangInterfaces.pass");
     }
     
     public void testBeforeImplementedInterface() throws Exception {
-        performTest("Simple", 59, null, "javaLangInterfaces.pass");
+        performTest("Simple", 869, null, "javaLangInterfaces.pass");
     }
     
     public void testEmptyFileAfterTypingImplementedInterface() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable", "cloneable.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable", "cloneable.pass");
     }
     
     public void testAfterTypingImplementedInterface() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable", "cloneable.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable", "cloneable.pass");
     }
     
     public void testAfterImplementedInterface() throws Exception {
-        performTest("Simple", 68, null, "cloneable.pass");
+        performTest("Simple", 878, null, "cloneable.pass");
     }
     
     public void testEmptyFileAfterTypingImplementedInterfaceAndSpace() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable ", "empty.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable ", "empty.pass");
     }
     
     public void testAfterTypingImplementedInterfaceAndSpace() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable ", "empty.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable ", "empty.pass");
     }
     
     public void testAfterImplementedInterfaceAndSpace() throws Exception {
-        performTest("Simple", 68, " ", "empty.pass");
+        performTest("Simple", 878, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingFirstImplementedInterface() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable, ", "javaLangInterfaces.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable, ", "javaLangInterfaces.pass");
     }
     
     public void testAfterTypingFirstImplementedInterface() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable, ", "javaLangInterfaces.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable, ", "javaLangInterfaces.pass");
     }
     
     public void testAfterFirstImplementedInterface() throws Exception {
-        performTest("Simple", 70, null, "javaLangInterfaces.pass");
+        performTest("Simple", 880, null, "javaLangInterfaces.pass");
     }
     
     public void testEmptyFileTypingSecondImplementedInterface() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable, R", "javaLangInterfacesStartingWithR.pass");
+        performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable, R", "javaLangInterfacesStartingWithR.pass");
     }
     
     public void testTypingSecondImplementedInterface() throws Exception {
-        performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable, R", "javaLangInterfacesStartingWithR.pass");
+        performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable, R", "javaLangInterfacesStartingWithR.pass");
     }
     
     public void testOnSecondImplementedInterface() throws Exception {
-        performTest("Simple", 71, null, "javaLangInterfacesStartingWithR.pass");
+        performTest("Simple", 881, null, "javaLangInterfacesStartingWithR.pass");
     }
     
     public void testEmptyFileTypingClassBody() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test {", "memberModifiersTypesAndGenElements.pass");
+        performTest("Empty", 809, "package test;\npublic class Test {", "memberModifiersTypesAndGenElements.pass");
     }
     
     public void testInClassBody() throws Exception {
-        performTest("Simple", 80, null, "memberModifiersTypesAndGenElements2.pass");
+        performTest("Simple", 890, null, "memberModifiersTypesAndGenElements2.pass");
     }
 
     public void testEmptyFileAfterTypingClassBody() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test {\n}", "classModifiersWithoutPublic.pass");
+        performTest("Empty", 809, "package test;\npublic class Test {\n}", "classModifiersWithoutPublic.pass");
     }
     
     public void testAfterClassBody() throws Exception {
-        performTest("Simple", 82, null, "classModifiersWithoutPublic.pass");
+        performTest("Simple", 892, null, "classModifiersWithoutPublic.pass");
     }
     
     public void testEmptyFileAfterTypingIncompleteClassBodyAndSecondClassKeyword() throws Exception {
-        performTest("Empty", 0, "package test;\npublic class Test {\nclass", "classKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic class Test {\nclass", "classKeyword.pass");
     }
     
     // interface declaration tests ---------------------------------------------
     
     public void testEmptyFileAfterTypingIntefaceName() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test ", "extendsKeyword.pass");
+        performTest("Empty", 809, "package test;\ninterface Test ", "extendsKeyword.pass");
     }
     
     public void testAfterTypingIntefaceName() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 30, null, "extendsKeyword.pass");
+        performTest("SimpleInterfaceNoExtends", 840, null, "extendsKeyword.pass");
     }
     
     public void testAfterIntefaceName() throws Exception {
-        performTest("SimpleInterface", 30, null, "extendsKeyword.pass");
+        performTest("SimpleInterface", 840, null, "extendsKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingExtendsInInteface() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test extends ", "javaLangInterfaces.pass");
+        performTest("Empty", 809, "package test;\ninterface Test extends ", "javaLangInterfaces.pass");
     }
     
     public void testAfterTypingExtendsInInterface() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 30, "extends ", "javaLangInterfaces.pass");
+        performTest("SimpleInterfaceNoExtends", 840, "extends ", "javaLangInterfaces.pass");
     }
     
     public void testAfterExtendsInInteface() throws Exception {
-        performTest("SimpleInterface", 38, null, "javaLangInterfaces.pass");
+        performTest("SimpleInterface", 848, null, "javaLangInterfaces.pass");
     }
     
     // enum declaration tests --------------------------------------------------
     
     public void testEmptyFileAfterTypingEnumName() throws Exception {
-        performTest("Empty", 0, "package test;\npublic enum Test ", "implementsKeyword.pass");
+        performTest("Empty", 809, "package test;\npublic enum Test ", "implementsKeyword.pass");
     }
     
     public void testAfterTypingEnumName() throws Exception {
-        performTest("SimpleEnumNoImplements", 32, null, "implementsKeyword.pass");
+        performTest("SimpleEnumNoImplements", 842, null, "implementsKeyword.pass");
     }
     
     public void testAfterEnumName() throws Exception {
-        performTest("SimpleEnum", 32, null, "implementsKeyword.pass");
+        performTest("SimpleEnum", 842, null, "implementsKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingImplementsInEnum() throws Exception {
-        performTest("Empty", 0, "package test;\npublic enum Test implements ", "javaLangInterfaces.pass");
+        performTest("Empty", 809, "package test;\npublic enum Test implements ", "javaLangInterfaces.pass");
     }
     
     public void testAfterTypingImplementsInEnum() throws Exception {
-        performTest("SimpleEnumNoImplements", 43, null, "javaLangInterfaces.pass");
+        performTest("SimpleEnumNoImplements", 853, null, "javaLangInterfaces.pass");
     }
     
     public void testAfterImplementsInEnum() throws Exception {
-        performTest("SimpleEnum", 43, null, "javaLangInterfaces.pass");
+        performTest("SimpleEnum", 853, null, "javaLangInterfaces.pass");
     }
     
     // method declaration tests -------------------------------------------------
     
     public void testEmptyFileTypingPublicKeywordInMethodDecl() throws Exception {
-        performTest("MethodStart", 40, "p", "memberModifiersStartingWithP.pass");
+        performTest("MethodStart", 850, "p", "memberModifiersStartingWithP.pass");
     }
     
     public void testOnPublicKeywordInMethodDecl() throws Exception {
-        performTest("Method", 41, null, "memberModifiersStartingWithP.pass");
+        performTest("Method", 851, null, "memberModifiersStartingWithP.pass");
     }
     
     public void testEmptyFileAfterTypingPublicKeywordInMethodDecl() throws Exception {
-        performTest("MethodStart", 40, "public", "publicKeyword.pass");
+        performTest("MethodStart", 850, "public", "publicKeyword.pass");
     }
     
     public void testAfterPublicKeywordInMethodDecl() throws Exception {
-        performTest("Method", 46, null, "publicKeyword.pass");
+        performTest("Method", 856, null, "publicKeyword.pass");
     }
     
     public void testTypingStaticMethodDecl() throws Exception {
-        performTest("Method", 46, " sta", "staticKeyword.pass");
+        performTest("Method", 856, " sta", "staticKeyword.pass");
     }
     
     public void testAfterTypingStaticMethodDecl() throws Exception {
-        performTest("Method", 46, " static", "staticKeyword.pass");
+        performTest("Method", 856, " static", "staticKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingReturnValue() throws Exception {
-        performTest("MethodStart", 40, "public ", "memberModifiersAndTypesWithoutPublic.pass");
+        performTest("MethodStart", 850, "public ", "memberModifiersAndTypesWithoutPublic.pass");
     }
     
     public void testBeforeReturnValue() throws Exception {
-        performTest("Method", 47, null, "memberModifiersAndTypesWithoutPublic.pass");
+        performTest("Method", 857, null, "memberModifiersAndTypesWithoutPublic.pass");
     }
     
     public void testEmptyFileTypingReturnValue() throws Exception {
-        performTest("MethodStart", 40, "public voi", "voidKeyword.pass");
+        performTest("MethodStart", 850, "public voi", "voidKeyword.pass");
     }
     
     public void testOnReturnValue() throws Exception {
-        performTest("Method", 50, null, "voidKeyword.pass");
+        performTest("Method", 860, null, "voidKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingReturnValue() throws Exception {
-        performTest("MethodStart", 40, "public void", "voidKeyword.pass");
+        performTest("MethodStart", 850, "public void", "voidKeyword.pass");
     }
     
     public void testAfterReturnValue() throws Exception {
-        performTest("Method", 51, null, "voidKeyword.pass");
+        performTest("Method", 861, null, "voidKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingMethodName() throws Exception {
-        performTest("MethodStart", 40, "public void ", "empty.pass");
+        performTest("MethodStart", 850, "public void ", "empty.pass");
     }
     
     public void testBeforeMethodName() throws Exception {
-        performTest("Method", 52, null, "empty.pass");
+        performTest("Method", 862, null, "empty.pass");
     }
     
     public void testEmptyFileTypingMethodName() throws Exception {
-        performTest("MethodStart", 40, "public void o", "empty.pass");
+        performTest("MethodStart", 850, "public void o", "empty.pass");
     }
     
     public void testOnMethodName() throws Exception {
-        performTest("Method", 53, null, "empty.pass");
+        performTest("Method", 863, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingMethodName() throws Exception {
-        performTest("MethodStart", 40, "public void op", "empty.pass");
+        performTest("MethodStart", 850, "public void op", "empty.pass");
     }
     
     public void testAfterMethodName() throws Exception {
-        performTest("Method", 54, null, "empty.pass");
+        performTest("Method", 864, null, "empty.pass");
     }
     
     public void testEmptyFileBeforeTypingFirstParameter() throws Exception {
-        performTest("MethodStart", 40, "public void op(", "parameterTypes.pass");
+        performTest("MethodStart", 850, "public void op(", "parameterTypes.pass");
     }
     
     public void testBeforeTypingFirstParameter() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, null, "parameterTypes.pass");
+        performTest("MethodNoParamsAndThrows", 865, null, "parameterTypes.pass");
     }
 
     public void testBeforeFirstParameter() throws Exception {
-        performTest("Method", 55, null, "parameterTypes.pass");
+        performTest("Method", 865, null, "parameterTypes.pass");
     }
     
     public void testEmptyFileTypingFirstParameterType() throws Exception {
-        performTest("MethodStart", 40, "public void op(i", "intKeyword.pass");
+        performTest("MethodStart", 850, "public void op(i", "intKeyword.pass");
     }
     
     public void testTypingFirstParameterType() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "i", "intKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 865, "i", "intKeyword.pass");
     }
 
     public void testOnFirstParameterType() throws Exception {
-        performTest("Method", 56, null, "intKeyword.pass");
+        performTest("Method", 866, null, "intKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingFirstParameterType() throws Exception {
-        performTest("MethodStart", 40, "public void op(int", "intKeyword.pass");
+        performTest("MethodStart", 850, "public void op(int", "intKeyword.pass");
     }
     
     public void testAfterTypingFirstParameterType() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int", "intKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int", "intKeyword.pass");
     }
 
     public void testAfterFirstParameterType() throws Exception {
-        performTest("Method", 58, null, "intKeyword.pass");
+        performTest("Method", 868, null, "intKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingFirstParameterName() throws Exception {
-        performTest("MethodStart", 40, "public void op(int ", "intVarName.pass");
+        performTest("MethodStart", 850, "public void op(int ", "intVarName.pass");
     }
     
     public void testBeforeTypingFirstParameterName() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int ", "intVarName.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int ", "intVarName.pass");
     }
 
     public void testBeforeFirstParameterName() throws Exception {
-        performTest("Method", 59, null, "intVarName.pass");
+        performTest("Method", 869, null, "intVarName.pass");
     }
     
     public void testEmptyFileTypingFirstParameterName() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a", "empty.pass");
+        performTest("MethodStart", 850, "public void op(int a", "empty.pass");
     }
     
     public void testTypingFirstParameterName() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a", "empty.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a", "empty.pass");
     }
 
     public void testOnFirstParameterName() throws Exception {
-        performTest("Method", 60, null, "empty.pass");
+        performTest("Method", 870, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingFirstParameterNameAndSpace() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a ", "empty.pass");
+        performTest("MethodStart", 850, "public void op(int a ", "empty.pass");
     }
     
     public void testAfterTypingFirstParameterNameAndSpace() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a ", "empty.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a ", "empty.pass");
     }
 
     public void testAfterFirstParameterNameAndSpace() throws Exception {
-        performTest("Method", 60, " ", "empty.pass");
+        performTest("Method", 870, " ", "empty.pass");
     }
     
     public void testEmptyFileBeforeTypingSecondParameter() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a,", "parameterTypes.pass");
+        performTest("MethodStart", 850, "public void op(int a,", "parameterTypes.pass");
     }
     
     public void testBeforeTypingSecondParameter() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a,", "parameterTypes.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a,", "parameterTypes.pass");
     }
 
     public void testBeforeSecondParameter() throws Exception {
-        performTest("Method", 61, null, "parameterTypes.pass");
+        performTest("Method", 871, null, "parameterTypes.pass");
     }
     
     public void testEmptyFileTypingSecondParameterType() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a, bo", "booleanKeyword.pass");
+        performTest("MethodStart", 850, "public void op(int a, bo", "booleanKeyword.pass");
     }
     
     public void testTypingSecondParameterType() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a, bo", "booleanKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a, bo", "booleanKeyword.pass");
     }
 
     public void testOnSecondParameterType() throws Exception {
-        performTest("Method", 64, null, "booleanKeyword.pass");
+        performTest("Method", 874, null, "booleanKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingSecondParameterType() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a, boolean", "booleanKeyword.pass");
+        performTest("MethodStart", 850, "public void op(int a, boolean", "booleanKeyword.pass");
     }
     
     public void testAfterTypingSecondParameterType() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a, boolean", "booleanKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a, boolean", "booleanKeyword.pass");
     }
 
     public void testAfterSecondParameterType() throws Exception {
-        performTest("Method", 69, null, "booleanKeyword.pass");
+        performTest("Method", 879, null, "booleanKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingSecondParameterName() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a, boolean ", "booleanVarName.pass");
+        performTest("MethodStart", 850, "public void op(int a, boolean ", "booleanVarName.pass");
     }
     
     public void testBeforeTypingSecondParameterName() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a, boolean ", "booleanVarName.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a, boolean ", "booleanVarName.pass");
     }
 
     public void testBeforeSecondParameterName() throws Exception {
-        performTest("Method", 70, null, "booleanVarName.pass");
+        performTest("Method", 880, null, "booleanVarName.pass");
     }
     
     public void testEmptyFileTypingSecondParameterName() throws Exception {
-        performTest("MethodStart", 40, "public void op(int a, boolean b", "booleanVarName.pass");
+        performTest("MethodStart", 850, "public void op(int a, boolean b", "booleanVarName.pass");
     }
     
     public void testTypingSecondParameterName() throws Exception {
-        performTest("MethodNoParamsAndThrows", 55, "int a, boolean b", "booleanVarName.pass");
+        performTest("MethodNoParamsAndThrows", 865, "int a, boolean b", "booleanVarName.pass");
     }
 
     public void testOnSecondParameterName() throws Exception {
-        performTest("Method", 71, null, "booleanVarName.pass");
+        performTest("Method", 881, null, "booleanVarName.pass");
     }
 
     public void testEmptyFileBeforeTypingThrowsKeyword() throws Exception {
-        performTest("MethodStart", 40, "public void op() ", "throwsKeyword.pass");
+        performTest("MethodStart", 850, "public void op() ", "throwsKeyword.pass");
     }
     
     public void testBeforeTypingThrowsKeyword() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, " ", "throwsKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 866, " ", "throwsKeyword.pass");
     }
 
     public void testBeforeThrowsKeyword() throws Exception {
-        performTest("Method", 73, null, "throwsKeyword.pass");
+        performTest("Method", 883, null, "throwsKeyword.pass");
     }
     
     public void testEmptyFileTypingThrowsKeyword() throws Exception {
-        performTest("MethodStart", 40, "public void op() t", "throwsKeyword.pass");
+        performTest("MethodStart", 850, "public void op() t", "throwsKeyword.pass");
     }
     
     public void testTypingThrowsKeyword() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, " t", "throwsKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 866, " t", "throwsKeyword.pass");
     }
 
     public void testOnThrowsKeyword() throws Exception {
-        performTest("Method", 74, null, "throwsKeyword.pass");
+        performTest("Method", 884, null, "throwsKeyword.pass");
     }
     
     public void testEmptyAfterFileTypingThrowsKeyword() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws", "throwsKeyword.pass");
+        performTest("MethodStart", 850, "public void op() throws", "throwsKeyword.pass");
     }
     
     public void testAfterTypingThrowsKeyword() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, " throws", "throwsKeyword.pass");
+        performTest("MethodNoParamsAndThrows", 866, " throws", "throwsKeyword.pass");
     }
 
     public void testAfterThrowsKeyword() throws Exception {
-        performTest("Method", 79, null, "throwsKeyword.pass");
+        performTest("Method", 889, null, "throwsKeyword.pass");
     }
         
     public void testEmptyFileBeforeTypingThrownException() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws ", "javaLangThrowables.pass");
+        performTest("MethodStart", 850, "public void op() throws ", "javaLangThrowables.pass");
     }
     
     public void testBeforeTypingThrownException() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, "throws ", "javaLangThrowables.pass");
+        performTest("MethodNoParamsAndThrows", 866, "throws ", "javaLangThrowables.pass");
     }
     
     public void testBeforeThrownException() throws Exception {
-        performTest("Method", 80, null, "javaLangThrowables.pass");
+        performTest("Method", 890, null, "javaLangThrowables.pass");
     }
     
     public void testEmptyFileTypingThrownException() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws N", "javaLangThrowablesStartingWithN.pass");
+        performTest("MethodStart", 850, "public void op() throws N", "javaLangThrowablesStartingWithN.pass");
     }
     
     public void testTypingThrownException() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, "throws N", "javaLangThrowablesStartingWithN.pass");
+        performTest("MethodNoParamsAndThrows", 866, "throws N", "javaLangThrowablesStartingWithN.pass");
     }
     
     public void testOnThrownException() throws Exception {
-        performTest("Method", 81, null, "javaLangThrowablesStartingWithN.pass");
+        performTest("Method", 891, null, "javaLangThrowablesStartingWithN.pass");
     }
     
     public void testEmptyFileAfterTypingThrownException() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws NullPointerException", "nullPointerException.pass");
+        performTest("MethodStart", 850, "public void op() throws NullPointerException", "nullPointerException.pass");
     }
     
     public void testAfterTypingThrownException() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException", "nullPointerException.pass");
+        performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException", "nullPointerException.pass");
     }
     
     public void testAfterThrownException() throws Exception {
-        performTest("Method", 100, null, "nullPointerException.pass");
+        performTest("Method", 910, null, "nullPointerException.pass");
     }
     
     public void testEmptyFileAfterTypingThrownExceptionAndSpace() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws NullPointerException ", "empty.pass");
+        performTest("MethodStart", 850, "public void op() throws NullPointerException ", "empty.pass");
     }
     
     public void testAfterTypingThrownExceptionAndSpace() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException ", "empty.pass");
+        performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException ", "empty.pass");
     }
     
     public void testAfterThrownExceptionAndSpace() throws Exception {
-        performTest("Method", 100, " ", "empty.pass");
+        performTest("Method", 910, " ", "empty.pass");
     }
     
     public void testEmptyFileBeforeTypingSecondThrownException() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws NullPointerException, ", "javaLangThrowables.pass");
+        performTest("MethodStart", 850, "public void op() throws NullPointerException, ", "javaLangThrowables.pass");
     }
     
     public void testBeforeTypingSecondThrownException() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException, ", "javaLangThrowables.pass");
+        performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException, ", "javaLangThrowables.pass");
     }
     
     public void testBeforeSecondThrownExceptionAndSpace() throws Exception {
-        performTest("Method", 102, null, "javaLangThrowables.pass");
+        performTest("Method", 912, null, "javaLangThrowables.pass");
     }
     
     public void testEmptyFileTypingSecondThrownException() throws Exception {
-        performTest("MethodStart", 40, "public void op() throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass");
+        performTest("MethodStart", 850, "public void op() throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass");
     }
     
     public void testTypingSecondThrownException() throws Exception {
-        performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass");
+        performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass");
     }
     
     public void testOnSecondThrownException() throws Exception {
-        performTest("Method", 103, null, "javaLangThrowablesStartingWithI.pass");
+        performTest("Method", 913, null, "javaLangThrowablesStartingWithI.pass");
     }
     
     public void testEmptyFileAfterTypingMethodBody() throws Exception {
-        performTest("MethodStart", 40, "public void op() {\n}", "memberModifiersTypesAndGenElements.pass");
+        performTest("MethodStart", 850, "public void op() {\n}", "memberModifiersTypesAndGenElements.pass");
     }
     
     public void testAfterMethodBody() throws Exception {
-        performTest("Method", 131, null, "memberModifiersTypesAndGenElements.pass");
+        performTest("Method", 941, null, "memberModifiersTypesAndGenElements.pass");
     }
     
     public void testEmptyFileAfterTypingIncompleteMethodBodyAndPublicKeyword() throws Exception {
-        performTest("MethodStart", 40, "public void op() {\npublic", "empty.pass");
+        performTest("MethodStart", 850, "public void op() {\npublic", "empty.pass");
     }    
 
     public void testEmptyFileAfterTypingIncompleteMethodBodyAndPublicKeywordAndSpace() throws Exception {
-        performTest("MethodStart", 40, "public void op() {\npublic ", "memberModifiersAndTypesWithoutPublic.pass");
+        performTest("MethodStart", 850, "public void op() {\npublic ", "memberModifiersAndTypesWithoutPublic.pass");
     }    
 
     // field declaration tests -------------------------------------------------
     
     public void testEmptyFileAfterTypingFieldNameAndSpace() throws Exception {
-        performTest("MethodStart", 40, "public int field ", "empty.pass");
+        performTest("MethodStart", 850, "public int field ", "empty.pass");
     }
     
     public void testAfterTypingFieldNameAndSpace() throws Exception {
-        performTest("FieldNoInit", 56, " ", "empty.pass");
+        performTest("FieldNoInit", 866, " ", "empty.pass");
     }
     
     public void testAfterFieldNameAndSpace() throws Exception {
-        performTest("Field", 57, null, "empty.pass");
+        performTest("Field", 867, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingAssignmentInField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field =", "typesLocalMembersAndSmartInt.pass");
+        performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field =", "typesLocalMembersAndSmartInt.pass");
     }
     
     public void testAfterTypingAssignmentInField() throws Exception {
-        performTest("FieldNoInit", 56, " =", "typesLocalMembersAndSmartInt.pass");
+        performTest("FieldNoInit", 866, " =", "typesLocalMembersAndSmartInt.pass");
     }
     
     public void testAfterAssignmentInField() throws Exception {
-        performTest("Field", 58, null, "typesLocalMembersAndSmartInt.pass");
+        performTest("Field", 868, null, "typesLocalMembersAndSmartInt.pass");
     }
     
     public void testEmptyFileBeforeTypingInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field = ", "typesLocalMembersAndSmartInt.pass");
+        performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field = ", "typesLocalMembersAndSmartInt.pass");
     }
     
     public void testBeforeTypingInitOfField() throws Exception {
-        performTest("FieldNoInit", 56, " = ", "typesLocalMembersAndSmartInt.pass");
+        performTest("FieldNoInit", 866, " = ", "typesLocalMembersAndSmartInt.pass");
     }
     
     public void testBeforeInitOfField() throws Exception {
-        performTest("Field", 59, null, "typesLocalMembersAndSmartInt.pass");
+        performTest("Field", 869, null, "typesLocalMembersAndSmartInt.pass");
     }
     
     public void testEmptyFileBeforeTypingInitOfStaticField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField = ", "typesAndStaticLocalMembers.pass");
+        performTest("MethodStart", 850, "public static int staticField = ", "typesAndStaticLocalMembers.pass");
     }
     
     public void testBeforeTypingInitOfStaticField() throws Exception {
-        performTest("FieldNoInit", 91, " = ", "typesAndStaticLocalMembers.pass");
+        performTest("FieldNoInit", 901, " = ", "typesAndStaticLocalMembers.pass");
     }
     
     public void testBeforeInitOfStaticField() throws Exception {
-        performTest("Field", 112, null, "typesAndStaticLocalMembers.pass");
+        performTest("Field", 922, null, "typesAndStaticLocalMembers.pass");
     }
     
     public void testEmptyFileTypingInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public int field = ha", "intHashCode.pass");
+        performTest("MethodStart", 850, "public int field = ha", "intHashCode.pass");
     }
     
     public void testTypingInitOfField() throws Exception {
-        performTest("FieldNoInit", 56, " = ha", "intHashCode.pass");
+        performTest("FieldNoInit", 866, " = ha", "intHashCode.pass");
     }
     
     public void testOnInitOfField() throws Exception {
-        performTest("Field", 61, null, "intHashCode.pass");
+        performTest("Field", 871, null, "intHashCode.pass");
     }
     
     public void testEmptyFileTypingMethodInvocationWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field = hashCode(", "typesAndLocalMembers.pass");
+        performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field = hashCode(", "typesAndLocalMembers.pass");
     }
     
     public void testTypingMethodInvocationWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 56, " = hashCode(", "typesAndLocalMembers.pass");
+        performTest("FieldNoInit", 866, " = hashCode(", "typesAndLocalMembers.pass");
     }
     
     public void testOnMethodInvocationWithinInitOfField() throws Exception {
-        performTest("Field", 68, null, "typesAndLocalMembers.pass");
+        performTest("Field", 878, null, "typesAndLocalMembers.pass");
     }
     
     public void testEmptyFileAfterTypingMethodInvocationWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public int field = hashCode()", "empty.pass");
+        performTest("MethodStart", 850, "public int field = hashCode()", "empty.pass");
     }
     
     public void testAfterTypingMethodInvocationWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 56, " = hashCode()", "empty.pass");
+        performTest("FieldNoInit", 866, " = hashCode()", "empty.pass");
     }
     
     public void testAfterMethodInvocationWithinInitOfField() throws Exception {
-        performTest("Field", 69, null, "empty.pass");
+        performTest("Field", 879, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingOperatorWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass");
+        performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass");
     }
     
     public void testAfterTypingOperatorWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 56, " = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass");
+        performTest("FieldNoInit", 866, " = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass");
     }
     
     public void testAfterOperatorWithinInitOfField() throws Exception {
-        performTest("Field", 71, null, "typesLocalMembersAndSmartPrimitives.pass");
+        performTest("Field", 881, null, "typesLocalMembersAndSmartPrimitives.pass");
     }
     
     public void testEmptyFileAfterTypingConstantWithinInitOfField() throws Exception {
-        performTest("MethodStart", 40, "public int field = hashCode() / 10", "empty.pass");
+        performTest("MethodStart", 850, "public int field = hashCode() / 10", "empty.pass");
     }
     
     public void testAfterTypingConstantWithinInitOfField() throws Exception {
-        performTest("FieldNoInit", 56, " = hashCode() / 10", "empty.pass");
+        performTest("FieldNoInit", 866, " = hashCode() / 10", "empty.pass");
     }
     
     public void testAfterConstantWithinInitOfField() throws Exception {
-        performTest("Field", 74, null, "empty.pass");
+        performTest("Field", 884, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingFieldDeclaration() throws Exception {
-        performTest("MethodStart", 40, "public int field = hashCode() / 10;", "memberModifiersTypesAndGenElements3.pass");
+        performTest("MethodStart", 850, "public int field = hashCode() / 10;", "memberModifiersTypesAndGenElements3.pass");
     }
     
     public void testAfterFieldDeclaration() throws Exception {
-        performTest("Field", 75, null, "memberModifiersTypesAndGenElements4.pass");
+        performTest("Field", 885, null, "memberModifiersTypesAndGenElements4.pass");
     }
     
     public void testTypingStaticFieldAfterErrorInPreviousFieldDeclaration() throws Exception {
-        performTest("MethodStart", 40, "public int \npublic sta", "staticKeyword.pass");
+        performTest("MethodStart", 850, "public int \npublic sta", "staticKeyword.pass");
     }
 
     public void testTypingStaticFieldAfterErrorInPreviousFieldInitialization() throws Exception {
-        performTest("MethodStart", 40, "public int field = has\npublic sta", "staticKeyword.pass");
+        performTest("MethodStart", 850, "public int field = has\npublic sta", "staticKeyword.pass");
     }
     
     // basic method body tests -------------------------------------------------
    
     public void testEmptyFileTypingMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 89, null, "methodBodyContent.pass");
+        performTest("SimpleMethodBodyStart", 899, null, "methodBodyContent.pass");
     }
     
     public void testTypingMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 89, null, "methodBodyContent.pass");
+        performTest("SimpleEmptyMethodBody", 899, null, "methodBodyContent.pass");
     }
     
     public void testInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 89, null, "methodBodyContent.pass");
+        performTest("SimpleMethodBody", 899, null, "methodBodyContent.pass");
     }
     
     public void testEmptyFileTypingLocalVariableTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "bo", "booleanKeyword.pass");
+        performTest("SimpleMethodBodyStart", 908, "bo", "booleanKeyword.pass");
     }
     
     public void testTypingLocalVariableTypeInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "bo", "booleanKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 908, "bo", "booleanKeyword.pass");
     }
     
     public void testLocalVariableTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 100, null, "booleanKeyword.pass");
+        performTest("SimpleMethodBody", 910, null, "booleanKeyword.pass");
     }
     
     public void testEmptyFileAfterTypingLocalVariableTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean", "booleanKeyword.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean", "booleanKeyword.pass");
     }
     
     public void testAfterTypingLocalVariableTypeInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean", "booleanKeyword.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean", "booleanKeyword.pass");
     }
     
     public void testAfterLocalVariableTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 105, null, "booleanKeyword.pass");
+        performTest("SimpleMethodBody", 915, null, "booleanKeyword.pass");
     }
     
     public void testEmptyFileBeforeTypingLocalVariableNameInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean ", "booleanVarName.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean ", "booleanVarName.pass");
     }
     
     public void testBeforeTypingLocalVariableNameInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean ", "booleanVarName.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean ", "booleanVarName.pass");
     }
     
     public void testBeforeLocalVariableNameInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 106, null, "booleanVarName.pass");
+        performTest("SimpleMethodBody", 916, null, "booleanVarName.pass");
     }
     
     public void testEmptyFileTypingLocalVariableNameInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b", "booleanVarName.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b", "booleanVarName.pass");
     }
     
     public void testTypingLocalVariableNameInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b", "booleanVarName.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b", "booleanVarName.pass");
     }
     
     public void testOnLocalVariableNameInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 107, null, "booleanVarName.pass");
+        performTest("SimpleMethodBody", 917, null, "booleanVarName.pass");
     }
     
     public void testEmptyFileAfterTypingLocalVariableNameAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b ", "empty.pass");
     }
     
     public void testAfterTypingLocalVariableNameAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b ", "empty.pass");
     }
     
     public void testAfterLocalVariableNameAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 107, " ", "empty.pass");
+        performTest("SimpleMethodBody", 917, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingLocalVariableInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;", "methodBodyContentAndLocalVar.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;", "methodBodyContentAndLocalVar.pass");
     }
     
     public void testAfterTypingLocalVariableInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;", "methodBodyContentAndLocalVar.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;", "methodBodyContentAndLocalVar.pass");
     }
     
     public void testAfterLocalVariableInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 108, null, "methodBodyContentAndLocalVar.pass");
+        performTest("SimpleMethodBody", 918, null, "methodBodyContentAndLocalVar.pass");
     }
  
     public void testEmptyFileTypingTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "Sy", "system.pass");
+        performTest("SimpleMethodBodyStart", 908, "Sy", "system.pass");
     }
     
     public void testTypingTypeInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "Sy", "system.pass");
+        performTest("SimpleEmptyMethodBody", 908, "Sy", "system.pass");
     }
     
     public void testTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 112, null, "system.pass");
+        performTest("SimpleMethodBody", 922, null, "system.pass");
     }
     
     public void testEmptyFileAfterTypingTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System", "system.pass");
+        performTest("SimpleMethodBodyStart", 908, "System", "system.pass");
     }
     
     public void testAfterTypingTypeInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System", "system.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System", "system.pass");
     }
     
     public void testAfterTypeInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 116, null, "system.pass");
+        performTest("SimpleMethodBody", 926, null, "system.pass");
     }
     
     public void testEmptyFileAfterTypingTypeAndDotInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System.", "systemContent.pass");
+        performTest("SimpleMethodBodyStart", 908, "System.", "systemContent.pass");
     }
     
     public void testAfterTypingTypeAndDotInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System.", "systemContent.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System.", "systemContent.pass");
     }
     
     public void testAfterTypeAndDotInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 117, null, "systemContent.pass");
+        performTest("SimpleMethodBody", 927, null, "systemContent.pass");
     }
 
     public void testEmptyFileTypingFieldAccessInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System.o", "systemOut.pass");
+        performTest("SimpleMethodBodyStart", 908, "System.o", "systemOut.pass");
     }
     
     public void testTypingFieldAccessInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System.o", "systemOut.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System.o", "systemOut.pass");
     }
     
     public void testFieldAccessInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 118, null, "systemOut.pass");
+        performTest("SimpleMethodBody", 928, null, "systemOut.pass");
     }
    
     public void testEmptyFileAfterTypingFieldAccessInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System.out", "systemOut.pass");
+        performTest("SimpleMethodBodyStart", 908, "System.out", "systemOut.pass");
     }
     
     public void testAfterTypingFieldAccessInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System.out", "systemOut.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System.out", "systemOut.pass");
     }
     
     public void testAfterFieldAccessInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 120, null, "systemOut.pass");
+        performTest("SimpleMethodBody", 930, null, "systemOut.pass");
     }
     
     public void testEmptyFileAfterTypingFieldAccessAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System.out ", "instanceOf.pass");
+        performTest("SimpleMethodBodyStart", 908, "System.out ", "instanceOf.pass");
     }
     
     public void testAfterTypingFieldAccessAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System.out ", "instanceOf.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System.out ", "instanceOf.pass");
     }
     
     public void testAfterFieldAccessAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 120, " ", "instanceOf.pass");
+        performTest("SimpleMethodBody", 930, " ", "instanceOf.pass");
     }
     
     public void testEmptyFileAfterTypingFieldAccessAndDotInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System.out.", "systemOutContent.pass");
+        performTest("SimpleMethodBodyStart", 908, "System.out.", "systemOutContent.pass");
     }
     
     public void testAfterTypingFieldAccessAndDotInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System.out.", "systemOutContent.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System.out.", "systemOutContent.pass");
     }
     
     public void testAfterFieldAccessAndDotInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 121, null, "systemOutContent.pass");
+        performTest("SimpleMethodBody", 931, null, "systemOutContent.pass");
     }
 
     public void testEmptyFileTypingMethodInvocationInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass");
     }
     
     public void testTypingMethodInvocationInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass");
     }
     
     public void testMethodInvocationInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 129, null, "typesLocalMembersVarsAndSmarts.pass");
+        performTest("SimpleMethodBody", 939, null, "typesLocalMembersVarsAndSmarts.pass");
     }
     
     public void testEmptyFileTypingMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass");
     }
     
     public void testTypingMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass");
     }
     
     public void testOnMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 130, null, "typesLocalMembersVarsAndSmartsStartingWithB.pass");
+        performTest("SimpleMethodBody", 940, null, "typesLocalMembersVarsAndSmartsStartingWithB.pass");
     }
     
     public void testEmptyFileTypingMethodInvocationParameterAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "System.out.println(b ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "System.out.println(b ", "empty.pass");
     }
     
     public void testTypingMethodInvocationParameterAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "System.out.println(b ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "System.out.println(b ", "empty.pass");
     }
     
     public void testAfterMethodInvocationParameterAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 130, " ", "empty.pass");
+        performTest("SimpleMethodBody", 940, " ", "empty.pass");
     }
     
     public void testEmptyFileBeforeTypingSecondMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass");
     }
     
     public void testBeforeTypingSecondMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass");
     }
     
     public void testBeforeSecondMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 130, ", ", "typesLocalMembersAndVars.pass");
+        performTest("SimpleMethodBody", 940, ", ", "typesLocalMembersAndVars.pass");
     }
     
     public void testEmptyFileTypingSecondMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass");
     }
     
     public void testTypingSecondMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass");
     }
     
     public void testOnSecondMethodInvocationParameterInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 130, ", b", "typesLocalMembersAndVarsStartingWithB.pass");
+        performTest("SimpleMethodBody", 940, ", b", "typesLocalMembersAndVarsStartingWithB.pass");
     }
     
     public void testEmptyFileAfterTypingMethodInvocationParametersInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b)", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b)", "empty.pass");
     }
     
     public void testAfterTypingMethodInvocationParametersInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b)", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b)", "empty.pass");
     }
     
     public void testAfteMethodInvocationParametersInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 131, null, "empty.pass");
+        performTest("SimpleMethodBody", 941, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingMethodInvocationParametersAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b) ", "empty.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b) ", "empty.pass");
     }
     
     public void testAfterTypingMethodInvocationParametersAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b) ", "empty.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b) ", "empty.pass");
     }
     
     public void testAfteMethodInvocationParametersAndSpaceInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 131, " ", "empty.pass");
+        performTest("SimpleMethodBody", 941, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingMethodInvocationInMethodBody() throws Exception {
-        performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass");
+        performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass");
     }
     
     public void testAfterTypingMethodInvocationInMethodBody() throws Exception {
-        performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass");
+        performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass");
     }
     
     public void testAfteMethodInvocationInMethodBody() throws Exception {
-        performTest("SimpleMethodBody", 132, null, "methodBodyContentAndLocalVar.pass");
+        performTest("SimpleMethodBody", 942, null, "methodBodyContentAndLocalVar.pass");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java
index 771107d..c079a0c 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java
@@ -30,99 +30,99 @@ public class JavaCompletionTaskElementCreatingTest extends CompletionTestBase {
     }
 
     public void testUnimplementedMethod() throws Exception {
-        performTest("UnimplementedMethod", 85, "", "UnimplementedMethod.pass");
+        performTest("UnimplementedMethod", 895, "", "UnimplementedMethod.pass");
     }
     
     public void testOverrideAbstractList() throws Exception {
-        performTest("OverrideAbstractList", 118, "", "OverrideAbstractList.pass");
+        performTest("OverrideAbstractList", 928, "", "OverrideAbstractList.pass");
     }
     
     /**
      * Checks that cc: offers just one size() for override, but offers size() for both implement AND override.
      */
     public void testOverrideAbstractListAbstract() throws Exception {
-        performTest("OverrideAbstractListAbstract", 126, "", "OverrideAbstractListAbstract.pass");
+        performTest("OverrideAbstractListAbstract", 936, "", "OverrideAbstractListAbstract.pass");
     }
     
     /** CC should not offer overriding private method from superclass */
     public void testOverridePrivateMethod() throws Exception {
-        performTest("OverridePrivateMethod", 89, "cl", "OverridePrivateMethod.pass");
+        performTest("OverridePrivateMethod", 899, "cl", "OverridePrivateMethod.pass");
     }
     
     /** CC should not offer overriding package private method from superclass in a different package */
     public void testOverridePackagePrivateMethod() throws Exception {
-        performTest("OverridePackagePrivateMethod", 108, "add", "OverridePackagePrivateMethod.pass");
+        performTest("OverridePackagePrivateMethod", 918, "add", "OverridePackagePrivateMethod.pass");
     }
 
     public void testOverrideAbstractListWithPrefix() throws Exception {
-        performTest("OverrideAbstractList", 118, "to", "OverrideAbstractListWithPrefix.pass");
+        performTest("OverrideAbstractList", 928, "to", "OverrideAbstractListWithPrefix.pass");
     }
     
     public void testOverrideFinalize() throws Exception {
-        performTest("OverrideAbstractList", 118, "fin", "OverrideFinalize.pass");
+        performTest("OverrideAbstractList", 928, "fin", "OverrideFinalize.pass");
     }
     
     public void testOverrideAbstractList2a() throws Exception {
-        performTest("OverrideAbstractList2", 139, "ad", "OverrideAbstractList2a.pass");
+        performTest("OverrideAbstractList2", 949, "ad", "OverrideAbstractList2a.pass");
     }
     
     public void testOverrideAbstractList2b() throws Exception {
-        performTest("OverrideAbstractList2", 139, "ge", "OverrideAbstractList2b.pass");
+        performTest("OverrideAbstractList2", 949, "ge", "OverrideAbstractList2b.pass");
     }
     
     public void testOverrideAbstractList3a() throws Exception {
-        performTest("OverrideAbstractList3", 126, "ad", "OverrideAbstractList3a.pass");
+        performTest("OverrideAbstractList3", 936, "ad", "OverrideAbstractList3a.pass");
     }
     
     public void testOverrideAbstractList3b() throws Exception {
-        performTest("OverrideAbstractList3", 126, "ge", "OverrideAbstractList3b.pass");
+        performTest("OverrideAbstractList3", 936, "ge", "OverrideAbstractList3b.pass");
     }
     
     public void testOverrideTypedException1() throws Exception {
-        performTest("OverrideTypedException", 209, "tes", "OverrideTypedException.pass");
+        performTest("OverrideTypedException", 1019, "tes", "OverrideTypedException.pass");
     }
     
     public void testOverrideTypedException2() throws Exception {
-        performTest("OverrideTypedException", 305, "tes", "OverrideTypedException.pass");
+        performTest("OverrideTypedException", 1115, "tes", "OverrideTypedException.pass");
     }
     
     public void testOverrideInInnerClass() throws Exception {
-        performTest("OverrideInInnerClass", 185, "pai", "OverrideInInnerClass.pass");
+        performTest("OverrideInInnerClass", 995, "pai", "OverrideInInnerClass.pass");
     }
     
     public void testOverrideInInnerClassUnresolvable() throws Exception {
-        performTest("OverrideInInnerClassUnresolvable", 157, "pai", "empty.pass");
+        performTest("OverrideInInnerClassUnresolvable", 967, "pai", "empty.pass");
     }
     
     public void testCreateConstructorTest() throws Exception {
-        performTest("CreateConstructorTest", 249, "", "CreateConstructorTest.pass");
+        performTest("CreateConstructorTest", 1059, "", "CreateConstructorTest.pass");
     }
 
     public void testCreateConstructorTestInnerClass() throws Exception {
-        performTest("CreateConstructorTest", 434, "", "CreateConstructorTestInnerClass.pass");
+        performTest("CreateConstructorTest", 1244, "", "CreateConstructorTestInnerClass.pass");
     }
 
     public void testCreateConstructorWithConstructors() throws Exception {
-        performTest("CreateConstructorWithConstructors", 400, "", "CreateConstructorWithConstructors.pass");
+        performTest("CreateConstructorWithConstructors", 1210, "", "CreateConstructorWithConstructors.pass");
     }
 
     public void testCreateConstructorWithConstructorsInnerClass() throws Exception {
-        performTest("CreateConstructorWithConstructors", 667, "", "CreateConstructorWithConstructorsInnerClass.pass");
+        performTest("CreateConstructorWithConstructors", 1477, "", "CreateConstructorWithConstructorsInnerClass.pass");
     }
 
     public void testCreateConstructorWithDefaultConstructor() throws Exception {
-        performTest("CreateConstructorWithDefaultConstructor", 352, "", "CreateConstructorWithDefaultConstructor.pass");
+        performTest("CreateConstructorWithDefaultConstructor", 1162, "", "CreateConstructorWithDefaultConstructor.pass");
     }
 
     public void testCreateConstructorWithDefaultConstructorInnerClass() throws Exception {
-        performTest("CreateConstructorWithDefaultConstructor", 560, "", "CreateConstructorWithDefaultConstructorInnerClass.pass");
+        performTest("CreateConstructorWithDefaultConstructor", 1370, "", "CreateConstructorWithDefaultConstructorInnerClass.pass");
     }
 
     public void testCreateConstructorNonDefaultConstructor() throws Exception {
-        performTest("CreateConstructorNonDefaultConstructor", 379, "", "CreateConstructorNonDefaultConstructor.pass");
+        performTest("CreateConstructorNonDefaultConstructor", 1189, "", "CreateConstructorNonDefaultConstructor.pass");
     }
 
     public void testCreateConstructorNonDefaultConstructorInnerClass() throws Exception {
-        performTest("CreateConstructorNonDefaultConstructor", 624, "", "CreateConstructorNonDefaultConstructorInnerClass.pass");
+        performTest("CreateConstructorNonDefaultConstructor", 1434, "", "CreateConstructorNonDefaultConstructorInnerClass.pass");
     }
 }



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

Posted by ma...@apache.org.
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");
     }
 }


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

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java
index 515e4e8..75f22f1 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java
index 153e3b9..bc78e04 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java
index 8a9fadd..96cbd56 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java
index 4ce7590..6e79e0d 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test implements Runnable {


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

Posted by ma...@apache.org.
[NETBEANS-54] Module Review java.completion


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/6a734ca6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/6a734ca6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/6a734ca6

Branch: refs/heads/master
Commit: 6a734ca6d4e947887fc498df48b919fab31a879e
Parents: c3fcc0a
Author: geertjan <ge...@oracle.com>
Authored: Wed Oct 11 13:49:59 2017 +0100
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 11:52:04 2017 +0200

----------------------------------------------------------------------
 .../java/completion/data/AdvancedMethodBody.java | 19 +++++++++++++++++++
 .../CreateConstructorNonDefaultConstructor.java  | 19 +++++++++++++++++++
 .../completion/data/CreateConstructorTest.java   | 19 +++++++++++++++++++
 .../data/CreateConstructorWithConstructors.java  | 19 +++++++++++++++++++
 .../CreateConstructorWithDefaultConstructor.java | 19 +++++++++++++++++++
 .../modules/java/completion/data/Empty.java      | 18 ++++++++++++++++++
 .../modules/java/completion/data/Field.java      | 19 +++++++++++++++++++
 .../java/completion/data/FieldNoInit.java        | 19 +++++++++++++++++++
 .../modules/java/completion/data/For.java        | 19 +++++++++++++++++++
 .../modules/java/completion/data/ForEach.java    | 19 +++++++++++++++++++
 .../modules/java/completion/data/Generics.java   | 19 +++++++++++++++++++
 .../completion/data/GenericsEmptyMethodBody.java | 19 +++++++++++++++++++
 .../java/completion/data/GenericsMethod.java     | 19 +++++++++++++++++++
 .../completion/data/GenericsMethodBodyStart.java | 19 +++++++++++++++++++
 .../data/GenericsMethodNoTypeParams.java         | 19 +++++++++++++++++++
 .../completion/data/GenericsNoTypeParams.java    | 19 +++++++++++++++++++
 .../java/completion/data/GenericsStart.java      | 19 +++++++++++++++++++
 .../modules/java/completion/data/Import.java     | 19 +++++++++++++++++++
 .../java/completion/data/Initializers.java       | 19 +++++++++++++++++++
 .../java/completion/data/InitializersStart.java  | 19 +++++++++++++++++++
 .../modules/java/completion/data/Interface.java  | 19 +++++++++++++++++++
 .../java/completion/data/LambdaExpression.java   | 19 +++++++++++++++++++
 .../data/LambdaExpressionEmptyMethodBody.java    | 19 +++++++++++++++++++
 .../completion/data/LambdaExpressionStart.java   | 19 +++++++++++++++++++
 .../modules/java/completion/data/Method.java     | 19 +++++++++++++++++++
 .../completion/data/MethodNoParamsAndThrows.java | 19 +++++++++++++++++++
 .../java/completion/data/MethodStart.java        | 19 +++++++++++++++++++
 .../completion/data/OverrideAbstractList.java    | 19 +++++++++++++++++++
 .../completion/data/OverrideAbstractList2.java   | 19 +++++++++++++++++++
 .../completion/data/OverrideAbstractList3.java   | 19 +++++++++++++++++++
 .../data/OverrideAbstractListAbstract.java       | 19 +++++++++++++++++++
 .../completion/data/OverrideInInnerClass.java    | 19 +++++++++++++++++++
 .../data/OverrideInInnerClassUnresolvable.java   | 19 +++++++++++++++++++
 .../data/OverridePackagePrivateMethod.java       | 19 +++++++++++++++++++
 .../completion/data/OverridePrivateMethod.java   | 19 +++++++++++++++++++
 .../completion/data/OverrideTypedException.java  | 19 +++++++++++++++++++
 .../modules/java/completion/data/Simple.java     | 19 +++++++++++++++++++
 .../completion/data/SimpleEmptyMethodBody.java   | 19 +++++++++++++++++++
 .../modules/java/completion/data/SimpleEnum.java | 19 +++++++++++++++++++
 .../completion/data/SimpleEnumNoImplements.java  | 19 +++++++++++++++++++
 .../java/completion/data/SimpleInterface.java    | 19 +++++++++++++++++++
 .../data/SimpleInterfaceNoExtends.java           | 19 +++++++++++++++++++
 .../completion/data/SimpleLambdaExpression.java  | 19 +++++++++++++++++++
 .../SimpleLambdaExpressionEmptyMethodBody.java   | 19 +++++++++++++++++++
 .../data/SimpleLambdaExpressionStart.java        | 19 +++++++++++++++++++
 .../java/completion/data/SimpleMethodBody.java   | 19 +++++++++++++++++++
 .../completion/data/SimpleMethodBodyStart.java   | 19 +++++++++++++++++++
 .../data/SimpleNoExtendsAndImplements.java       | 19 +++++++++++++++++++
 .../java/completion/data/SimpleNoPackage.java    | 18 ++++++++++++++++++
 .../modules/java/completion/data/SimpleTWR.java  | 19 +++++++++++++++++++
 .../java/completion/data/SimpleTWRNoRes.java     | 19 +++++++++++++++++++
 .../java/completion/data/SimpleTWRStart.java     | 19 +++++++++++++++++++
 .../modules/java/completion/data/Switch.java     | 19 +++++++++++++++++++
 .../modules/java/completion/data/TWR.java        | 19 +++++++++++++++++++
 .../modules/java/completion/data/TWRNoRes.java   | 19 +++++++++++++++++++
 .../modules/java/completion/data/TWRStart.java   | 19 +++++++++++++++++++
 .../completion/data/UnimplementedMethod.java     | 19 +++++++++++++++++++
 57 files changed, 1081 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java
index 5f68971..fa182c6 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java
index 0cefc11..2f051e5 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.netbeans.modules.java.editor.completion.ElementCreatingJavaCompletionProviderTest;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java
index 73ff1d2..cc00663 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java
index e073838..4f83689 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.netbeans.modules.java.editor.completion.ElementCreatingJavaCompletionProviderTest;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java
index 9d44ea3..3f25031 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.netbeans.modules.java.editor.completion.ElementCreatingJavaCompletionProviderTest;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
index e69de29..727d523 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
@@ -0,0 +1,18 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java
index 08df4f3..6eefac6 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java
index c56d131..f253eb8 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java
index b653d3c..c5d7931 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java
index 5a813c5..637e7e8 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java
index 8d70299..9269db2 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test<X extends Number, Y extends RuntimeException> extends java.util.AbstractList<X> {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java
index 1677012..c997f91 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test<X extends Number, Y extends RuntimeException> extends java.util.AbstractList<X> {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java
index 9bff7e9..8764233 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java
index 9a8cedf..d3f77e8 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test<X extends Number, Y extends RuntimeException> extends java.util.AbstractList<X> {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java
index 3153803..f5c3e7d 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java
index 748bfa0..5cb8582 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test extends java.util.AbstractList {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java
index 1980cfb..a9d8644 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java
index dec6c76..7684030 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.awt.List;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java
index ade705d..85c5afb 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java
index cc0aa6d..2173c55 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java
index 44382a1..d9a834e 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 interface Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java
index 18a137f..29daff8 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java
index e6c333b..f40e8dd 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java
index 4f90eca..59584b4 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java
index c9b8e57..55e2b4b 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java
index b823f19..106478b 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java
index 70a4d9c..cceb3dd 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java
index c4ee6a4..020aa23 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.util.AbstractList;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java
index 1b7fd3e..46027d7 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.util.AbstractList;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java
index 4958ed5..3915326 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.util.AbstractList;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java
index 5028d5c..eeceda2 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.util.AbstractList;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java
index 7bbae01..40ccd91 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import javax.swing.JFrame;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java
index cb32913..fd72972 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java
index 9a6a56c..0d92927 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import javax.swing.JFrame;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java
index 09b29d2..720b741 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test extends SecurityManager {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java
index add2370..a9f1ed2 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java
index ba3e236..869cf92 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test extends Object implements Cloneable, Runnable {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java
index 3ca4104..7ebc28f 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java
index 30896b7..b46d532 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public enum Test implements Cloneable {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java
index 30896b7..b46d532 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public enum Test implements Cloneable {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java
index a77d511..c0594a7 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 interface Test extends Cloneable {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java
index eb3fa43..f68931d 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 interface Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java
index 083a6f4..2c6d78f 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java
index 8a201c7..c95f370 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java
index ebb52c9..5837670 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java
index d48f950..c315ac1 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java
index 127bd41..5d10705 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java
index f732690..4c9785d 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java
index dd066b9..634247c 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 public class Test {
 }

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java
index c060de7..c9d24c6 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.io.BufferedWriter;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java
index c472ed9..e81df3b 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.io.BufferedWriter;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java
index 40e6395..914c81c 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 import java.io.BufferedWriter;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a734ca6/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java
index d6c51d8..ff86d68 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package test;
 
 public class Test {



[6/6] incubator-netbeans git commit: Merge branch 'pr/122'

Posted by ma...@apache.org.
Merge branch 'pr/122'

This closes #122


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/5c1b73d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/5c1b73d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/5c1b73d1

Branch: refs/heads/master
Commit: 5c1b73d174a5c99842a31f0df785af7abb566267
Parents: c3fcc0a eb906b4
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 15 11:53:26 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 11:53:26 2017 +0200

----------------------------------------------------------------------
 .../completion/data/AdvancedMethodBody.java     |  19 +
 .../CreateConstructorNonDefaultConstructor.java |  19 +
 .../completion/data/CreateConstructorTest.java  |  19 +
 .../data/CreateConstructorWithConstructors.java |  19 +
 ...CreateConstructorWithDefaultConstructor.java |  19 +
 .../modules/java/completion/data/Empty.java     |  18 +
 .../modules/java/completion/data/Field.java     |  19 +
 .../java/completion/data/FieldNoInit.java       |  19 +
 .../modules/java/completion/data/For.java       |  19 +
 .../modules/java/completion/data/ForEach.java   |  19 +
 .../modules/java/completion/data/Generics.java  |  19 +
 .../data/GenericsEmptyMethodBody.java           |  19 +
 .../java/completion/data/GenericsMethod.java    |  19 +
 .../data/GenericsMethodBodyStart.java           |  19 +
 .../data/GenericsMethodNoTypeParams.java        |  19 +
 .../completion/data/GenericsNoTypeParams.java   |  19 +
 .../java/completion/data/GenericsStart.java     |  19 +
 .../modules/java/completion/data/Import.java    |  19 +
 .../java/completion/data/Initializers.java      |  19 +
 .../java/completion/data/InitializersStart.java |  19 +
 .../modules/java/completion/data/Interface.java |  19 +
 .../java/completion/data/LambdaExpression.java  |  19 +
 .../data/LambdaExpressionEmptyMethodBody.java   |  19 +
 .../completion/data/LambdaExpressionStart.java  |  19 +
 .../modules/java/completion/data/Method.java    |  19 +
 .../data/MethodNoParamsAndThrows.java           |  19 +
 .../java/completion/data/MethodStart.java       |  19 +
 .../completion/data/OverrideAbstractList.java   |  19 +
 .../completion/data/OverrideAbstractList2.java  |  19 +
 .../completion/data/OverrideAbstractList3.java  |  19 +
 .../data/OverrideAbstractListAbstract.java      |  19 +
 .../completion/data/OverrideInInnerClass.java   |  19 +
 .../data/OverrideInInnerClassUnresolvable.java  |  19 +
 .../data/OverridePackagePrivateMethod.java      |  19 +
 .../completion/data/OverridePrivateMethod.java  |  19 +
 .../completion/data/OverrideTypedException.java |  19 +
 .../modules/java/completion/data/Simple.java    |  19 +
 .../completion/data/SimpleEmptyMethodBody.java  |  19 +
 .../java/completion/data/SimpleEnum.java        |  19 +
 .../completion/data/SimpleEnumNoImplements.java |  19 +
 .../java/completion/data/SimpleInterface.java   |  19 +
 .../data/SimpleInterfaceNoExtends.java          |  19 +
 .../completion/data/SimpleLambdaExpression.java |  19 +
 .../SimpleLambdaExpressionEmptyMethodBody.java  |  19 +
 .../data/SimpleLambdaExpressionStart.java       |  19 +
 .../java/completion/data/SimpleMethodBody.java  |  19 +
 .../completion/data/SimpleMethodBodyStart.java  |  19 +
 .../data/SimpleNoExtendsAndImplements.java      |  19 +
 .../java/completion/data/SimpleNoPackage.java   |  18 +
 .../modules/java/completion/data/SimpleTWR.java |  19 +
 .../java/completion/data/SimpleTWRNoRes.java    |  19 +
 .../java/completion/data/SimpleTWRStart.java    |  19 +
 .../modules/java/completion/data/Switch.java    |  19 +
 .../modules/java/completion/data/TWR.java       |  19 +
 .../modules/java/completion/data/TWRNoRes.java  |  19 +
 .../modules/java/completion/data/TWRStart.java  |  19 +
 .../completion/data/UnimplementedMethod.java    |  19 +
 .../JavaCompletionTask15FeaturesTest.java       | 108 ++--
 .../JavaCompletionTask17FeaturesTest.java       |  42 +-
 .../JavaCompletionTask18FeaturesTest.java       | 150 ++---
 .../JavaCompletionTask19FeaturesTest.java       |  24 +-
 .../JavaCompletionTaskAdvancedTest.java         | 450 ++++++-------
 .../completion/JavaCompletionTaskBasicTest.java | 626 +++++++++----------
 .../JavaCompletionTaskElementCreatingTest.java  |  46 +-
 64 files changed, 1804 insertions(+), 723 deletions(-)
----------------------------------------------------------------------



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

Posted by ma...@apache.org.
[NETBEANS-54] Module Review java.completion

 - Fix unittests after changed file structure caused by added license

Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/eb906b4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/eb906b4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/eb906b4f

Branch: refs/heads/master
Commit: eb906b4f06769f4f774b6f5556ea64320a6441ae
Parents: 6a734ca
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 15 11:49:19 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 11:52:04 2017 +0200

----------------------------------------------------------------------
 .../modules/java/completion/data/Empty.java     |   2 +-
 .../JavaCompletionTask15FeaturesTest.java       | 108 ++--
 .../JavaCompletionTask17FeaturesTest.java       |  42 +-
 .../JavaCompletionTask18FeaturesTest.java       | 150 ++---
 .../JavaCompletionTask19FeaturesTest.java       |  24 +-
 .../JavaCompletionTaskAdvancedTest.java         | 450 ++++++-------
 .../completion/JavaCompletionTaskBasicTest.java | 626 +++++++++----------
 .../JavaCompletionTaskElementCreatingTest.java  |  46 +-
 8 files changed, 724 insertions(+), 724 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
index 727d523..51da6c0 100644
--- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
+++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java
@@ -15,4 +15,4 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- */
\ No newline at end of file
+ */

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java
index c93a198..afc422b 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java
@@ -32,218 +32,218 @@ public class JavaCompletionTask15FeaturesTest extends CompletionTestBase {
     // Java 1.5 generics tests -------------------------------------------------------
 
     public void testEmptyFileBeforeTypingFirstTypeParam() throws Exception {
-        performTest("GenericsStart", 32, "<", "empty.pass");
+        performTest("GenericsStart", 842, "<", "empty.pass");
     }
 
     public void testBeforeTypingFirstTypeParam() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<", "empty.pass");
+        performTest("GenericsNoTypeParams", 842, "<", "empty.pass");
     }
     
     public void testBeforeFirstTypeParam() throws Exception {
-        performTest("Generics", 33, null, "empty.pass");
+        performTest("Generics", 843, null, "empty.pass");
     }
     
     public void testEmptyFileTypingFirstTypeParam() throws Exception {
-        performTest("GenericsStart", 32, "<X", "empty.pass");
+        performTest("GenericsStart", 842, "<X", "empty.pass");
     }
     
     public void testTypingFirstTypeParam() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X", "empty.pass");
+        performTest("GenericsNoTypeParams", 842, "<X", "empty.pass");
     }
     
     public void testOnFirstTypeParam() throws Exception {
-        performTest("Generics", 34, null, "empty.pass");
+        performTest("Generics", 844, null, "empty.pass");
     }
 
     public void testEmptyFileAfterTypingFirstTypeParamAndSpace() throws Exception {
-        performTest("GenericsStart", 32, "<X ", "extendsKeyword.pass");
+        performTest("GenericsStart", 842, "<X ", "extendsKeyword.pass");
     }
     
     public void testAfterTypingFirstTypeParamAndSpace() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X ", "extendsKeyword.pass");
+        performTest("GenericsNoTypeParams", 842, "<X ", "extendsKeyword.pass");
     }
     
     public void testAfterFirstTypeParamAndSpace() throws Exception {
-        performTest("Generics", 35, null, "extendsKeyword.pass");
+        performTest("Generics", 845, null, "extendsKeyword.pass");
     }
 
     public void testEmptyFileTypingExtendsInFirstTypeParam() throws Exception {
-        performTest("GenericsStart", 32, "<X e", "extendsKeyword.pass");
+        performTest("GenericsStart", 842, "<X e", "extendsKeyword.pass");
     }
     
     public void testTypingExtendsInFirstTypeParam() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X e", "extendsKeyword.pass");
+        performTest("GenericsNoTypeParams", 842, "<X e", "extendsKeyword.pass");
     }
     
     public void testOnExtendsInFirstTypeParam() throws Exception {
-        performTest("Generics", 36, null, "extendsKeyword.pass");
+        performTest("Generics", 846, null, "extendsKeyword.pass");
     }
 
     public void testEmptyFileAfterTypingExtendsInFirstTypeParam() throws Exception {
-        performTest("GenericsStart", 32, "<X extends", "extendsKeyword.pass");
+        performTest("GenericsStart", 842, "<X extends", "extendsKeyword.pass");
     }
     
     public void testAfterTypingExtendsInFirstTypeParam() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X extends", "extendsKeyword.pass");
+        performTest("GenericsNoTypeParams", 842, "<X extends", "extendsKeyword.pass");
     }
     
     public void testAfterExtendsInFirstTypeParam() throws Exception {
-        performTest("Generics", 42, null, "extendsKeyword.pass");
+        performTest("Generics", 852, null, "extendsKeyword.pass");
     }
 
     public void testEmptyFileAfterTypingExtendsAndSpaceInFirstTypeParam() throws Exception {
-        performTest("GenericsStart", 32, "<X extends ", "javaLangContentAndTestClass.pass");
+        performTest("GenericsStart", 842, "<X extends ", "javaLangContentAndTestClass.pass");
     }
     
     public void testAfterTypingExtendsAndSpaceInFirstTypeParam() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X extends ", "javaLangContentAndTestClass.pass");
+        performTest("GenericsNoTypeParams", 842, "<X extends ", "javaLangContentAndTestClass.pass");
     }
     
     public void testAfterExtendsAndSpaceInFirstTypeParam() throws Exception {
-        performTest("Generics", 43, null, "javaLangContentAndTestClass.pass");
+        performTest("Generics", 853, null, "javaLangContentAndTestClass.pass");
     }
 
     public void testEmptyFileAfterTypingBoundedFirstTypeParamAndSpace() throws Exception {
-        performTest("GenericsStart", 32, "<X extends Number ", "empty.pass");
+        performTest("GenericsStart", 842, "<X extends Number ", "empty.pass");
     }
     
     public void testAfterTypingBoundedFirstTypeParamAndSpace() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X extends Number ", "empty.pass");
+        performTest("GenericsNoTypeParams", 842, "<X extends Number ", "empty.pass");
     }
     
     public void testAfterBoundedFirstTypeParamAndSpace() throws Exception {
-        performTest("Generics", 49, " ", "empty.pass");
+        performTest("Generics", 859, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingFirstTypeParam() throws Exception {
-        performTest("GenericsStart", 32, "<X extends Number,", "empty.pass");
+        performTest("GenericsStart", 842, "<X extends Number,", "empty.pass");
     }
     
     public void testAfterTypingFirstTypeParam() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X extends Number,", "empty.pass");
+        performTest("GenericsNoTypeParams", 842, "<X extends Number,", "empty.pass");
     }
     
     public void testAfterFirstTypeParam() throws Exception {
-        performTest("Generics", 50, null, "empty.pass");
+        performTest("Generics", 860, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingTypeParams() throws Exception {
-        performTest("GenericsStart", 32, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass");
+        performTest("GenericsStart", 842, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass");
     }
     
     public void testAfterTypingTypeParams() throws Exception {
-        performTest("GenericsNoTypeParams", 32, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass");
+        performTest("GenericsNoTypeParams", 842, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass");
     }
     
     public void testAfterTypeParams() throws Exception {
-        performTest("Generics", 78, null, "extendsAndImplementsKeywords.pass");
+        performTest("Generics", 888, null, "extendsAndImplementsKeywords.pass");
     }
 
     public void testEmptyFileBeforeTypingFirstMethodTypeParam() throws Exception {
-        performTest("MethodStart", 40, "public <", "empty.pass");
+        performTest("MethodStart", 850, "public <", "empty.pass");
     }
 
     public void testBeforeTypingFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<", "empty.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<", "empty.pass");
     }
     
     public void testBeforeFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethod", 48, null, "empty.pass");
+        performTest("GenericsMethod", 858, null, "empty.pass");
     }
     
     public void testEmptyFileTypingFirstMethodTypeParam() throws Exception {
-        performTest("MethodStart", 40, "public <X", "empty.pass");
+        performTest("MethodStart", 850, "public <X", "empty.pass");
     }
     
     public void testTypingFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X", "empty.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X", "empty.pass");
     }
     
     public void testOnFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethod", 49, null, "empty.pass");
+        performTest("GenericsMethod", 859, null, "empty.pass");
     }
 
     public void testEmptyFileAfterTypingFirstMethodTypeParamAndSpace() throws Exception {
-        performTest("MethodStart", 40, "public <X ", "extendsKeyword.pass");
+        performTest("MethodStart", 850, "public <X ", "extendsKeyword.pass");
     }
     
     public void testAfterTypingFirstMethodTypeParamAndSpace() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X ", "extendsKeyword.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X ", "extendsKeyword.pass");
     }
     
     public void testAfterFirstMethodTypeParamAndSpace() throws Exception {
-        performTest("GenericsMethod", 50, null, "extendsKeyword.pass");
+        performTest("GenericsMethod", 860, null, "extendsKeyword.pass");
     }
 
     public void testEmptyFileTypingExtendsInFirstMethodTypeParam() throws Exception {
-        performTest("MethodStart", 40, "public <X e", "extendsKeyword.pass");
+        performTest("MethodStart", 850, "public <X e", "extendsKeyword.pass");
     }
     
     public void testTypingExtendsInFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X e", "extendsKeyword.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X e", "extendsKeyword.pass");
     }
     
     public void testOnExtendsInFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethod", 51, null, "extendsKeyword.pass");
+        performTest("GenericsMethod", 861, null, "extendsKeyword.pass");
     }
 
     public void testEmptyFileAfterTypingExtendsInFirstMethodTypeParam() throws Exception {
-        performTest("MethodStart", 40, "public <X extends", "extendsKeyword.pass");
+        performTest("MethodStart", 850, "public <X extends", "extendsKeyword.pass");
     }
     
     public void testAfterTypingExtendsInFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X extends", "extendsKeyword.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X extends", "extendsKeyword.pass");
     }
     
     public void testAfterExtendsInFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethod", 57, null, "extendsKeyword.pass");
+        performTest("GenericsMethod", 867, null, "extendsKeyword.pass");
     }
 
     public void testEmptyFileAfterTypingExtendsAndSpaceInFirstMethodTypeParam() throws Exception {
-        performTest("MethodStart", 40, "public <X extends ", "javaLangContentAndTestClass.pass");
+        performTest("MethodStart", 850, "public <X extends ", "javaLangContentAndTestClass.pass");
     }
     
     public void testAfterTypingExtendsAndSpaceInFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X extends ", "javaLangContentAndTestClass.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X extends ", "javaLangContentAndTestClass.pass");
     }
     
     public void testAfterExtendsAndSpaceInFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethod", 58, null, "javaLangContentAndTestClass.pass");
+        performTest("GenericsMethod", 868, null, "javaLangContentAndTestClass.pass");
     }
 
     public void testEmptyFileAfterTypingBoundedFirstMethodTypeParamAndSpace() throws Exception {
-        performTest("MethodStart", 40, "public <X extends Number ", "empty.pass");
+        performTest("MethodStart", 850, "public <X extends Number ", "empty.pass");
     }
     
     public void testAfterTypingBoundedFirstMethodTypeParamAndSpace() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X extends Number ", "empty.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X extends Number ", "empty.pass");
     }
     
     public void testAfterBoundedFirstMethodTypeParamAndSpace() throws Exception {
-        performTest("Generics", 64, " ", "empty.pass");
+        performTest("Generics", 874, " ", "empty.pass");
     }
     
     public void testEmptyFileAfterTypingFirstMethodTypeParam() throws Exception {
-        performTest("MethodStart", 40, "public <X extends Number,", "empty.pass");
+        performTest("MethodStart", 850, "public <X extends Number,", "empty.pass");
     }
     
     public void testAfterTypingFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X extends Number,", "empty.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X extends Number,", "empty.pass");
     }
     
     public void testAfterFirstMethodTypeParam() throws Exception {
-        performTest("GenericsMethod", 65, null, "empty.pass");
+        performTest("GenericsMethod", 875, null, "empty.pass");
     }
     
     public void testEmptyFileAfterTypingMethodTypeParams() throws Exception {
-        performTest("MethodStart", 40, "public <X extends Number, Y extends RuntimeException>", "returnTypes.pass");
+        performTest("MethodStart", 850, "public <X extends Number, Y extends RuntimeException>", "returnTypes.pass");
     }
     
     public void testAfterTypingMethodTypeParams() throws Exception {
-        performTest("GenericsMethodNoTypeParams", 47, "<X extends Number, Y extends RuntimeException>", "returnTypes.pass");
+        performTest("GenericsMethodNoTypeParams", 857, "<X extends Number, Y extends RuntimeException>", "returnTypes.pass");
     }
     
     public void testAfterMethodTypeParams() throws Exception {
-        performTest("GenericsMethod", 93, null, "returnTypes.pass");
+        performTest("GenericsMethod", 903, null, "returnTypes.pass");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java
index a8eed70..0c85835a 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java
@@ -33,87 +33,87 @@ public class JavaCompletionTask17FeaturesTest extends CompletionTestBase {
     // Java 1.7 try-with-resources tests ---------------------------------------
     
     public void testEmptyFileBeforeTypingVarResouce() throws Exception {
-        performTest("TWRStart", 114, "try (", "finalAndAutoCloseables.pass", "1.7");
+        performTest("TWRStart", 924, "try (", "finalAndAutoCloseables.pass", "1.7");
     }
 
     public void testBeforeTypingVarResouce() throws Exception {
-        performTest("TWRNoRes", 127, null, "finalAndAutoCloseables.pass", "1.7");
+        performTest("TWRNoRes", 937, null, "finalAndAutoCloseables.pass", "1.7");
     }
 
     public void testBeforeVarResouce() throws Exception {
-        performTest("TWR", 127, null, "finalAndAutoCloseables.pass", "1.7");
+        performTest("TWR", 937, null, "finalAndAutoCloseables.pass", "1.7");
     }
 
     public void testEmptyFileTypingVarResouce() throws Exception {
-        performTest("TWRStart", 114, "try (f", "finalKeyword.pass", "1.7");
+        performTest("TWRStart", 924, "try (f", "finalKeyword.pass", "1.7");
     }
 
     public void testTypingVarResouce() throws Exception {
-        performTest("TWRNoRes", 127, "f", "finalKeyword.pass", "1.7");
+        performTest("TWRNoRes", 937, "f", "finalKeyword.pass", "1.7");
     }
 
     public void testOnVarResouce() throws Exception {
-        performTest("TWR", 128, null, "finalKeyword.pass", "1.7");
+        performTest("TWR", 938, null, "finalKeyword.pass", "1.7");
     }
 
     public void testEmptyFileAfterFinalInResource() throws Exception {
-        performTest("TWRStart", 114, "try (final ", "autoCloseables.pass", "1.7");
+        performTest("TWRStart", 924, "try (final ", "autoCloseables.pass", "1.7");
     }
 
     public void testTypingAfterFinalInResouce() throws Exception {
-        performTest("TWRNoRes", 127, "final ", "autoCloseables.pass", "1.7");
+        performTest("TWRNoRes", 937, "final ", "autoCloseables.pass", "1.7");
     }
 
     public void testAfterFinalInResouce() throws Exception {
-        performTest("TWR", 133, null, "autoCloseables.pass", "1.7");
+        performTest("TWR", 943, null, "autoCloseables.pass", "1.7");
     }
 
     public void testEmptyFileTypingTypeInVarResouce() throws Exception {
-        performTest("TWRStart", 114, "try (final F", "autoCloseablesStartingWithF.pass", "1.7");
+        performTest("TWRStart", 924, "try (final F", "autoCloseablesStartingWithF.pass", "1.7");
     }
 
     public void testTypingTypeInVarResouce() throws Exception {
-        performTest("TWRNoRes", 127, "final F", "autoCloseablesStartingWithF.pass", "1.7");
+        performTest("TWRNoRes", 937, "final F", "autoCloseablesStartingWithF.pass", "1.7");
     }
 
     public void testOnTypeInVarResouce() throws Exception {
-        performTest("TWR", 134, null, "autoCloseablesStartingWithF.pass", "1.7");
+        performTest("TWR", 944, null, "autoCloseablesStartingWithF.pass", "1.7");
     }
 
     public void testEmptyFileBeforeTypingNameInVarResouce() throws Exception {
-        performTest("TWRStart", 114, "try (final FileWriter ", "resourceNames.pass", "1.7");
+        performTest("TWRStart", 924, "try (final FileWriter ", "resourceNames.pass", "1.7");
     }
 
     public void testBeforeTypingNameInVarResouce() throws Exception {
-        performTest("TWRNoRes", 127, "final FileWriter ", "resourceNames.pass", "1.7");
+        performTest("TWRNoRes", 937, "final FileWriter ", "resourceNames.pass", "1.7");
     }
 
     public void testBeforeNameInVarResouce() throws Exception {
-        performTest("TWR", 144, null, "resourceNames.pass", "1.7");
+        performTest("TWR", 954, null, "resourceNames.pass", "1.7");
     }
 
     public void testEmptyFileAfterTypingNameInVarResouce() throws Exception {
-        performTest("TWRStart", 114, "try (final FileWriter fw ", "empty.pass", "1.7");
+        performTest("TWRStart", 924, "try (final FileWriter fw ", "empty.pass", "1.7");
     }
 
     public void testAfterTypingNameInVarResouce() throws Exception {
-        performTest("TWRNoRes", 127, "final FileWriter fw ", "empty.pass", "1.7");
+        performTest("TWRNoRes", 937, "final FileWriter fw ", "empty.pass", "1.7");
     }
 
     public void testAfterNameInVarResouce() throws Exception {
-        performTest("TWR", 147, null, "empty.pass", "1.7");
+        performTest("TWR", 957, null, "empty.pass", "1.7");
     }
 
     public void testEmptyFileBeforeVarResouceInit() throws Exception {
-        performTest("TWRStart", 114, "try (final FileWriter fw = ", "resourceInit.pass", "1.7");
+        performTest("TWRStart", 924, "try (final FileWriter fw = ", "resourceInit.pass", "1.7");
     }
 
     public void testBeforeTypingVarResouceInit() throws Exception {
-        performTest("TWRNoRes", 127, "final FileWriter fw = ", "resourceInit.pass", "1.7");
+        performTest("TWRNoRes", 937, "final FileWriter fw = ", "resourceInit.pass", "1.7");
     }
 
     public void testBeforeVarResouceInit() throws Exception {
-        performTest("TWR", 149, null, "resourceInit.pass", "1.7");
+        performTest("TWR", 959, null, "resourceInit.pass", "1.7");
     }
 
     static {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java
index c8f6180..516ca8c 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java
@@ -33,305 +33,305 @@ public class JavaCompletionTask18FeaturesTest extends CompletionTestBase {
     // Java 1.8 default method tests -------------------------------------------
     
     public void testEmptyFileBeforeTypingDefaultModifier() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test {", "interfaceMemberModifiersAndTypes.pass", "1.8");
+        performTest("Empty", 809, "package test;\ninterface Test {", "interfaceMemberModifiersAndTypes.pass", "1.8");
     }
 
     public void testBeforeTypingDefaultModifier() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 31, null, "interfaceMemberModifiersAndTypes.pass", "1.8");
+        performTest("SimpleInterfaceNoExtends", 841, null, "interfaceMemberModifiersAndTypes.pass", "1.8");
     }
 
     public void testBeforeDefaultModifier() throws Exception {
-        performTest("Interface", 37, null, "interfaceMemberModifiersAndTypes.pass", "1.8");
+        performTest("Interface", 847, null, "interfaceMemberModifiersAndTypes.pass", "1.8");
     }
 
     public void testEmptyFileTypingDefaultModifier() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test {\nde", "defaultKeyword.pass", "1.8");
+        performTest("Empty", 809, "package test;\ninterface Test {\nde", "defaultKeyword.pass", "1.8");
     }
 
     public void testTypingDefaultModifier() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 31, "\nde", "defaultKeyword.pass", "1.8");
+        performTest("SimpleInterfaceNoExtends", 841, "\nde", "defaultKeyword.pass", "1.8");
     }
 
     public void testOnDefaultModifier() throws Exception {
-        performTest("Interface", 39, null, "defaultKeyword.pass", "1.8");
+        performTest("Interface", 849, null, "defaultKeyword.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingDefaultModifier() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test {\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8");
+        performTest("Empty", 809, "package test;\ninterface Test {\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8");
     }
 
     public void testAfterTypingDefaultModifier() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 31, "\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8");
+        performTest("SimpleInterfaceNoExtends", 841, "\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8");
     }
 
     public void testAfterDefaultModifier() throws Exception {
-        performTest("Interface", 45, null, "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8");
+        performTest("Interface", 855, null, "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingStaticModifier() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test {\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8");
+        performTest("Empty", 809, "package test;\ninterface Test {\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8");
     }
 
     public void testAfterTypingStaticModifier() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 31, "\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8");
+        performTest("SimpleInterfaceNoExtends", 841, "\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8");
     }
 
     public void testAfterStaticModifier() throws Exception {
-        performTest("Interface", 102, null, "memberModifiersAndTypesWithoutStatic.pass", "1.8");
+        performTest("Interface", 912, null, "memberModifiersAndTypesWithoutStatic.pass", "1.8");
     }
 
     public void testEmptyFileTypingDefaultMethodBody() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test {\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8");
+        performTest("Empty", 809, "package test;\ninterface Test {\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8");
     }
 
     public void testTypingDefaultMethodBody() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 31, "\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8");
+        performTest("SimpleInterfaceNoExtends", 841, "\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8");
     }
 
     public void testInsideDefaultMethodBody() throws Exception {
-        performTest("Interface", 69, null, "typesInterfaceMembersAndVars.pass", "1.8");
+        performTest("Interface", 879, null, "typesInterfaceMembersAndVars.pass", "1.8");
     }
 
     public void testEmptyFileTypingStaticMethodBody() throws Exception {
-        performTest("Empty", 0, "package test;\ninterface Test {\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8");
+        performTest("Empty", 809, "package test;\ninterface Test {\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8");
     }
 
     public void testTypingStaticMethodBody() throws Exception {
-        performTest("SimpleInterfaceNoExtends", 31, "\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8");
+        performTest("SimpleInterfaceNoExtends", 841, "\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8");
     }
 
     public void testInsideStaticMethodBody() throws Exception {
-        performTest("Interface", 133, null, "typesStaticInterfaceMembersAndVars.pass", "1.8");
+        performTest("Interface", 943, null, "typesStaticInterfaceMembersAndVars.pass", "1.8");
     }
 
     // Java 1.8 lambda expressions tests ---------------------------------------
     
     public void testEmptyFileAfterTypingLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s ", "empty.pass", "1.8");
     }
 
     public void testAfterTypingLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s ", "empty.pass", "1.8");
     }
 
     public void testAfterLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpression", 205, null, "empty.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1015, null, "empty.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingTypeOfLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String ", "stringVarName.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String ", "stringVarName.pass", "1.8");
     }
 
     public void testAfterTypingTypeOfLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String ", "stringVarName.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String ", "stringVarName.pass", "1.8");
     }
 
     public void testAfterTypeOfLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpression", 265, null, "stringVarName.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1075, null, "stringVarName.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingTypedLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s ", "empty.pass", "1.8");
     }
 
     public void testAfterTypingTypedLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s ", "empty.pass", "1.8");
     }
 
     public void testAfterTypedLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpression", 266, " ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1076, " ", "empty.pass", "1.8");
     }
 
     public void testEmptyFileTypingSecondLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((s,", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((s,", "empty.pass", "1.8");
     }
 
     public void testTypingSecondLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((s,", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((s,", "empty.pass", "1.8");
     }
 
     public void testBeforeSecondLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpression", 231, ",", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1041, ",", "empty.pass", "1.8");
     }
 
     public void testEmptyFileTypingSecondTypedLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s,", "lambdaParameterTypes.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s,", "lambdaParameterTypes.pass", "1.8");
     }
 
     public void testTypingSecondTypedLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s,", "lambdaParameterTypes.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s,", "lambdaParameterTypes.pass", "1.8");
     }
 
     public void testBeforeSecondTypedLambdaParam() throws Exception {
-        performTest("SimpleLambdaExpression", 266, ",", "lambdaParameterTypes.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1076, ",", "lambdaParameterTypes.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingTypedLambdaParams() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s)", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s)", "empty.pass", "1.8");
     }
 
     public void testAfterTypingTypedLambdaParams() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s)", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s)", "empty.pass", "1.8");
     }
 
     public void testAfterTypedLambdaParams() throws Exception {
-        performTest("SimpleLambdaExpression", 267, null, "empty.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1077, null, "empty.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingTypedLambdaParamsAndSpace() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) ", "empty.pass", "1.8");
     }
 
     public void testAfterTypingTypedLambdaParamsAndSpace() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) ", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) ", "empty.pass", "1.8");
     }
 
     public void testAfterTypedLambdaParamsAndSpace() throws Exception {
-        performTest("SimpleLambdaExpression", 268, null, "empty.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1078, null, "empty.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingLambdaArrow() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s ->", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s ->", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterTypingLambdaArrow() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s ->", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s ->", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterLambdaArrow() throws Exception {
-        performTest("SimpleLambdaExpression", 207, null, "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1017, null, "lambdaSmartInt.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingTypedLambdaArrow() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterTypingTypedLambdaArrow() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterTypedLambdaArrow() throws Exception {
-        performTest("SimpleLambdaExpression", 270, null, "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1080, null, "lambdaSmartInt.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingLambdaArrowAndSpace() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterTypingLambdaArrowAndSpace() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterLambdaArrowAndSpace() throws Exception {
-        performTest("SimpleLambdaExpression", 208, null, "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1018, null, "lambdaSmartInt.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingTypedLambdaArrowAndSpace() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterTypingTypedLambdaArrowAndSpace() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterTypedLambdaArrowAndSpace() throws Exception {
-        performTest("SimpleLambdaExpression", 271, null, "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1081, null, "lambdaSmartInt.pass", "1.8");
     }
 
     public void testEmptyFileAfterTypingLambdaExpression() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> s.length()", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> s.length()", "empty.pass", "1.8");
     }
 
     public void testAfterTypingLambdaExpression() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> s.length()", "empty.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> s.length()", "empty.pass", "1.8");
     }
 
     public void testAfterLambdaExpression() throws Exception {
-        performTest("SimpleLambdaExpression", 218, null, "empty.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1028, null, "empty.pass", "1.8");
     }
     
     public void testEmptyFileTypingLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> {", "lambdaBodyContent.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> {", "lambdaBodyContent.pass", "1.8");
     }
 
     public void testTypingLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> {", "lambdaBodyContent.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> {", "lambdaBodyContent.pass", "1.8");
     }
 
     public void testInsideOfLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpression", 308, null, "lambdaBodyContent.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1118, null, "lambdaBodyContent.pass", "1.8");
     }
 
     public void testEmptyFileTypingTypedLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8");
     }
 
     public void testTypingTypedLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8");
     }
 
     public void testInsideOfTypedLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpression", 272, null, "lambdaBodyContent.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1082, null, "lambdaBodyContent.pass", "1.8");
     }
     
     public void testEmptyFileAfterLocalVarInLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8");
     }
 
     public void testTypingAfterLocalVarInLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8");
     }
 
     public void testAfterLocalVarInLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpression", 272, "int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1082, "int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8");
     }
 
     public void testEmptyFileTypingReturnFromLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testTypingReturnFromLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterReturnFromLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpression", 315, null, "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1125, null, "lambdaSmartInt.pass", "1.8");
     }
 
     public void testEmptyFileTypingReturnFromTypedLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testTypingReturnFromTypedLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8");
     }
 
     public void testAfterReturnFromTypedLambdaBlock() throws Exception {
-        performTest("SimpleLambdaExpression", 279, null, "lambdaSmartInt.pass", "1.8");
+        performTest("SimpleLambdaExpression", 1089, null, "lambdaSmartInt.pass", "1.8");
     }
 
     public void testMoreCandidatesEmptyFileAfterTypingLambdaArrow() throws Exception {
-        performTest("LambdaExpressionStart", 293, "t.test(s ->", "lambdaExpression.pass", "1.8");
+        performTest("LambdaExpressionStart", 1103, "t.test(s ->", "lambdaExpression.pass", "1.8");
     }
 
     public void testMoreCandidatesAfterTypingLambdaArrow() throws Exception {
-        performTest("LambdaExpressionEmptyMethodBody", 293, "t.test(s ->", "lambdaExpression.pass", "1.8");
+        performTest("LambdaExpressionEmptyMethodBody", 1103, "t.test(s ->", "lambdaExpression.pass", "1.8");
     }
 
     public void testMoreCandidatesAfterLambdaArrow() throws Exception {
-        performTest("LambdaExpression", 313, null, "lambdaSmartInt2.pass", "1.8");
+        performTest("LambdaExpression", 1123, null, "lambdaSmartInt2.pass", "1.8");
     }
     
     public void testMoreCandidatesEmptyFileTypingReturnFromLambdaBlock() throws Exception {
-        performTest("LambdaExpressionStart", 293, "t.test(s -> {return ", "lambdaExpression.pass", "1.8");
+        performTest("LambdaExpressionStart", 1103, "t.test(s -> {return ", "lambdaExpression.pass", "1.8");
     }
 
     public void testMoreCandidatesTypingReturnFromLambdaBlock() throws Exception {
-        performTest("LambdaExpressionEmptyMethodBody", 293, "t.test(s -> {return ", "lambdaExpression.pass", "1.8");
+        performTest("LambdaExpressionEmptyMethodBody", 1103, "t.test(s -> {return ", "lambdaExpression.pass", "1.8");
     }
 
     public void testMoreCandidatesAfterReturnFromLambdaBlock() throws Exception {
-        performTest("LambdaExpression", 350, null, "lambdaSmartInt2.pass", "1.8");
+        performTest("LambdaExpression", 1160, null, "lambdaSmartInt2.pass", "1.8");
     }
     
     static {

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/eb906b4f/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java
----------------------------------------------------------------------
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java
index 3190224..a8ed34e 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java
@@ -33,51 +33,51 @@ public class JavaCompletionTask19FeaturesTest extends CompletionTestBase {
     // Java 1.9 try-with-resources tests -------------------------------------------
     
     public void testEmptyFileBeforeTypingExistingVarResouce() throws Exception {
-        performTest("SimpleTWRStart", 139, "try (", "resourcesAndAutoCloseables.pass", "1.9");
+        performTest("SimpleTWRStart", 949, "try (", "resourcesAndAutoCloseables.pass", "1.9");
     }
 
     public void testBeforeTypingExistingVarResouce() throws Exception {
-        performTest("SimpleTWRNoRes", 144, null, "resourcesAndAutoCloseables.pass", "1.9");
+        performTest("SimpleTWRNoRes", 954, null, "resourcesAndAutoCloseables.pass", "1.9");
     }
 
     public void testBeforeExistingVarResouce() throws Exception {
-        performTest("SimpleTWR", 172, null, "resourcesAndAutoCloseables.pass", "1.9");
+        performTest("SimpleTWR", 982, null, "resourcesAndAutoCloseables.pass", "1.9");
     }
 
     public void testEmptyFileTypingExistingVarResouce() throws Exception {
-        performTest("SimpleTWRStart", 139, "try (f", "finalKeyword.pass", "1.9");
+        performTest("SimpleTWRStart", 949, "try (f", "finalKeyword.pass", "1.9");
     }
 
     public void testTypingExistingVarResouce() throws Exception {
-        performTest("SimpleTWRNoRes", 144, "f", "finalKeyword.pass", "1.9");
+        performTest("SimpleTWRNoRes", 954, "f", "finalKeyword.pass", "1.9");
     }
 
     public void testOnExistingVarResouce() throws Exception {
-        performTest("SimpleTWR", 173, null, "finalKeyword.pass", "1.9");
+        performTest("SimpleTWR", 983, null, "finalKeyword.pass", "1.9");
     }
 
     public void testEmptyFileAfterTypingExistingVarResouce() throws Exception {
-        performTest("SimpleTWRStart", 139, "try (fw ", "empty.pass", "1.9");
+        performTest("SimpleTWRStart", 949, "try (fw ", "empty.pass", "1.9");
     }
 
     public void testAfterTypingExistingVarResouce() throws Exception {
-        performTest("SimpleTWRNoRes", 144, "fw ", "empty.pass", "1.9");
+        performTest("SimpleTWRNoRes", 954, "fw ", "empty.pass", "1.9");
     }
 
     public void testAfterExistingVarResouce() throws Exception {
-        performTest("SimpleTWR", 174, " ", "empty.pass", "1.9");
+        performTest("SimpleTWR", 984, " ", "empty.pass", "1.9");
     }
 
     public void testEmptyFileBeforeTypingNewVarResouce() throws Exception {
-        performTest("SimpleTWRStart", 139, "try (fw;", "resourcesAndAutoCloseables.pass", "1.9");
+        performTest("SimpleTWRStart", 949, "try (fw;", "resourcesAndAutoCloseables.pass", "1.9");
     }
 
     public void testBeforeTypingNewVarResouce() throws Exception {
-        performTest("SimpleTWRNoRes", 144, "fw;", "resourcesAndAutoCloseables.pass", "1.9");
+        performTest("SimpleTWRNoRes", 954, "fw;", "resourcesAndAutoCloseables.pass", "1.9");
     }
 
     public void testBeforeNewVarResouce() throws Exception {
-        performTest("SimpleTWR", 175, null, "resourcesAndAutoCloseables.pass", "1.9");
+        performTest("SimpleTWR", 985, null, "resourcesAndAutoCloseables.pass", "1.9");
     }
 
     static {