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

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

[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 {