Update to 3.7M7 using (using jdt.core at v_B53)
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java
index a01619f..2aa474c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java
@@ -19,7 +19,7 @@
super(testName);
}
static {
-// TESTS_NAMES = new String[] { "testBug292087" };
+// TESTS_NAMES = new String[] { "testXA_1FGGUQF_1FHSL8H_1" };
}
public static Test suite() {
return buildAllCompliancesTestSuite(CompletionParserTest.class);
@@ -8688,120 +8688,4 @@
expectedReplacedSource,
testName);
}
-
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
-// To verify that the completion node is found inside a field initializer
-// that contains an anonymous class.
-public void testBug292087a(){
- String str =
- "package test;\n" +
- "class MyClass{\n" +
- "}\n" +
- "public class Try extends Thread{\n" +
- " public static MyClass MyClassField;" +
- " public static MyClass MyClassMethod(){\n" +
- " return null;\n" +
- " }\n" +
- " public MyClass member[] = {\n" +
- " " +
- " new MyClass (){\n" +
- " public void abc() {}\n" +
- " },\n" +
- " /*Complete here*/\n" +
- " };\n" +
- "}\n";
-
- String testName = "";
- String completeBehind = "/*Complete here*/";
- String expectedCompletionNodeToString = "<CompleteOnName:>";
- String expectedParentNodeToString =
- "public MyClass[] member = {<CompleteOnName:>};";
- String completionIdentifier = "";
- String expectedReplacedSource = "";
- int cursorLocation = str.lastIndexOf("/*Complete here*/") + completeBehind.length() - 1;
- String expectedUnitDisplayString =
- "package test;\n" +
- "class MyClass {\n" +
- " MyClass() {\n" +
- " }\n" +
- "}\n" +
- "public class Try extends Thread {\n" +
- " public static MyClass MyClassField;\n" +
- " public MyClass[] member = {<CompleteOnName:>};\n" +
- " public Try() {\n" +
- " }\n" +
- " <clinit>() {\n" +
- " }\n" +
- " public static MyClass MyClassMethod() {\n" +
- " }\n" +
- "}\n";
-
- checkDietParse(
- str.toCharArray(),
- cursorLocation,
- expectedCompletionNodeToString,
- expectedParentNodeToString,
- expectedUnitDisplayString,
- completionIdentifier,
- expectedReplacedSource,
- testName);
-}
-
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
-// To verify that anonymous class inside an array initializer of a recovered field
-// doesn't end up at a bogus location.
-public void testBug292087b(){
- String str =
- "package test;\n" +
- "class MyClass{\n" +
- "}\n" +
- "public class Try extends Thread{\n" +
- " public static MyClass MyClassField;" +
- " public static MyClass MyClassMethod(){\n" +
- " return null;\n" +
- " }\n" +
- " public MyClass member[] = {\n" +
- " /*Complete here*/\n" +
- " new MyClass (){\n" +
- " public void abc() {}\n" +
- " },\n" +
- " " +
- " };\n" +
- "}\n";
-
- String testName = "";
- String completeBehind = "/*Complete here*/";
- String expectedCompletionNodeToString = "<CompleteOnName:>";
- String expectedParentNodeToString =
- "public MyClass[] member = {<CompleteOnName:>};";
- String completionIdentifier = "";
- String expectedReplacedSource = "";
- int cursorLocation = str.lastIndexOf("/*Complete here*/") + completeBehind.length() - 1;
- String expectedUnitDisplayString =
- "package test;\n" +
- "class MyClass {\n" +
- " MyClass() {\n" +
- " }\n" +
- "}\n" +
- "public class Try extends Thread {\n" +
- " public static MyClass MyClassField;\n" +
- " public MyClass[] member = {<CompleteOnName:>};\n" +
- " public Try() {\n" +
- " }\n" +
- " <clinit>() {\n" +
- " }\n" +
- " public static MyClass MyClassMethod() {\n" +
- " }\n" +
- "}\n";
-
- checkDietParse(
- str.toCharArray(),
- cursorLocation,
- expectedCompletionNodeToString,
- expectedParentNodeToString,
- expectedUnitDisplayString,
- completionIdentifier,
- expectedReplacedSource,
- testName);
-}
}
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java
index c857d8b..57b070e 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java
@@ -4661,23 +4661,15 @@
String expectedCompletionDietUnitToString =
"package ZKentTest;\n" +
- "import java.awt.color.*;\n" +
- "public class A {\n" +
- " int[] ii;\n" +
- " public A() {\n" +
- " }\n" +
- " A foo(int i) {\n" +
- " }\n" +
- "}\n" +
- "class Local {\n" +
- " Local() {\n" +
- " }\n" +
- " int hello() {\n" +
- " }\n" +
- " int world() {\n" +
- " }\n" +
- " void foo() {\n" +
- " }\n" +
+ "import java.awt.color.*;\n" +
+ "public class A {\n" +
+ " int[] ii;\n" +
+ " public A() {\n" +
+ " }\n" +
+ " A foo(int i) {\n" +
+ " }\n" +
+ " int bar() {\n" +
+ " }\n" +
"}\n";
String testName = "<bunch of syntax errors>";
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
index 91871b0..f418130 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
index effdf4d..9c5865f 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
index 686af6c..6cadb0e 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at