Attachment 57154 Details for Bug 157584 – Proposed fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed fix

bug157584_005.txt (text/plain), 1.20 MB, created by David Audel

on 2007-01-19 12:05:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David Audel

Created: 2007-01-19 12:05:31 EST

Size: 1.20 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/CompletionTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java,v
>retrieving revision 1.140
>diff -u -r1.140 CompletionTests.java
>--- src/org/eclipse/jdt/core/tests/model/CompletionTests.java	12 Jan 2007 17:58:58 -0000	1.140
>+++ src/org/eclipse/jdt/core/tests/model/CompletionTests.java	19 Jan 2007 16:36:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2007 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
>@@ -24,6 +24,12 @@
> 
> public class CompletionTests extends AbstractJavaModelCompletionTests implements RelevanceConstants {
> 
>+static {
>+//	TESTS_NAMES = new String[] { "testDeprecationCheck17"};
>+}
>+public static Test suite() {
>+	return buildModelTestSuite(CompletionTests.class);
>+}
> public CompletionTests(String name) {
> 	super(name);
> }
>@@ -38,1814 +44,1815 @@
> public void tearDownSuite() throws Exception {
> 	super.tearDownSuite();
> }
>-static {
>-//	TESTS_NAMES = new String[] { "testDeprecationCheck17"};
>-}
>-public static Test suite() {
>-	return buildModelTestSuite(CompletionTests.class);
>-}
>-public void testParameterNames1() throws CoreException, IOException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object timeout = options.get(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC);
>-	options.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC,"2000"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
>+public void testBug164311() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" public int zzzzzz;\n" + 
>+		" public void method1() {\n" + 
>+		" label : if (0> (10));\n" + 
>+		" zzz\n" + 
>+		" }\n" + 
>+		"}\n");
> 
>-	try {
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/p/Test.java",
>-			"package p;"+
>-			"public class Test {\n" + 
>-			" void foo(doctest.X x) {\n" + 
>-			" x.fo\n" + 
>-			" }\n" + 
>-			"}\n");
>-		
>-		addLibrary(
>-				"Completion", 
>-				"tmpDoc.jar",
>-				null,
>-				"tmpDocDoc.zip",
>-				false);
>-		
>-		CompletionTestsRequestor2 requestor;
>-		try {
>-			requestor = new CompletionTestsRequestor2(true);
>-			String str = this.workingCopies[0].getSource();
>-			String completeBehind = "x.fo";
>-			int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-			this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-			
>-			assertResults(
>-				"foo[METHOD_REF]{foo(), Ldoctest.X;, (Ljava.lang.Object;)V, foo, (param), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-		} finally {
>-			removeLibrary("Completion", "tmpDoc.jar");
>-		}
>-	} finally {
>-		options.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, timeout);
>-		JavaCore.setOptions(options);
>-	}
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "zzz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"zzzzzz[FIELD_REF]{zzzzzz, Ltest.Test;, I, zzzzzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-public void testInconsistentHierarchy1() throws CoreException, IOException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=167750
>+public void testBug164311_2() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/p/Test.java",
>-		"package p;"+
>-		"public class Test extends Unknown {\n" + 
>-		" void foo() {\n" + 
>-		" this.has\n" + 
>-		" }\n" + 
>+		"/Completion/src/test/Test.java",
>+		"package test;\n"+
>+		"public class X {\n"+
>+		" public void zork() { \n"+
>+		" } \n"+
>+		" public void foo() { \n"+
>+		" this.foo(new Object(){\n"+
>+		" public void bar() {\n"+
>+		" if (zzz>(Integer)vvv.foo(i)) {\n"+
>+		" return;\n"+
>+		" }\n"+
>+		" if (true) {\n"+
>+		" return;\n"+
>+		" }\n"+
>+		" zor\n"+
>+		" } \n"+ 
>+		" });\n"+
>+		" }\n"+
> 		"}\n");
>-	
>+
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "this.has";
>+	String completeBehind = "zor";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>+
> 	assertResults(
>-		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>-		requestor.getResults());
>+			"zork[METHOD_REF]{zork(), Ltest.X;, ()V, zork, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck1() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96213
>+public void testBug96213() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n" +
>+ "public class Test{\n"+
>+ " Test toto(Object o) {\n"+
>+ " return null;\n"+
>+ " }\n"+
>+ " void titi(int removed) {\n"+
>+ " }\n"+
>+ " void foo() {\n"+
>+ " int removed = 0;\n"+
>+ " toto(Test.this).titi(removed);\n"+
>+ " }\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "removed";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	try {
>-		this.workingCopies = new ICompilationUnit[3];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" ZZZTy\n"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			"}");
>-		
>-		this.workingCopies[2] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType2.java",
>-			"package deprecation;"+
>-			"/** @deprecated */\n"+
>-			"public class ZZZType2 {\n"+
>-			"}");
>+	assertResults(
>+ "removed[LOCAL_VARIABLE_REF]{removed, null, I, removed, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99811
>+public void testBug99811() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+ try {
>+ 	this.wc = getWorkingCopy(
>+	 "/Completion/src/test/A.java",
>+	 "public abstract class A implements I {}");
>+ 	
>+	 aType = getWorkingCopy(
>+	 "/Completion/src/test/I.java",
>+	 "public interface I {\n"+
>+	 " public class M extends A {}\n"+
>+	 "}");
> 	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZTy";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "A";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-		assertResults(
>-				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"ZZZType2[TYPE_REF]{ZZZType2, deprecation, Ldeprecation.ZZZType2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+		assertResults("", requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck2() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseField1() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-		this.workingCopies = new ICompilationUnit[3];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" ZZZTy\n"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			"}");
>-		
>-		this.workingCopies[2] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType2.java",
>-			"package deprecation;"+
>-			"/** @deprecated */\n"+
>-			"public class ZZZType2 {\n"+
>+			" int oneTwoThree;\n"+
>+			" int oTTField;\n"+
>+			" void foo() {\n"+
>+			" oTT\n"+
>+			" }\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZTy";
>+		String completeBehind = "oTT";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.Test;, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"oTTField[FIELD_REF]{oTTField, Lcamelcase.Test;, I, oTTField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck3() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseLocalVariable1() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-	
>-		this.workingCopies = new ICompilationUnit[2];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" void foo() {"+
>-			" ZZZType1.fo\n"+
>-			" }"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			" public static void foo1(){}\n"+
>-			" /** @deprecated */\n"+
>-			" public static void foo2(){}\n"+
>+			" void foo() {\n"+
>+			" int oneTwoThree;\n"+
>+			" int oTTLocal;\n"+
>+			" oTT\n"+
>+			" }\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.fo";
>+		String completeBehind = "oTT";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-				"foo2[METHOD_REF]{foo2(), Ldeprecation.ZZZType1;, ()V, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+				"oneTwoThree[LOCAL_VARIABLE_REF]{oneTwoThree, null, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"oTTLocal[LOCAL_VARIABLE_REF]{oTTLocal, null, I, oTTLocal, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck4() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseMethod1() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>-		this.workingCopies = new ICompilationUnit[2];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+	this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" void foo() {"+
>-			" ZZZType1.fo\n"+
>-			" }"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			" public static void foo1(){}\n"+
>-			" /** @deprecated */\n"+
>-			" public static void foo2(){}\n"+
>+			" void oneTwoThree(){}\n"+
>+			" void oTTMethod(){}\n"+
>+			" void foo() {\n"+
>+			" oTT\n"+
>+			" }\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.fo";
>+		String completeBehind = "oTT";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+				"oneTwoThree[METHOD_REF]{oneTwoThree(), Lcamelcase.Test;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"oTTMethod[METHOD_REF]{oTTMethod(), Lcamelcase.Test;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck5() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseMethodDeclaration1() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
> 		this.workingCopies = new ICompilationUnit[2];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" ZZZType1.Inn\n"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
>+			"public class Test extends SuperClass {\n"+
>+			" oTT\n"+
> 			"}");
> 		
> 		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			" public class Inner1 {}\n"+
>-			" /** @deprecated */\n"+
>-			" public class Inner2 {}\n"+
>+			"/Completion/src/camelcase/SuperClass.java",
>+			"package camelcase;"+
>+			"public class SuperClass {\n"+
>+			" public void oneTwoThree(){}\n"+
>+			" public void oTTMethod(){}\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.Inn";
>+		String completeBehind = "oTT";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"ZZZType1.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.ZZZType1$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+				"oTT[POTENTIAL_METHOD_DECLARATION]{oTT, Lcamelcase.Test;, ()V, oTT, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"oneTwoThree[METHOD_DECLARATION]{public void oneTwoThree(), Lcamelcase.SuperClass;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"oTTMethod[METHOD_DECLARATION]{public void oTTMethod(), Lcamelcase.SuperClass;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck6() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseType1() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>-		this.workingCopies = new ICompilationUnit[2];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[3];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" ZZZType1.Inn\n"+
>+			" FF\n"+
> 			"}");
>-		
>+	
> 		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			" public class Inner1 {}\n"+
>-			" /** @deprecated */\n"+
>-			" public class Inner2 {}\n"+
>+			"/Completion/src/camelcase/FoFoFo.java",
>+			"package camelcase;"+
>+			"public class FoFoFo {\n"+
>+			"}");
>+		
>+		this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/camelcase/FFFTest.java",
>+			"package camelcase;"+
>+			"public class FFFTest {\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.Inn";
>+		String completeBehind = "FF";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck7() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseType2() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>-		this.workingCopies = new ICompilationUnit[2];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[3];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" void foo() {"+
>-			" ZZZType1.fo\n"+
>-			" }"+
>+			" camelcase.FF\n"+
> 			"}");
>-		
>+	
> 		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			" public static int foo1;\n"+
>-			" /** @deprecated */\n"+
>-			" public static int foo2;\n"+
>+			"/Completion/src/camelcase/FoFoFo.java",
>+			"package camelcase;"+
>+			"public class FoFoFo {\n"+
>+			"}");
>+		
>+		this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/camelcase/FFFTest.java",
>+			"package camelcase;"+
>+			"public class FFFTest {\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.fo";
>+		String completeBehind = "FF";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-				"foo2[FIELD_REF]{foo2, Ldeprecation.ZZZType1;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck8() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseType3() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>-		this.workingCopies = new ICompilationUnit[2];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+			
>+		this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" void foo() {"+
>-			" ZZZType1.fo\n"+
>-			" }"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"public class ZZZType1 {\n"+
>-			" public static int foo1;\n"+
>-			" /** @deprecated */\n"+
>-			" public static int foo2;\n"+
>+			" /**/FF\n"+
>+			"}\n"+
>+			"class FoFoFo {\n"+
>+			"}\n"+
>+			"class FFFTest {\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.fo";
>+		String completeBehind = "/**/FF";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck9() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
> 
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseType4() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>-		this.workingCopies = new ICompilationUnit[1];
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[3];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" public void bar1(){}\n"+
>-			" /** @deprecated */\n"+
>-			" public void bar2(){}\n"+
>-			" void foo() {"+
>-			" bar\n"+
>-			" }"+
>+			" FF\n"+
>+			"}");
>+	
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/camelcase/Member1.java",
>+			"package camelcase;"+
>+			"public class Member1 {\n"+
>+			" public class FoFoFo {\n"+
>+			" }\n"+
>+			"}");
>+		
>+		this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/camelcase/Member2.java",
>+			"package camelcase;"+
>+			"public class Member2 {\n"+
>+			" public class FFFTest {\n"+
>+			" }\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "bar";
>+		String completeBehind = "FF";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"Member1.FoFoFo[TYPE_REF]{camelcase.Member1.FoFoFo, camelcase, Lcamelcase.Member1$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"Member2.FFFTest[TYPE_REF]{camelcase.Member2.FFFTest, camelcase, Lcamelcase.Member2$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck10() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>+public void testCamelCaseType5() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	try {
>-
>+		Hashtable options = new Hashtable(oldOptions);
>+		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
> 		this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>+			"/Completion/src/camelcase/Test.java",
>+			"package camelcase;"+
> 			"public class Test {\n"+
>-			" public void bar1(){}\n"+
>-			" /** @deprecated */\n"+
>-			" public void bar2(){}\n"+
>-			" void foo() {"+
>-			" bar\n"+
>-			" }"+
>+			" public class FoFoFo {\n"+
>+			" public class FFFTest {\n"+
>+			" FF\n"+
>+			" }\n"+
>+			" }\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "bar";
>+		String completeBehind = "FF";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test$FoFoFo$FFFTest;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"Test.FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.Test$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"Test.FoFoFo.FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.Test$FoFoFo$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>+		JavaCore.setOptions(oldOptions);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck11() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef01() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
>-	JavaCore.setOptions(options);
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
>-	try {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" public int bar1;\n"+
>-			" /** @deprecated */\n"+
>-			" public int bar2;\n"+
>-			" void foo() {"+
>-			" bar\n"+
>-			" }"+
>-			"}");
>+	assertResults(
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef02() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing()\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "bar";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
> 	
>-		assertResults(
>-				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck12() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
> 	
>-	JavaCore.setOptions(options);
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
>-	try {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" public int bar1;\n"+
>-			" /** @deprecated */\n"+
>-			" public int bar2;\n"+
>-			" void foo() {"+
>-			" bar\n"+
>-			" }"+
>-			"}");
>+	assertResults(
>+			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef03() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" #\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "bar";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
> 	
>-		assertResults(
>-				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck13() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
> 	
>-	JavaCore.setOptions(options);
>-
>-	try {
>-
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" class Inner1 {}\n"+
>-			" /** @deprecated */\n"+
>-			" class Inner2 {}\n"+
>-			" void foo() {"+
>-			" Inn\n"+
>-			" }"+
>-			"}");
>-	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "Inn";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck14() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>-	try {
>-
>-		this.workingCopies = new ICompilationUnit[2];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" class Inner1 {}\n"+
>-			" /** @deprecated */\n"+
>-			" class Inner2 {}\n"+
>-			" void foo() {"+
>-			" Inn\n"+
>-			" }"+
>-			"}");
>-	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "Inn";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck15() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
>-	try {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		this.workingCopies = new ICompilationUnit[2];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" void foo() {"+
>-			" ZZZType1.foo\n"+
>-			" }"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/deprecation/ZZZType1.java",
>-			"package deprecation;"+
>-			"/** @deprecated */\n"+
>-			"public class ZZZType1 {\n"+
>-			" public static int foo1;\n"+
>-			" public static int foo2;\n"+
>-			"}");
>-	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZType1.foo";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>+	assertResults(
>+			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>-public void testDeprecationCheck16() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>-	try {
>-
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"/** @deprecated */\n"+
>-			"public class ZZZType1 {\n"+
>-			"}"+
>-			"public class Test {\n"+
>-			" void foo() {"+
>-			" ZZZTy\n"+
>-			" }"+
>-			"}");
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef04() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		"	public void throwing() throws test.p.IZZAException, test.p.IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (test.p.IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "ZZZTy";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/p/IZZAException.java",
>+			"package test.p;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
> 	
>-		assertResults(
>-				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127628
>-public void testDeprecationCheck17() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>-	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/p/IZZBException.java",
>+			"package test.p;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
> 	
>-	JavaCore.setOptions(options);
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/p/IZZException.java",
>+			"package test.p;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
>-	try {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/deprecation/Test.java",
>-			"package deprecation;"+
>-			"public class Test {\n"+
>-			" Bug127628Ty\n"+
>-			"}");
>-	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "Bug127628Ty";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"Bug127628Ty[POTENTIAL_METHOD_DECLARATION]{Bug127628Ty, Ldeprecation.Test;, ()V, Bug127628Ty, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"Bug127628Type1.Bug127628TypeInner1[TYPE_REF]{deprecation.Bug127628Type1.Bug127628TypeInner1, deprecation, Ldeprecation.Bug127628Type1$Bug127628TypeInner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"Bug127628Type2.Bug127628TypeInner2[TYPE_REF]{deprecation.Bug127628Type2.Bug127628TypeInner2, deprecation, Ldeprecation.Bug127628Type2$Bug127628TypeInner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"Bug127628Type1[TYPE_REF]{Bug127628Type1, deprecation, Ldeprecation.Bug127628Type1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>-		JavaCore.setOptions(options);
>-	}
>+	assertResults(
>+			"IZZBException[TYPE_REF]{test.p.IZZBException, test.p, Ltest.p.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{test.p.IZZException, test.p, Ltest.p.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>-public void testDuplicateLocals1() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef05() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		"	void foo() {\n" + 
>-		"		int x = 0;\n" + 
>-		"		TestString x = null;\n" + 
>-		"		x.bar;\n" + 
>-		"	}\n" + 
>-		"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/TestString.java",
>-		"package test;"+
>-		"public class TestString {\n" + 
>-		"	public void bar() {\n" + 
>-		"	}\n" + 
>-		"}");
>+		"	public class IZZAException extends Exception {}\n" +
>+		"	public class IZZBException extends Exception {}\n" +
>+		"	public class IZZException extends Exception {}\n" +
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "IZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"Test.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"Test.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>-public void testDuplicateLocals2() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef06() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		" public static void main(String[] args) {\n" + 
>-		" int x = 2;\n" + 
>-		" try {\n" + 
>-		" \n" + 
>-		" } catch(TestException x) {\n" + 
>-		" x.bar\n" + 
>-		" } catch(Exception e) {\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/TestException.java",
>-		"package test;"+
>-		"public class TestException extends Exception {\n" + 
>-		"	public void bar() {\n" + 
>-		"	}\n" + 
>-		"}");
>+		" public class Inner {\n" + 
>+		" public class IZZAException extends Exception {}\n" +
>+		" public class IZZBException extends Exception {}\n" +
>+		" public class IZZException extends Exception {}\n" +
>+		" public void throwing() throws IZZAException, IZZException {}\n" +
>+		" public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		" }" +
>+		"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "IZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"bar[METHOD_REF]{bar(), Ltest.TestException;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"Test.Inner.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$Inner$IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"Test.Inner.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$Inner$IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>-public void testDuplicateLocals3() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef07() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		" public static void main(String[] args) {\n" + 
>-		" int x = x = 0;\n" + 
>-		" if (true) {\n" + 
>-		" TestString x = x.bar\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/TestString.java",
>-		"package test;"+
>-		"public class TestString {\n" + 
>-		"	public void bar() {\n" + 
>-		"	}\n" + 
>-		"}");
>+		" void zork() {\n" + 
>+		" class IZZAException extends Exception {}\n" +
>+		" class IZZBException extends Exception {}\n" +
>+		" class IZZException extends Exception {}\n" +
>+		" class Local {\n" + 
>+		" public void throwing() throws IZZAException, IZZException {}\n" +
>+		" public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		" }" +
>+		" }" +
>+		"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "IZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"IZZBException[TYPE_REF]{IZZBException, test, LIZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, LIZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>-public void testDuplicateLocals4() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef08() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		" public static void main(String[] args) {\n" + 
>-		" for (int i = 0; i < 10; i++) {\n" + 
>-		" for (TestString i = null; i.bar < 5;) {\n" + 
>-		" // do something\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		"}");
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (/**/) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
> 	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/TestString.java",
>-		"package test;"+
>-		"public class TestString {\n" + 
>-		"	public void bar() {\n" + 
>-		"	}\n" + 
>-		"}");
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "/**/";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>-public void testDuplicateLocals5() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef09() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[5];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		" public static void main(String[] args) {\n" + 
>-		" for (int i = 0; i < 10; i++) {\n" + 
>-		" for (TestString i = null; ;) {\n" + 
>-		" i.bar // do something\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		"}");
>+		"	public void throwing() throws IZZAException, IZZCException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZCException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
> 	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/TestString.java",
>-		"package test;"+
>-		"public class TestString {\n" + 
>-		"	public void bar() {\n" + 
>-		"	}\n" + 
>-		"}");
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZCException.java",
>+			"package test;"+
>+			"public class IZZCException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[4] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "IZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZCException[TYPE_REF]{IZZCException, test, Ltest.IZZCException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
>-public void testDuplicateLocalsType1() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef10() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		" void foo() {\n" + 
>-		" class Local {\n" + 
>-		" void foo() {}\n" + 
>-		" }\n" + 
>-		" {\n" + 
>-		" class Local {\n" + 
>-		" Local(int i) {\n" + 
>-		" this.init(i);\n" + 
>-		" }\n" + 
>-		"				 void init(int i) {}\n" +
>-		" public void bar() {}\n" + 
>-		" }\n" + 
>-		" Local l = new Local(0);\n" + 
>-		" l.bar\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		"}");
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends IZZBException {\n" + 
>+			"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "IZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"bar[METHOD_REF]{bar(), LLocal;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
>-public void testDuplicateLocalsType2() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+//IZZBException should not be proposed but to filter this proposal
>+//we would need to know subclasses of IZZAException and it's currenlty too costly to compute
>+public void testCatchClauseExceptionRef11() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
> 	this.workingCopies[0] = getWorkingCopy(
> 		"/Completion/src/test/Test.java",
> 		"package test;"+
> 		"public class Test {\n" + 
>-		" void foo() {\n" + 
>-		" class Local {\n" + 
>-		" void foo() {\n" + 
>-		" }\n" + 
>-		" }\n" + 
>-		" {\n" + 
>-		" class Local {\n" + 
>-		" Local(int i) {\n" + 
>-		" this.init(i);\n" + 
>-		" this.bar();\n" + 
>-		" }\n" + 
>-		"				 				void init(int i) {}\n" +
>-		" 		void bar() {\n" + 
>-		" 		}\n" + 
>-		" }\n" + 
>-		" Local l = new Local(0);\n" + 
>-		" }\n" + 
>-		" Local l = new Local();\n" + 
>-		" l.foo\n" + 
>-		" }\n" + 
>-		"}");
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends IZZAException {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
> 
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "IZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"foo[METHOD_REF]{foo(), LLocal;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=139937
>-public void testEvaluationContextCompletion() throws JavaModelException {
>-	class EvaluationContextCompletionRequestor extends CompletionRequestor {
>-		public boolean acceptContext;
>-		public void acceptContext(CompletionContext context) {
>-			this.acceptContext = context != null;
>-		}
>-		public void accept(CompletionProposal proposal) {
>-			// Do nothing
>-		}
>-	}
>-	String start = "";
>-	IJavaProject javaProject = getJavaProject("Completion");
>-	IEvaluationContext context = javaProject.newEvaluationContext();
>- EvaluationContextCompletionRequestor rc = new EvaluationContextCompletionRequestor();
>-	context.codeComplete(start, start.length(), rc);
>-	
>-	assertTrue("acceptContext() method isn't call", rc.acceptContext);
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
>-public void testEvaluationContextCompletion2() throws JavaModelException {
>-	class EvaluationContextCompletionRequestor extends CompletionRequestor {
>-		public boolean acceptContext;
>-		public boolean beginReporting;
>-		public boolean endReporting;
>-		
>-		public void acceptContext(CompletionContext context) {
>-			this.acceptContext = context != null;
>-		}
>-		public void accept(CompletionProposal proposal) {
>-			// Do nothing
>-		}
>-		
>-		public void beginReporting() {
>-			this.beginReporting = true;
>-			super.beginReporting();
>-		}
>-		
>-		public void endReporting() {
>-			this.endReporting = true;
>-			super.endReporting();
>-		}
>-	}
>-	String start = "";
>-	IJavaProject javaProject = getJavaProject("Completion");
>-	IEvaluationContext context = javaProject.newEvaluationContext();
>- EvaluationContextCompletionRequestor rc = new EvaluationContextCompletionRequestor();
>-	context.codeComplete(start, start.length(), rc);
>-	
>-	assertTrue("acceptContext() method isn't call", rc.acceptContext);
>-	assertTrue("beginReporting() method isn't call", rc.beginReporting);
>-	assertTrue("endReporting() method isn't call", rc.endReporting);
>-}
>-
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
>-public void testEvaluationContextCompletion3() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef12() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/TestEvaluationContextCompletion3.java",
>+		"/Completion/src/test/Test.java",
> 		"package test;"+
>-		"public class TestEvaluationContextCompletion3 {\n"+
>-		"}");
>-	
>-	String start = "TestEvaluationContextCompletion3";
>-	IJavaProject javaProject = getJavaProject("Completion");
>-	IEvaluationContext context = javaProject.newEvaluationContext();
>+		"public class Test {\n" + 
>+		"	public void throwing() throws IZZAException, IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
>-	context.codeComplete(start, start.length(), requestor, this.wcOwner);
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
> 	
>-	int startOffset = 0;
>-	int endOffset = start.length();
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
> 	
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends Exception {\n" + 
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
> 	assertResults(
>-			"completion offset="+endOffset+"\n"+
>-			"completion range=["+startOffset+", "+(endOffset-1)+"]\n"+
>-			"completion token=\"TestEvaluationContextCompletion3\"\n"+
>-			"completion token kind=TOKEN_KIND_NAME\n"+
>-			"expectedTypesSignatures=null\n"+
>-			"expectedTypesKeys=null",
>- requestor.getContext());
>- 
>-	assertResults(
>-			"TestEvaluationContextCompletion3[TYPE_REF]{test.TestEvaluationContextCompletion3, test, Ltest.TestEvaluationContextCompletion3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}",
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
>+			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>+			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
>-public void testEvaluationContextCompletion4() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void testCatchClauseExceptionRef13() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/TestEvaluationContextCompletion4.java",
>+		"/Completion/src/test/Test.java",
> 		"package test;"+
>-		"public class TestEvaluationContextCompletion4 {\n"+
>-		"}");
>-	
>-	String start = "TestEvaluationContextCompletion4";
>-	IJavaProject javaProject = getJavaProject("Completion");
>-	IEvaluationContext context = javaProject.newEvaluationContext();
>+		"public class Test {\n" + 
>+		"	public void throwing() throws IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
>-	requestor.setIgnored(CompletionProposal.TYPE_REF, true);
>-	context.codeComplete(start, start.length(), requestor, this.wcOwner);
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
> 	
>-	int startOffset = 0;
>-	int endOffset = start.length();
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZBException.java",
>+			"package test;"+
>+			"public class IZZBException extends Exception {\n" + 
>+			"}\n");
> 	
>-	assertResults(
>-			"completion offset="+endOffset+"\n"+
>-			"completion range=["+startOffset+", "+(endOffset-1)+"]\n"+
>-			"completion token=\"TestEvaluationContextCompletion4\"\n"+
>-			"completion token kind=TOKEN_KIND_NAME\n"+
>-			"expectedTypesSignatures=null\n"+
>-			"expectedTypesKeys=null",
>- requestor.getContext());
>- 
>-	assertResults(
>-			"",
>-			requestor.getResults());
>-}
>+	this.workingCopies[3] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class IZZException extends IZZAException {\n" + 
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=141518
>-public void testEvaluationContextCompletion5() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/TestEvaluationContextCompletion5.java",
>-		"package test;"+
>-		"public class TestEvaluationContextCompletion5 {\n"+
>-		"}");
>-	
>-	String start = "someVariable.to";
>-	IJavaProject javaProject = getJavaProject("Completion");
>-	IEvaluationContext context = javaProject.newEvaluationContext();
>-	
>-	context.newVariable( "Object", "someVariable", null );
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
>-	context.codeComplete(start, start.length(), requestor, this.wcOwner);
>-	
>-	int startOffset = start.length() - 2;
>-	int endOffset = startOffset + 2 ;
>-	
>-	assertResults(
>-			"completion offset="+endOffset+"\n"+
>-			"completion range=["+startOffset+", "+(endOffset-1)+"]\n"+
>-			"completion token=\"to\"\n"+
>-			"completion token kind=TOKEN_KIND_NAME\n"+
>-			"expectedTypesSignatures=null\n"+
>-			"expectedTypesKeys=null",
>- requestor.getContext());
>- 
> 	assertResults(
>-			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"}",
>+			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-
>-/**
>- * Ensures that completion is not case sensitive
>- */
>-public void testCompletionCaseInsensitive() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu = getCompilationUnit("Completion", "src", "", "CompletionCaseInsensitive.java");
>-	
>-	String str = cu.getSource();
>-	String completeBehind = "Fiel";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	
>-	assertEquals("should have one class",
>-		"element:field completion:field relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_STATIC + R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-/**
>- * Complete a package in a case insensitive way
>+/*
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=65737
> */
>-public void testCompletionCaseInsensitivePackage() throws JavaModelException {
>+public void testCompletion2InterfacesWithSameMethod() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCaseInsensitivePackage.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "Completion2InterfacesWithSameMethod.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Ja";
>+	String completeBehind = "var.meth";
> 	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	
> 	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have package completions",
>-		"element:jarpack1 completion:jarpack1 relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
>-		"element:jarpack2 completion:jarpack2 relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
>-		"element:java completion:java relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
>-		"element:java.io completion:java.io relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
>-		"element:java.lang completion:java.lang relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
> 
>-/**
>- * Complete at end of file.
>- */
>-public void testCompletionEndOfCompilationUnit() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu = getCompilationUnit("Completion", "src", "", "CompletionEndOfCompilationUnit.java");
>-	cu.codeComplete(cu.getSourceRange().getOffset() + cu.getSourceRange().getLength(), requestor);
> 	assertEquals(
>-		"should have two methods of 'foo'", 
>-		"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());	
>+			"element:method completion:method() relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+			requestor.getResults());
> }
>-
>-/**
>- * Complete the type "A" from "new A".
>- */
>-public void testCompletionFindClass() throws JavaModelException {
>+public void testCompletionAbstractMethod1() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindClass.java",
>- "public class CompletionFindClass {\n" +
>- "	private A[] a;\n" +
>- "	public CompletionFindClass () {\n" +
>- "		this.a = new A\n" +
>+ "/Completion/src/CompletionAbstractMethod1.java",
>+ "public class CompletionAbstractMethod1 {\n" +
>+ "	abstract class A {\n" +
>+ "		abstract void foo();\n" +
>+ "	}\n" +
>+ "	class B extends A {\n" +
>+ "		void foo{} {}\n" +
>+ "		void bar() {\n" +
>+ "			super.fo\n" +
>+ "		}\n" +
> "	}\n" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "A";
>+ String completeBehind = "fo";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>- 		"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>- 		"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>-			"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>-			"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+ "",
> requestor.getResults());
> }
>-
>-/**
>- * The same type must be find only once
>- */
>-public void testCompletionFindClass2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindClass2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "PX";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"should have one classe", 
>-		"element:PX completion:pack1.PX relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_QUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-
>-
>-/**
>- * Complete the type "Default" in the default package example.
>- */
>-public void testCompletionFindClassDefaultPackage() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionDefaultPackage.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "Def";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"should have one class", 
>-		"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());	
>-}
>-
>-/**
>- * Complete the constructor "CompletionFindConstructor" from "new CompletionFindConstructor(".
>- */
>-public void testCompletionFindConstructor() throws JavaModelException {
>+public void testCompletionAbstractMethod2() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindConstructor.java",
>- "public class CompletionFindConstructor {\n"+
>- "	public CompletionFindConstructor (int i) {\n"+
>- "	}\n"+
>- "	publuc void foo(){\n"+
>- "		int x = 45;\n"+
>- "		new CompletionFindConstructor(i);\n"+
>- "	}\n"+
>+ "/Completion/src/CompletionAbstractMethod2.java",
>+ "public class CompletionAbstractMethod2 {\n" +
>+ "	abstract class A {\n" +
>+ "		abstract void foo();\n" +
>+ "	}\n" +
>+ "	class B extends A {\n" +
>+ "		void foo{} {}\n" +
>+ "		void bar() {\n" +
>+ "			this.fo\n" +
>+ "		}\n" +
>+ "	}\n" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
> String str = this.wc.getSource();
>- String completeBehind = "CompletionFindConstructor(";
>+ String completeBehind = "fo";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>- assertResults(
>-			"CompletionFindConstructor[ANONYMOUS_CLASS_DECLARATION]{, LCompletionFindConstructor;, (I)V, null, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-			"CompletionFindConstructor[METHOD_REF<CONSTRUCTOR>]{, LCompletionFindConstructor;, (I)V, CompletionFindConstructor, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+ "foo[METHOD_REF]{foo(), LCompletionAbstractMethod2$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
>-
>-/**
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>- */
>-public void testCompletionFindConstructor2() throws JavaModelException {
>+public void testCompletionAbstractMethod3() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindConstructor2.java",
>- "import zconstructors.*;\n"+
>- "public class CompletionFindConstructor2 {\n"+
>- "	Constructor2 c = new Constructor2();\n"+
>+ "/Completion/src/CompletionAbstractMethod3.java",
>+ "public class CompletionAbstractMethod3 {\n" +
>+ "	abstract class A {\n" +
>+ "		abstract void foo();\n" +
>+ "	}\n" +
>+ "	class B extends A {\n" +
>+ "		void bar() {\n" +
>+ "			this.fo\n" +
>+ "		}\n" +
>+ "	}\n" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
> String str = this.wc.getSource();
>- String completeBehind = "Constructor2(";
>+ String completeBehind = "fo";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>- assertEquals(
>-			"Constructor2[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor2;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"Constructor2[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor2;, ()V, Constructor2, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+ "foo[METHOD_REF]{foo(), LCompletionAbstractMethod3$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
>+ requestor.getResults());
> }
>-
>-/**
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>- */
>-public void testCompletionFindConstructor3() throws JavaModelException {
>+public void testCompletionAbstractMethod4() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindConstructor3.java",
>- "import zconstructors.*;\n"+
>- "public class CompletionFindConstructor3 {\n"+
>- "	Constructor3 c = new Constructor3();\n"+
>+ "/Completion/src/CompletionAbstractMethod4.java",
>+ "public class CompletionAbstractMethod1 {\n" +
>+ "	class A {\n" +
>+ "		void foo(){}\n" +
>+ "	}\n" +
>+ "	abstract class B extends A {\n" +
>+ "		abstract void foo();\n" +
>+ "	}\n" +
>+ "	class C extends B {\n" +
>+ "		void foo{} {}\n" +
>+ "		void bar() {\n" +
>+ "			super.fo\n" +
>+ "		}\n" +
>+ "	}\n" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
> String str = this.wc.getSource();
>- String completeBehind = "Constructor3(";
>+ String completeBehind = "fo";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>- assertEquals(
>-			"Constructor3[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor3;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"Constructor3[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor3;, ()V, Constructor3, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+ "",
>+ requestor.getResults());
> }
>-/**
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>- */
>-public void testCompletionFindConstructor4() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindConstructor4.java",
>- "import zconstructors.*;\n"+
>- "public class CompletionFindConstructor4 {\n"+
>- "	Constructor4 c = new Constructor4();\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
>- String str = this.wc.getSource();
>- String completeBehind = "Constructor4(";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>-	assertEquals(
>-			"Constructor4[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor4;, (I)V, null, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"Constructor4[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor4;, (I)V, Constructor4, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25578
>+*/
>+public void testCompletionAbstractMethodRelevance1() throws JavaModelException {
>+	ICompilationUnit superClass = null;
>+	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionAbstractSuperClass.java",
>+	 "public abstract class CompletionAbstractSuperClass {\n"+
>+	 "	public void foo1(){}\n"+
>+	 "	public abstract void foo2();\n"+
>+	 "	public void foo3(){}\n"+
>+	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionAbstractMethodRelevance1.java",
>+	 "public class CompletionAbstractMethodRelevance1 extends CompletionAbstractSuperClass {\n"+
>+	 "	foo\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+			"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionAbstractMethodRelevance1;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+			"foo1[METHOD_DECLARATION]{public void foo1(), LCompletionAbstractSuperClass;, ()V, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>+			"foo3[METHOD_DECLARATION]{public void foo3(), LCompletionAbstractSuperClass;, ()V, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>+			"foo2[METHOD_DECLARATION]{public void foo2(), LCompletionAbstractSuperClass;, ()V, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
>+	} finally {
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
>+	}
> }
>-/**
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>- */
>-public void testCompletionFindConstructor5() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindConstructor5.java",
>- "import zconstructors.*;\n"+
>- "public class CompletionFindConstructor5 {\n"+
>- "	Constructor5 c = new Constructor5();\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
>- String str = this.wc.getSource();
>- String completeBehind = "Constructor5(";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25578
>+*/
>+public void testCompletionAbstractMethodRelevance2() throws JavaModelException {
>+	ICompilationUnit superClass = null;
>+	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface.java",
>+	 "public interface CompletionSuperInterface{\n"+
>+	 "	public int eqFoo(int a,Object b);\n"+
>+	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionAbstractMethodRelevance2.java",
>+	 "public class CompletionAbstractMethodRelevance2 implements CompletionSuperInterface {\n"+
>+	 "	eq\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "eq";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionAbstractMethodRelevance2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>+			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
>+	} finally {
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionAfterCase1() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterCase1.java");
> 
>- assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>-	assertEquals(
>-			"Constructor5[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor5;, (I)V, null, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"Constructor5[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor5;, (I)V, Constructor5, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+		String str = cu.getSource();
>+		String completeBehind = "zz";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:zzz completion:zzz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-/**
>- * Complete the exception "Exception" in a catch clause.
>- */
>-public void testCompletionFindExceptions1() throws JavaModelException {
>+public void testCompletionAfterCase2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindException1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterCase2.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "Ex";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	
>-	assertEquals(
>-		"should have one class", 
>-		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>+		String str = cu.getSource();
>+		String completeBehind = "zz";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
> 
>-/**
>- * Complete the exception "Exception" in a throws clause.
>- */
>-public void testCompletionFindExceptions2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindException2.java");
>+		assertEquals(
>+			"element:zzz completion:zzz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+public void testCompletionAfterSupercall1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/CompletionAfterSupercall1.java",
>+		"public class CompletionAfterSupercall1 extends CompletionAfterSupercall1_1 {\n" +
>+		"	public void foo(){\n" +
>+		"		super.foo\n" +
>+		"	}\n" +
>+		"}\n" +
>+		"abstract class CompletionAfterSupercall1_1 extends CompletionAfterSupercall1_2 implements CompletionAfterSupercall1_3 {\n" +
>+		"	\n" +
>+		"}\n" +
>+		"class CompletionAfterSupercall1_2 implements CompletionAfterSupercall1_3 {\n" +
>+		"	public void foo(){}\n" +
>+		"}\n" +
>+		"interface CompletionAfterSupercall1_3 {\n" +
>+		"	public void foo();\n" +
>+		"}");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "Ex";
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "super.foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"should have one class",
>-		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"foo[METHOD_REF]{foo(), LCompletionAfterSupercall1_2;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-
>-/**
>- * Complete the field "var" from "va";
>- */
>-public void testCompletionFindField1() throws JavaModelException {
>+public void testCompletionAfterSwitch() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterSwitch.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "va";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-	
>+
> 	assertEquals(
>-		"should have one field: 'var' and one variable: 'var'", 
>-		"element:var completion:this.var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n"+
>-		"element:var completion:var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());	
>-}
>-
>-/**
>- * Complete the field "var" from "this.va";
>- */
>-public void testCompletionFindField2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "va";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	
>-	assertEquals(
>-		"should have 1 field of starting with 'va'",
>-		"element:var completion:var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-
>-public void testCompletionFindField3() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField3.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "b.ba";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"element:bar completion:bar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED),
>-		requestor.getResults());
>+			"element:bar completion:bar() relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME+ R_NON_RESTRICTED),
>+			requestor.getResults());
> }
>-
>-/**
>- * Complete the import, "import pac"
>- */
>-public void testCompletionFindImport1() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindImport1.java",
>- "import pac\n"+
>- "\n"+
>- "public class CompletionFindImport1 {\n"+
>- "\n"+
>+public void testCompletionAllMemberTypes() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionAllMemberTypes.java",
>+ "package test;\n" +
>+ "public class CompletionAllMemberTypes {\n" +
>+ " class Member1 {\n" +
>+ " class Member2 {\n" +
>+ " class Member3 {\n" +
>+ " }\n" +
>+ " }\n" +
>+ " void foo(){\n" +
>+ " Member\n" +
>+ " }\n" +
>+ " \n}" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "pac";
>+ String completeBehind = "Member";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>- 
>+
> 	assertResults(
>-			"pack[PACKAGE_REF]{pack.*;, pack, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"pack1[PACKAGE_REF]{pack1.*;, pack1, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"pack2[PACKAGE_REF]{pack2.*;, pack2, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
>-			requestor.getResults());
>+ "CompletionAllMemberTypes.Member1.Member2.Member3[TYPE_REF]{test.CompletionAllMemberTypes.Member1.Member2.Member3, test, Ltest.CompletionAllMemberTypes$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
>-
>-public void testCompletionFindImport2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindImport2.java",
>- "import pack1.P\n"+
>- "\n"+
>- "public class CompletionFindImport2 {\n"+
>- "\n"+
>+public void testCompletionAllMemberTypes2() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionAllMemberTypes2.java",
>+ "package test;\n" +
>+ "public class CompletionAllMemberTypes2 {\n" +
>+ " class Member1 {\n" +
>+ " class Member5 {\n" +
>+ " class Member6 {\n" +
>+ " }\n" +
>+ " }\n" +
>+ " class Member2 {\n" +
>+ " class Member3 {\n" +
>+ " class Member4 {\n" +
>+ " }\n" +
>+ " }\n" +
>+ " void foo(){\n" +
>+ " Member\n" +
>+ " }\n" +
>+ " }\n" +
>+ " \n}" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "pack1.P";
>+ String completeBehind = "Member";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>- 
>-	assertResults(
>-			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
>-			"PX[TYPE_REF]{pack1.PX;, pack1, Lpack1.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-}
>-
>-/**
>- * Complete the local variable "var";
>- */
>-public void testCompletionFindLocalVariable() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindLocalVariable.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "va";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have one local variable of 'var'", 
>-		"element:var completion:var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());	
>-}
>-
>-/**
>- * Complete the method call "a.foobar" from "a.fooba";
>- */
>-public void testCompletionFindMethod1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethod1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "fooba";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have two methods of 'foobar'", 
>-		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>-		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
>-		requestor.getResults());		
>-}
>-
>-
>-/**
>- * Too much Completion match on interface
>- */
>-public void testCompletionFindMethod2() throws JavaModelException {
>-	
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethod2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "fooba";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"should have two completions", 
>-		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>-		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
>-		requestor.getResults());	
>-}
>-
>-
>-/**
>- * Complete the method call "foobar" from "fooba";
>- */
>-public void testCompletionFindMethodInThis() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethodInThis.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "fooba";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have one method of 'foobar'", 
>-		"element:foobar completion:foobar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());		
>-}
>-
>-/**
>- * Complete the method call "foobar" from "fooba". The compilation
>- * unit simulates typing in process; ie it has incomplete structure/syntax errors.
>- */
>-public void testCompletionFindMethodWhenInProcess() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethodInProcess.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "fooba";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have a method of 'foobar'", 
>-		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-		requestor.getResults());
>-	cu.close();
>+	assertResults(
>+ "CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
>-
>-public void testCompletionFindSuperInterface() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindSuperInterface.java",
>- "public class CompletionFindSuperInterface implements SuperInterface {\n"+
>+public void testCompletionAllMemberTypes3() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionAllMemberTypes2.java",
>+ "package test;\n" +
>+ "public interface CompletionAllMemberTypes2 {\n" +
>+ " interface Member1 {\n" +
>+ " interface Member5 {\n" +
>+ " interface Member6 {\n" +
>+ " }\n" +
>+ " }\n" +
>+ " interface Member2 {\n" +
>+ " interface Member3 {\n" +
>+ " interface Member4 {\n" +
>+ " }\n" +
>+ " }\n" +
>+ " Member\n" +
>+ " }\n" +
>+ " \n}" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "Super";
>+ String completeBehind = "Member";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>- "SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	assertResults(
>+ "Member[POTENTIAL_METHOD_DECLARATION]{Member, Ltest.CompletionAllMemberTypes2$Member1$Member2;, ()V, Member, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
>-
>-/**
>- * Complete the field "bar" from "this.ba"
>- */
>-public void testCompletionFindThisDotField() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindThisDotField.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "this.ba";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have one result of 'bar'", 
>-		"element:bar completion:bar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
>-		requestor.getResults());
>+public void testCompletionAllMemberTypes4() throws JavaModelException {
>+	ICompilationUnit anInterface = null;
>+	try {
>+		anInterface = getWorkingCopy(
>+	 "/Completion/src/test/AnInterface.java",
>+	 "package test;\n" +
>+	 "public interface AnInterface {\n" +
>+	 " public interface Member1 {\n" +
>+	 " public interface Member5 {\n" +
>+	 " public interface Member6 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " public interface Member2 {\n" +
>+	 " public interface Member3 {\n" +
>+	 " interface Member4 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " Member\n" +
>+	 " }\n" +
>+	 " \n}" +
>+	 "}");
>+		
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/CompletionAllMemberTypes2.java",
>+	 "package test;\n" +
>+	 "public class CompletionAllMemberTypes2 {\n" +
>+	 " class Member1 {\n" +
>+	 " class Member5 {\n" +
>+	 " class Member6 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " class Member2 implements AnInterface {\n" +
>+	 " class Member3 {\n" +
>+	 " class Member4 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " void foo(){\n" +
>+	 " Member\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " \n}" +
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "Member";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+ 	assertResults(
>+	 "AnInterface.Member1.Member2[TYPE_REF]{test.AnInterface.Member1.Member2, test, Ltest.AnInterface$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AnInterface.Member1.Member2.Member3[TYPE_REF]{test.AnInterface.Member1.Member2.Member3, test, Ltest.AnInterface$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AnInterface.Member1.Member2.Member3.Member4[TYPE_REF]{test.AnInterface.Member1.Member2.Member3.Member4, test, Ltest.AnInterface$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AnInterface.Member1.Member5[TYPE_REF]{test.AnInterface.Member1.Member5, test, Ltest.AnInterface$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AnInterface.Member1.Member5.Member6[TYPE_REF]{test.AnInterface.Member1.Member5.Member6, test, Ltest.AnInterface$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AnInterface.Member1[TYPE_REF]{Member1, test, Ltest.AnInterface$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+	 requestor.getResults());
>+	} finally {
>+		if(anInterface != null) {
>+			anInterface.discardWorkingCopy();
>+		}
>+	}
> }
> 
>-/**
>- * Attempt to do completion with a null requestor
>- */
>-public void testCompletionNullRequestor() throws JavaModelException {
>+public void testCompletionAllMemberTypes5() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+	Hashtable oldCurrentOptions = JavaCore.getOptions();
> 	try {
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindThisDotField.java");
>-		cu.codeComplete(5, (CompletionRequestor)null);
>-	} catch (IllegalArgumentException iae) {
>-		return;
>+		Hashtable options = new Hashtable(oldCurrentOptions);
>+		options.put(JavaCore.CODEASSIST_VISIBILITY_CHECK, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		aType = getWorkingCopy(
>+	 "/Completion/src/test/AType.java",
>+	 "package test;\n" +
>+	 "public class AType {\n" +
>+	 " public class Member1 {\n" +
>+	 " private class Member2 {\n" +
>+	 " public class Member3 {\n" +
>+	 " public class Member4 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " \n}" +
>+	 "}");
>+		
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/CompletionAllMemberTypes5.java",
>+	 "package test;\n" +
>+	 "public class CompletionAllMemberTypes5 {\n" +
>+	 " void foo(){\n" +
>+	 " Member\n" +
>+	 " }\n" +
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "Member";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+ 	// AType.Member1.Member2.Member3 and AType.Member1.Member2.Member3.Member4 should not be proposed because they are not visible.
>+ 	// But visibility need modifiers of enclosing types to be computed. 
>+ 	assertResults(
>+	 "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AType.Member1.Member2.Member3.Member4[TYPE_REF]{test.AType.Member1.Member2.Member3.Member4, test, Ltest.AType$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+	 requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+		JavaCore.setOptions(oldCurrentOptions);
> 	}
>-	assertTrue("Should not be able to do completion with a null requestor", false);
> }
> 
>-/**
>- * Ensures that the code assist features works on class files with associated source.
>- */
>-public void testCompletionOnClassFile() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	IClassFile cu = getClassFile("Completion", "zzz.jar", "jarpack1", "X.class");
>+public void testCompletionAllMemberTypes6() throws JavaModelException {
>+	Hashtable oldCurrentOptions = JavaCore.getOptions();
>+	try {
>+		Hashtable options = new Hashtable(oldCurrentOptions);
>+		options.put(JavaCore.CODEASSIST_VISIBILITY_CHECK, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/CompletionAllMemberTypes6.java",
>+	 "package test;\n" +
>+	 "class AType {\n" +
>+	 " public class Member1 {\n" +
>+	 " private class Member2 {\n" +
>+	 " public class Member3 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 "}\n" +
>+	 "public class CompletionAllMemberTypes6 {\n" +
>+	 " void foo(){\n" +
>+	 " Member\n" +
>+	 " }\n" +
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "Member";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	String str = cu.getSource();
>-	String completeBehind = "Obj";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-	assertEquals(
>-		"should have one class", 
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+ 	assertResults(
>+	 "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+	 requestor.getResults());
>+	} finally {
>+		JavaCore.setOptions(oldCurrentOptions);
>+	}
> }
> 
>-/**
>- * Test that an out of bounds index causes an exception.
>- */
>-public void testCompletionOutOfBounds() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionOutOfBounds.java");
>+public void testCompletionAllMemberTypes7() throws JavaModelException {
>+	Hashtable oldCurrentOptions = JavaCore.getOptions();
> 	try {
>-		cu.codeComplete(cu.getSource().length() + 1, requestor);
>-	} catch (JavaModelException e) {
>-		return;
>+		Hashtable options = new Hashtable(oldCurrentOptions);
>+		options.put(JavaCore.CODEASSIST_VISIBILITY_CHECK, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/AType.java",
>+	 "package test;\n" +
>+	 "class AType {\n" +
>+	 " public class Member1 {\n" +
>+	 " private class Member2 {\n" +
>+	 " public class Member3 {\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " }\n" +
>+	 " void foo(){\n" +
>+	 " Member\n" +
>+	 " }\n" +
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "Member";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+ 	assertResults(
>+	 "AType.Member1.Member2[TYPE_REF]{test.AType.Member1.Member2, test, Ltest.AType$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"AType.Member1[TYPE_REF]{Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+	 requestor.getResults());
>+	} finally {
>+		JavaCore.setOptions(oldCurrentOptions);
> 	}
>-	assertTrue("should have failed", false);
> }
> 
>-/**
>- * Complete the type "Repeated", "RepeatedOtherType from "Repeated".
>- */
>-public void testCompletionRepeatedType() throws JavaModelException {
>+public void testCompletionAllocationExpressionIsParent1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionRepeatedType.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "/**/CompletionRepeated";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>+
> 	assertEquals(
>-		"should have two types",
>-		"element:CompletionRepeatedOtherType completion:CompletionRepeatedOtherType relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:CompletionRepeatedType completion:CompletionRepeatedType relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());	
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-
>-
>-public void testCompletionVisibilityCheckEnabled() throws JavaModelException {
>-	String visibilityCheckID = "org.eclipse.jdt.core.codeComplete.visibilityCheck";
>-	Hashtable options = JavaCore.getOptions();
>-	Object visibilityCheckPreviousValue = options.get(visibilityCheckID);
>-	options.put(visibilityCheckID,"enabled");
>-	JavaCore.setOptions(options);
>-	
>+public void testCompletionAllocationExpressionIsParent2() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionAllocationExpressionIsParent2.java",
>+ "public class CompletionAllocationExpressionIsParent2 {\n" +
>+ "	public class Inner {\n" +
>+ "		public Inner(long i, long j){super();}\n" +
>+ "		public Inner(Object i, Object j){super();}\n" +
>+ "		\n" +
>+ "	}\n" +
>+ "	\n" +
>+ "	long zzlong;\n" +
>+ "	int zzint;\n" +
>+ "	double zzdouble;\n" +
>+ "	boolean zzboolean;\n" +
>+ "	Object zzObject;\n" +
>+ "	\n" +
>+ "	void foo() {\n" +
>+ "		this.new Inner(1, zz\n" +
>+ "	}\n" +
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "zz";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent2;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent2;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent2;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent2;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent2;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+ requestor.getResults());
>+}
>+
>+public void testCompletionAllocationExpressionIsParent3() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionAllocationExpressionIsParent3.java",
>+ "public class CompletionAllocationExpressionIsParent3 {\n" +
>+ "	public class Inner {\n" +
>+ "		public Inner(long i, long j){super();}\n" +
>+ "		public Inner(Object i, Object j){super();}\n" +
>+ "		\n" +
>+ "	}\n" +
>+ "	\n" +
>+ "	long zzlong;\n" +
>+ "	int zzint;\n" +
>+ "	double zzdouble;\n" +
>+ "	boolean zzboolean;\n" +
>+ "	Object zzObject;\n" +
>+ "	\n" +
>+ "	void foo() {\n" +
>+ "		new CompletionAllocationExpressionIsParent3().new Inner(1, zz\n" +
>+ "	}\n" +
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "zz";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent3;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent3;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent3;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent3;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent3;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+ requestor.getResults());
>+}
>+
>+public void testCompletionAllocationExpressionIsParent4() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVisibilityCheck.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent4.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "x.p";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-	
>-	options.put(visibilityCheckID,visibilityCheckPreviousValue);
>-	JavaCore.setOptions(options);
>+
> 	assertEquals(
>-		"should have two methods", 
>-		"element:protectedFoo completion:protectedFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>-		"element:publicFoo completion:publicFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-
>-public void testCompletionVisibilityCheckDisabled() throws JavaModelException {
>-	String visibilityCheckID = "org.eclipse.jdt.core.codeComplete.visibilityCheck";
>-	Hashtable options = JavaCore.getOptions();
>-	Object visibilityCheckPreviousValue = options.get(visibilityCheckID);
>-	options.put(visibilityCheckID,"disabled");
>-	JavaCore.setOptions(options);
>-	
>+public void testCompletionAllocationExpressionIsParent5() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVisibilityCheck.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent5.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "x.p";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-	
>-	options.put(visibilityCheckID,visibilityCheckPreviousValue);
>-	JavaCore.setOptions(options);
>+
> 	assertEquals(
>-		"should have three methods", 
>-		"element:privateFoo completion:privateFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>-		"element:protectedFoo completion:protectedFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>-		"element:publicFoo completion:publicFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>+
>+public void testCompletionAllocationExpressionIsParent6() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionAllocationExpressionIsParent6.java",
>+ "public class CompletionAllocationExpressionIsParent6 {\n" +
>+ "	\n" +
>+ "	long zzlong;\n" +
>+ "	int zzint;\n" +
>+ "	double zzdouble;\n" +
>+ "	boolean zzboolean;\n" +
>+ "	Object zzObject;\n" +
>+ "	\n" +
>+ "	void foo() {\n" +
>+ "		new CompletionAllocation_ERROR_ExpressionIsParent6Plus().new Inner(1, zz\n" +
>+ "	}\n" +
>+ "}\n" +
>+ "class CompletionAllocationExpressionIsParent6Plus {\n" +
>+ "	public class Inner {\n" +
>+ "		public Inner(long i, long j){\n" +
>+ "			\n" +
>+ "		}	\n" +
>+ "	}	\n" +
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "zz";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent6;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent6;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent6;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent6;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+ "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent6;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+ requestor.getResults());
>+}
>+
> public void testCompletionAmbiguousFieldName() throws JavaModelException {
> 
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>@@ -1904,8 +1911,6 @@
> 		"element:xBar completion:xBar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-
>-
> public void testCompletionAmbiguousFieldName4() throws JavaModelException {
> 
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>@@ -1921,2461 +1926,2451 @@
> 		"element:xBar completion:xBar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>+public void testCompletionAmbiguousType() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousType.java");
> 
>+	String str = cu.getSource();
>+	String completeBehind = "ABC";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-public void testCompletionPrefixFieldName1() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionPrefixFieldName1.java",
>- "public class CompletionPrefixFieldName1 {\n"+
>- "	int xBar;\n"+
>- "	\n"+
>- "	class classFoo {\n"+
>- "		int xBar;\n"+
>- "		\n"+
>- "		public void foo(){\n"+
>- "			xBa\n"+
>- "		}\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "xBa";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertEquals(
>+		"should have two completions", 
>+		"element:ABC completion:p1.ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n" +
>+		"element:ABC completion:p2.ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionAmbiguousType2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousType2.java");
> 
>-	assertResults(
>-		"xBar[FIELD_REF]{CompletionPrefixFieldName1.this.xBar, LCompletionPrefixFieldName1;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>-		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName1$classFoo;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+	String str = cu.getSource();
>+	String completeBehind = "ABC";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have two completions", 
>+		"element:ABC completion:ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:ABC completion:p2.ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>+public void testCompletionArgumentName() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArgumentName.java");
> 
>-public void testCompletionPrefixFieldName2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionPrefixFieldName2.java",
>- "public class CompletionPrefixFieldName2 {\n"+
>- "	int xBar;\n"+
>- "	\n"+
>- "	class classFoo {\n"+
>- "		int xBar;\n"+
>- "		\n"+
>- "		public void foo(){\n"+
>- "			new CompletionPrefixFieldName2().xBa\n"+
>- "		}\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "xBa";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	String str = cu.getSource();
>+	String completeBehind = "ClassWithComplexName ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertResults(
>-		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName2;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
>+	assertEquals(
>+		"should have two completions", 
>+		"element:classWithComplexName completion:classWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:complexName2 completion:complexName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:withComplexName completion:withComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>+public void testCompletionArrayAccess1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArrayAccess1.java");
> 
>-public void testCompletionPrefixMethodName1() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionPrefixMethodName1.java",
>- "public class CompletionPrefixMethodName1 {\n"+
>- "	int xBar(){}\n"+
>- "	\n"+
>- "	class classFoo {\n"+
>- "		int xBar(){}\n"+
>- "		\n"+
>- "		public void foo(){\n"+
>- "			xBa\n"+
>- "		}\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "xBa";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	String str = cu.getSource();
>+	String completeBehind = "zzz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertResults(
>-		"xBar[METHOD_REF]{CompletionPrefixMethodName1.this.xBar(), LCompletionPrefixMethodName1;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>-		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName1$classFoo;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+	assertEquals(
>+		"element:zzz1 completion:zzz1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:zzz2 completion:zzz2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE +R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-
>-public void testCompletionPrefixMethodName2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionPrefixMethodName2.java",
>- "public class CompletionPrefixMethodName2 {\n"+
>- "	int xBar(){}\n"+
>- "	\n"+
>- "	class classFoo {\n"+
>- "		int xBar(){}\n"+
>- "		\n"+
>- "		public void foo(){\n"+
>- "			new CompletionPrefixMethodName2().xBa\n"+
>- "		}\n"+
>- "	}\n"+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=84690
>+public void testCompletionArrayClone() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionArrayClone.java",
>+ "package test;\n" +
>+ "public class CompletionArrayClone {\n" +
>+ " public void foo() {\n" +
>+ " long[] var;\n" +
>+ " var.clon\n" +
>+ " }\n" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "xBa";
>+ String completeBehind = "clon";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName2;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
>-		requestor.getResults());
>+ assertResults(
>+ "clone[METHOD_REF]{clone(), [J, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
> 
>-public void testCompletionPrefixMethodName3() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionPrefixMethodName2.java",
>- "public class CompletionPrefixMethodName3 {\n"+
>- "	int xBar(int a, int b){}\n"+
>- "	\n"+
>- "	class classFoo {\n"+
>- "		int xBar(int a, int b){}\n"+
>- "		\n"+
>- "		public void foo(){\n"+
>- "			xBar(1,\n"+
>- "		}\n"+
>- "	}\n"+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=84690
>+public void testCompletionArrayLength() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionArrayLength.java",
>+ "package test;\n" +
>+ "public class CompletionArrayLength {\n" +
>+ " public void foo() {\n" +
>+ " long[] var;\n" +
>+ " var.leng\n" +
>+ " }" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "xBar(1,";
>+ String completeBehind = "leng";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-		"xBar[METHOD_REF]{CompletionPrefixMethodName3.this.xBar(1,, LCompletionPrefixMethodName3;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED)+"}\n"+
>-		"xBar[METHOD_REF]{, LCompletionPrefixMethodName3$classFoo;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-		requestor.getResults());
>+ assertResults(
>+ "length[FIELD_REF]{length, [J, I, length, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
> 
>-public void testCompletionFindMemberType1() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionFindMemberType1.java",
>- "interface A1 {\n"+
>- "	class Inner1 {\n"+
>- "	}\n"+
>- "}\n"+
>- "interface B1 extends A1 {\n"+
>- "	class Inner1 {\n"+
>- "	}\n"+
>- "}\n"+
>- "public class CompletionFindMemberType1 {\n"+
>- "	public void foo() {\n"+
>- "		B1.Inner\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "Inner";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionArraysCloneMethod() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArraysCloneMethod.java");
> 
>-	assertResults(
>-		"B1.Inner1[TYPE_REF]{Inner1, , LB1$Inner1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) +"}",
>+	String str = cu.getSource();
>+	String completeBehind = ".cl";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionFindMemberType2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionPrefixMethodName2.java",
>- "interface A2 {\n"+
>- "	class ZInner2{\n"+
>- "	}\n"+
>- "}\n"+
>- "interface B2 extends A2 {\n"+
>- "	class ZInner2 {\n"+
>- "	}\n"+
>- "}\n"+
>- "public class CompletionFindMemberType2 implements B2{\n"+
>- "	public void foo() {\n"+
>- "		ZInner\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "ZInner";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionAssignmentInMethod1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod1.java");
> 
>-	assertResults(
>-		"B2.ZInner2[TYPE_REF]{ZInner2, , LB2$ZInner2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionMethodDeclaration() throws JavaModelException {
>+public void testCompletionAssignmentInMethod2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod2.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
> 
>+public void testCompletionAssignmentInMethod3() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod3.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "eq";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"should have two completions", 
>-		"element:eqFoo completion:public int eqFoo(int a, Object b) relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"\n" +
>-		"element:equals completion:public boolean equals(Object obj) relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionMethodDeclaration2() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionMethodDeclaration2.java",
>-	 "public class CompletionMethodDeclaration2 extends CompletionSuperClass {\n" +
>-	 "	eq\n" +
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "eq";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>-			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-	}
>-}
>-
>-/**
>- * Completion should not propose declarations of method already locally implemented
>- */
>-public void testCompletionMethodDeclaration3() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionMethodDeclaration3.java",
>-	 "public class CompletionMethodDeclaration3 extends CompletionSuperClass {\n" +
>-	 "	eq\n" +
>-	 "	\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "eq";
>-	 int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration3;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-	}
>+
>+public void testCompletionAssignmentInMethod4() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod4.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
> 
> 
>-public void testCompletionMethodDeclaration4() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface.java",
>-	 "public interface CompletionSuperInterface{\n"+
>-	 "	public int eqFoo(int a,Object b);\n"+
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionMethodDeclaration4.java",
>-	 "public abstract class CompletionMethodDeclaration4 implements CompletionSuperInterface {\n"+
>-	 "	eq\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "eq";
>-	 int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionBasicAnonymousDeclaration1() throws JavaModelException {
>+	CompletionResult result = complete(
>+			"/Completion/src3/test0000/CompletionBasicCompletionContext.java",
>+			"public class CompletionBasicAnonymousDeclaration1 {\n"+
>+			"	void foo() {\n"+
>+			"		new Object(\n"+
>+			"	}\n"+
>+			"}",
>+			"new Object(");
> 	
>-		assertResults(
>-			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration4;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-	}
>+	assertResults(
>+			"expectedTypesSignatures=null\n" +
>+			"expectedTypesKeys=null",
>+			result.context);
>+	
>+	assertResults(
>+			"Object[ANONYMOUS_CLASS_DECLARATION]{, Ljava.lang.Object;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"Object[METHOD_REF<CONSTRUCTOR>]{, Ljava.lang.Object;, ()V, Object, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			result.proposals);
> }
> 
>-public void testCompletionMethodDeclaration5() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionMethodDeclaration5.java",
>-	 "public class CompletionMethodDeclaration5 {\n" +
>-	 "	public static void main(String[] args) {\n" +
>-	 "		new CompletionSuperClass() {\n" +
>-	 "	}\n" +
>-	 "\n" +
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "new CompletionSuperClass() {";
>-	 int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionBasicCompletionContext() throws JavaModelException {
>+	CompletionResult result = complete(
>+			"/Completion/src3/test0000/CompletionBasicCompletionContext.java",
>+			"package test0000;\n" +
>+			"public class CompletionBasicCompletionContext {\n" +
>+			" void bar(String o) {\n" +
>+			" String zzz = null; \n" + 
>+			" o = zzz\n" + 
>+			" }\n" +
>+			"}",
>+			"zzz");
> 	
>-	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-			assertResults(
>-				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
>-				requestor.getResults());
>-		} else {
>-			assertResults(
>-				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-				"CompletionMethodDeclaration5[TYPE_REF]{CompletionMethodDeclaration5, , LCompletionMethodDeclaration5;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>-				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
>-				requestor.getResults());
>-		}
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-	}
>+	assertResults(
>+			"expectedTypesSignatures={Ljava.lang.String;}\n" +
>+			"expectedTypesKeys={Ljava/lang/String;}",
>+			result.context);
>+	
>+	assertResults(
>+			"zzz[LOCAL_VARIABLE_REF]{zzz, null, Ljava.lang.String;, zzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			result.proposals);
> }
>-public void testCompletionMethodDeclaration6() throws JavaModelException {
> 
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration6.java");
>+public void testCompletionBasicField1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicField1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "clon";
>+	String completeBehind = "zzvar";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have one completion", 
>-		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"zzvarzz[FIELD_REF]{zzvarzz, LCompletionBasicField1;, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMethodDeclaration7() throws JavaModelException {
>-
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration7.java");
>+public void testCompletionBasicKeyword1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicKeyword1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "clon";
>+	String completeBehind = "whil";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have one completion", 
>-		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"while[KEYWORD]{while, null, null, while, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMethodDeclaration8() throws JavaModelException {
>-
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration8.java");
>+public void testCompletionBasicLocalVariable1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicLocalVariable1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "clon";
>+	String completeBehind = "zzvar";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have one completion", 
>-		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"zzvarzz[LOCAL_VARIABLE_REF]{zzvarzz, null, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMethodDeclaration9() throws JavaModelException {
>-
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration9.java");
>+public void testCompletionBasicMethod1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicMethod1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "clon";
>+	String completeBehind = "zzfo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have one completion", 
>-		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"zzfoo[METHOD_REF]{zzfoo(), LCompletionBasicMethod1;, ()V, zzfoo, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMethodDeclaration10() throws JavaModelException {
>-
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration10.java");
>+public void testCompletionBasicMethodDeclaration1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicMethodDeclaration1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "clon";
>+	String completeBehind = "equals";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have one completion", 
>-		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=80063
>-public void testCompletionMethodDeclaration11() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionMethodDeclaration11.java",
>-			"package test;\n" +
>-			"public class CompletionMethodDeclaration11 {\n" +
>-			" private void foo() {\n" +
>-			" }\n" +
>-			"}\n" +
>-			"class CompletionMethodDeclaration11_2 extends CompletionMethodDeclaration11 {\n" +
>-			" fo\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "fo";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
> 	assertResults(
>-			"fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration11_2;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			"equals[POTENTIAL_METHOD_DECLARATION]{equals, LCompletionBasicMethodDeclaration1;, ()V, equals, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-public void testCompletionMethodDeclaration12() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionMethodDeclaration12.java",
>- "package test;\n" +
>- "public class CompletionMethodDeclaration12 {\n" +
>- " public void foo() {\n" +
>- " }\n" +
>- "}\n" +
>- "class CompletionMethodDeclaration12_2 extends CompletionMethodDeclaration12{\n" +
>- " public final void foo() {\n" +
>- " }\n" +
>- "}\n" +
>- "class CompletionMethodDeclaration12_3 extends CompletionMethodDeclaration12_2 {\n" +
>- " fo\n" +
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "fo";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>- "fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration12_3;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>-}
>-public void testCompletionFieldName() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldName.java");
>+public void testCompletionBasicPackage1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicPackage1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "ClassWithComplexName ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "java.lan";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have two completions",
>-		"element:classWithComplexName completion:classWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:complexName2 completion:complexName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:withComplexName completion:withComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
> 
>-public void testCompletionLocalName() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionLocalName.java");
>+public void testCompletionBasicPotentialMethodDeclaration1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicPotentialMethodDeclaration1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "ClassWithComplexName ";
>+	String completeBehind = "zzpot";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have two completions", 
>-		"element:classWithComplexName completion:classWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:complexName2 completion:complexName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:withComplexName completion:withComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"zzpot[POTENTIAL_METHOD_DECLARATION]{zzpot, LCompletionBasicPotentialMethodDeclaration1;, ()V, zzpot, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
> 
>-public void testCompletionArgumentName() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArgumentName.java");
>+public void testCompletionBasicType1() throws JavaModelException {
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicType1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "ClassWithComplexName ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"should have two completions", 
>-		"element:classWithComplexName completion:classWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:complexName2 completion:complexName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:withComplexName completion:withComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-
>-public void testCompletionCatchArgumentName() throws JavaModelException {
>+public void testCompletionBasicVariableDeclaration1() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionCatchArgumentName.java",
>-		"public class CompletionCatchArgumentName {\n"+
>-		"	public void foo(){\n"+
>-		"		try{\n"+
>-		"			\n"+
>-		"		} catch (Exception ex)\n"+
>-		"	}\n"+
>+		"/Completion/src/CompletionBasicVariableDeclaration1.java",
>+		"public class CompletionBasicVariableDeclaration1 {\n"+
>+		"	public Object obj;\n"+
> 		"}\n");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "ex";
>+	String completeBehind = "obj";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 	assertResults(
>-		"exception[VARIABLE_DECLARATION]{exception, null, Ljava.lang.Exception;, exception, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>+		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
> 		requestor.getResults());
> }
> 
>+public void testCompletionBinaryOperator1() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator1.java");
> 
>-public void testCompletionAmbiguousType() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousType.java");
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+
>+public void testCompletionBinaryOperator2() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator2.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+
>+
>+public void testCompletionBinaryOperator3() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator3.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
> 
>+
>+/**
>+ * Ensures that completion is not case sensitive
>+ */
>+public void testCompletionCaseInsensitive() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu = getCompilationUnit("Completion", "src", "", "CompletionCaseInsensitive.java");
>+	
> 	String str = cu.getSource();
>-	String completeBehind = "ABC";
>+	String completeBehind = "Fiel";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>+	
>+	assertEquals("should have one class",
>+		"element:field completion:field relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_STATIC + R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+
>+
>+/**
>+ * Complete a package in a case insensitive way
>+ */
>+public void testCompletionCaseInsensitivePackage() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCaseInsensitivePackage.java");
> 
>+	String str = cu.getSource();
>+	String completeBehind = "Ja";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	
>+	cu.codeComplete(cursorLocation, requestor);
> 	assertEquals(
>-		"should have two completions", 
>-		"element:ABC completion:p1.ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n" +
>-		"element:ABC completion:p2.ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+		"should have package completions",
>+		"element:jarpack1 completion:jarpack1 relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
>+		"element:jarpack2 completion:jarpack2 relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
>+		"element:java completion:java relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
>+		"element:java.io completion:java.io relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
>+		"element:java.lang completion:java.lang relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
> 
>-public void testCompletionAmbiguousType2() throws JavaModelException {
>+public void testCompletionCastIsParent1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAmbiguousType2.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCastIsParent1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "ABC";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"should have two completions", 
>-		"element:ABC completion:ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:ABC completion:p2.ABC relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+		"element:zz00 completion:zz00 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz00M completion:zz00M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz01 completion:zz01 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz01M completion:zz01M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz02 completion:zz02 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz02M completion:zz02M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz10 completion:zz10 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz10M completion:zz10M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz11 completion:zz11 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz11M completion:zz11M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz12 completion:zz12 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz12M completion:zz12M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz20 completion:zz20 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz20M completion:zz20M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz21 completion:zz21 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz21M completion:zz21M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz22 completion:zz22 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz22M completion:zz22M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzOb completion:zzOb relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzObM completion:zzObM() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
> 
>-public void testCompletionWithBinaryFolder() throws JavaModelException {
>+public void testCompletionCastIsParent2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionWithBinaryFolder.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCastIsParent2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "My";
>+	String completeBehind = "xx";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"should have two completions",
>-		"element:MyClass completion:MyClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:mypackage completion:mypackage relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
>+		"element:XX00 completion:XX00 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX01 completion:XX01 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX02 completion:XX02 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX10 completion:XX10 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX11 completion:XX11 relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX12 completion:XX12 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX20 completion:XX20 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX21 completion:XX21 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX22 completion:XX22 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-
>-public void testCompletionVariableNameOfArray1() throws JavaModelException {
>+public void testCompletionCatchArgumentName() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionVariableNameOfArray1.java",
>-		"public class CompletionVariableNameOfArray1 {\n"+
>-		"	Object[] ob\n"+
>+		"/Completion/src/CompletionCatchArgumentName.java",
>+		"public class CompletionCatchArgumentName {\n"+
>+		"	public void foo(){\n"+
>+		"		try{\n"+
>+		"			\n"+
>+		"		} catch (Exception ex)\n"+
>+		"	}\n"+
> 		"}\n");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "ob";
>+	String completeBehind = "ex";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 	assertResults(
>-		"objects[VARIABLE_DECLARATION]{objects, null, [Ljava.lang.Object;, objects, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>+		"exception[VARIABLE_DECLARATION]{exception, null, Ljava.lang.Exception;, exception, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
> 		requestor.getResults());
> }
> 
>-
>-public void testCompletionVariableNameOfArray2() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionVariableNameOfArray2.java",
>-		"public class CompletionVariableNameOfArray2 {\n"+
>-		"	Class[] cl\n"+
>-		"}\n");
>+public void testCompletionCatchArgumentName2() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "cl";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_ARGUMENT_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_ARGUMENT_PREFIXES,"arg"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"loc"); //$NON-NLS-1$
> 	
>-	assertResults(
>-		"classes[VARIABLE_DECLARATION]{classes, null, [Ljava.lang.Class;, classes, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>-		requestor.getResults());
>+	JavaCore.setOptions(options);
>+	
>+	try {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCatchArgumentName2.java");
>+	
>+		String str = cu.getSource();
>+		String completeBehind = "Exception ";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+	
>+		assertEquals(
>+			"element:exception completion:exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:locException completion:locException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_ARGUMENT_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
> }
> 
>+public void testCompletionClassLiteralAfterAnonymousType1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionClassLiteralAfterAnonymousType1.java");
> 
>-public void testCompletionVariableNameOfArray3() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionVariableNameOfArray3.java",
>-		"public class CompletionVariableNameOfArray3 {\n"+
>-		"	Object[][] ob\n"+
>-		"}\n");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "ob";
>+	String str = cu.getSource();
>+	String completeBehind = "double.";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	assertResults(
>-		"objects[VARIABLE_DECLARATION]{objects, null, [[Ljava.lang.Object;, objects, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>+public void testCompletionConditionalExpression1() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression1.java");
> 
>-public void testCompletionVariableNameOfArray4() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionVariableNameOfArray4.java",
>-		"public class CompletionVariableNameOfArray4 {\n"+
>-		"	Objectz[] ob\n"+
>-		"}\n");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "ob";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	assertResults(
>-		"",
>-		requestor.getResults());
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
> }
> 
>+public void testCompletionConditionalExpression2() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression2.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
> 
>-public void testCompletionVariableNameUnresolvedType() throws JavaModelException {
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+
>+public void testCompletionConditionalExpression3() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression3.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+
>+
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=24939
>+*/
>+public void testCompletionConstructorForAnonymousType() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableNameUnresolvedType.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConstructorForAnonymousType.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "ob";
>+	String completeBehind = "TypeWithConstructor(";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"should have no completion",
>-		"",
>+		"element:TypeWithConstructor completion: relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>+public void testCompletionEmptyToken1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyToken1.java");
> 
>-public void testCompletionSameSuperClass() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionSameSuperClass.java",
>- "public class CompletionSameSuperClass extends A {\n" +
>- "	class Inner extends A {\n" +
>- "		void foo(int bar){\n" +
>- "			bar\n" +
>- "		}\n" +
>- "	}	\n" +
>- "}");
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	// completion is just at start of 'zz'
>+	int cursorLocation = str.lastIndexOf(completeBehind);
>+	int start = cursorLocation;
>+	int end = start + 4;
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertEquals(
>+			"element:clone completion:clone() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:equals completion:equals() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:finalize() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:foo completion:foo() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:getClass completion:getClass() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:hashCode completion:hashCode() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:notify completion:notify() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:notifyAll completion:notifyAll() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:toString completion:toString() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:zzyy completion:zzyy position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResultsWithPosition());
>+	} else {
>+		assertEquals(
>+			"element:CompletionEmptyToken1 completion:CompletionEmptyToken1 position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:clone completion:clone() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:equals completion:equals() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:finalize() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:foo completion:foo() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:getClass completion:getClass() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:hashCode completion:hashCode() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:notify completion:notify() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:notifyAll completion:notifyAll() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:toString completion:toString() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:zzyy completion:zzyy position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResultsWithPosition());
>+	}
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=100808
>+public void testCompletionEmptyToken2() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/testCompletionEmptyToken2/Test.java",
>+ "package testCompletionEmptyToken2.");
> 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true);
> 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "bar";
>+ String completeBehind = "testCompletionEmptyToken2.";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+ int start = str.lastIndexOf(completeBehind);
>+ int end = start + completeBehind.length();
>+ 
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
> 	assertResults(
>-		"bar[FIELD_REF]{CompletionSameSuperClass.this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
>-		"bar[FIELD_REF]{this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
>-		"bar[METHOD_REF]{CompletionSameSuperClass.this.bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
>-		"bar[LOCAL_VARIABLE_REF]{bar, null, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-		"bar[METHOD_REF]{bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-		requestor.getResults());
>+ "testCompletionEmptyToken2[PACKAGE_REF]{testCompletionEmptyToken2, testCompletionEmptyToken2, null, null, null, ["+start+", "+end+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
> 
>-public void testCompletionSuperType() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType.java",
>-	 "public class CompletionSuperType extends CompletionSuperClass.");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuperClass.";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25221
>+*/
>+public void testCompletionEmptyTypeName1() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionEmptyTypeName1.java",
>+ "public class CompletionEmptyTypeName1 {\n"+
>+ "	void foo() {\n"+
>+ "		A a = new \n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "new ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
> 		assertResults(
>-			"CompletionSuperClass.Inner[TYPE_REF]{Inner, , LCompletionSuperClass$Inner;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS+ R_NON_RESTRICTED)+"}",
>+			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
>+	} else {
>+		assertResults(
>+			"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+
>+			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
> 	}
> }
> 
>-public void testCompletionSuperType2() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	ICompilationUnit superClass2 = null;
>-	ICompilationUnit superInterface = null;
>-	ICompilationUnit superInterface2 = null;
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25221
>+*/
>+public void testCompletionEmptyTypeName2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyTypeName2.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = " = ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertEquals(
>+			"element:a completion:a relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+	} else {
>+		assertEquals(
>+			"element:A completion:A relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:CompletionEmptyTypeName2 completion:CompletionEmptyTypeName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:a completion:a relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+	}
>+}
>+
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=41643
>+*/
>+public void testCompletionEmptyTypeName3() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyTypeName3.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = " = ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertEquals(
>+			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:x completion:x relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+	} else {
>+		assertEquals(
>+			"element:CompletionEmptyTypeName2 completion:CompletionEmptyTypeName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:CompletionEmptyTypeName3 completion:CompletionEmptyTypeName3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:CompletionEmptyTypeName3.CompletionEmptyTypeName3_1 completion:CompletionEmptyTypeName3_1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:CompletionEmptyTypeName3_2 completion:CompletionEmptyTypeName3_2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:x completion:x relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+	}
>+}
>+
>+/**
>+ * Complete at end of file.
>+ */
>+public void testCompletionEndOfCompilationUnit() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu = getCompilationUnit("Completion", "src", "", "CompletionEndOfCompilationUnit.java");
>+	cu.codeComplete(cu.getSourceRange().getOffset() + cu.getSourceRange().getLength(), requestor);
>+	assertEquals(
>+		"should have two methods of 'foo'", 
>+		"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
>+		requestor.getResults());	
>+}
>+/*
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=66570
>+ */
>+public void testCompletionExactNameCaseInsensitive() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionExactNameCaseInsensitive.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "(compleTionexactnamecaseInsensitive";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+			"element:CompletionExactNameCaseInsensitive completion:CompletionExactNameCaseInsensitive relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
>+			"element:CompletionExactNameCaseInsensitivePlus completion:CompletionExactNameCaseInsensitivePlus relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25820
>+*/
>+public void testCompletionExpectedTypeIsNotValid() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionExpectedTypeIsNotValid.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "new U";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"",
>+		requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
>+public void testCompletionExpectedTypeOnEmptyToken1() throws JavaModelException {
>+	ICompilationUnit aType = null;
> 	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		superClass2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass2.java",
>-	 "public class CompletionSuperClass2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
> 		
>-		superInterface = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface.java",
>-	 "public interface CompletionSuperInterface{\n" +
>-	 "	public int eqFoo(int a,Object b);\n" +
>+		aType = getWorkingCopy(
>+	 "/Completion/src/test/AType.java",
>+	 "package test;\n" +
>+	 "public class AType{\n"+
> 	 "}");
> 		
>-		superInterface2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface2.java",
>-	 "public interface CompletionSuperInterface2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/Test.java",
>+	 "package test;\n" +
>+	 "public class Test{\n"+
>+	 " void foo() {\n"+
>+	 " AType a = new \n"+
>+	 " }\n"+
> 	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType2.java",
>-	 "public class CompletionSuperType2 extends CompletionSuper");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuper";
>+	 String completeBehind = "AType a = new ";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-		assertResults(
>-			"CompletionSuperClass[TYPE_REF]{CompletionSuperClass, , LCompletionSuperClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>-			"CompletionSuperClass2[TYPE_REF]{CompletionSuperClass2, , LCompletionSuperClass2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	 assertResults(
>+	 "expectedTypesSignatures={Ltest.AType;}\n"+
>+	 "expectedTypesKeys={Ltest/AType;}",
>+	 requestor.getContext());
>+	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+			assertResults(
>+		 "AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+		 requestor.getResults());
>+	 } else {
>+	 	assertResults(
>+		 "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+		 requestor.getResults());
>+	 }
> 	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-		if(superClass2 != null) {
>-			superClass2.discardWorkingCopy();
>-		}
>-		if(superInterface != null) {
>-			superInterface.discardWorkingCopy();
>-		}
>-		if(superInterface2 != null) {
>-			superInterface2.discardWorkingCopy();
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
> 		}
> 	}
> }
> 
>-public void testCompletionSuperType3() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	ICompilationUnit superClass2 = null;
>-	ICompilationUnit superInterface = null;
>-	ICompilationUnit superInterface2 = null;
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
>+public void testCompletionExpectedTypeOnEmptyToken3() throws JavaModelException {
>+	ICompilationUnit aType = null;
> 	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		superClass2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass2.java",
>-	 "public class CompletionSuperClass2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
>-		
>-		superInterface = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface.java",
>-	 "public interface CompletionSuperInterface{\n" +
>-	 "	public int eqFoo(int a,Object b);\n" +
>+		aType = getWorkingCopy(
>+	 "/Completion/src/test/AType.java",
>+	 "package test;\n" +
>+	 "public class AType{\n"+
> 	 "}");
> 		
>-		superInterface2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface2.java",
>-	 "public interface CompletionSuperInterface2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/Test.java",
>+	 "package test;\n" +
>+	 "public class Test{\n"+
>+	 " void foo() {\n"+
>+	 " AType a = \n"+
>+	 " }\n"+
> 	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType3.java",
>-	 "public class CompletionSuperType3 implements CompletionSuper");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuper";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-			"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>-			"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-		if(superClass2 != null) {
>-			superClass2.discardWorkingCopy();
>-		}
>-		if(superInterface != null) {
>-			superInterface.discardWorkingCopy();
>-		}
>-		if(superInterface2 != null) {
>-			superInterface2.discardWorkingCopy();
>-		}
>-	}
>-}
>-
>-public void testCompletionSuperType4() throws JavaModelException {
>-	ICompilationUnit superClass2 = null;
>-	try {
>-		superClass2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass2.java",
>-	 "public class CompletionSuperClass2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType4.java",
>-	 "public class CompletionSuperType4 extends CompletionSuperClass2.Inner");
>-	 
>+	 requestor.setIgnored(CompletionProposal.METHOD_REF, true);
>+	 requestor.setIgnored(CompletionProposal.FIELD_REF, true);
>+	 requestor.setIgnored(CompletionProposal.LOCAL_VARIABLE_REF, true);
> 	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuperClass2.Inner";
>+	 String completeBehind = "AType a = ";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-		assertResults(
>-			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+ "}\n"+
>-			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	 assertResults(
>+	 "expectedTypesSignatures={Ltest.AType;}\n"+
>+	 "expectedTypesKeys={Ltest/AType;}",
>+	 requestor.getContext());
>+	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+			assertResults(
>+		 "",
>+		 requestor.getResults());
>+	 } else {
>+	 	assertResults(
>+		 "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+		 requestor.getResults());
>+	 }
> 	} finally {
>-		if(superClass2 != null) {
>-			superClass2.discardWorkingCopy();
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
> 		}
> 	}
> }
> 
>-public void testCompletionSuperType5() throws JavaModelException {
>-	ICompilationUnit superInterface2 = null;
>-	try {
>-		superInterface2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface2.java",
>-	 "public interface CompletionSuperInterface2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType5.java",
>-	 "public class CompletionSuperType5 implements CompletionSuperInterface2.Inner");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuperInterface2.Inner";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>-			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superInterface2 != null) {
>-			superInterface2.discardWorkingCopy();
>-		}
>-	}
>-}
> 
>-public void testCompletionSuperType6() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	ICompilationUnit superClass2 = null;
>-	ICompilationUnit superInterface = null;
>-	ICompilationUnit superInterface2 = null;
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
>+public void testCompletionExpectedTypeOnEmptyToken4() throws JavaModelException {
>+	ICompilationUnit aType = null;
> 	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass.java",
>-	 "public class CompletionSuperClass{\n" +
>-	 "	public class Inner {}\n" +
>-	 "	public int eqFoo(int a,Object b){\n" +
>-	 "		return 1;\n" +
>-	 "	}\n" +
>-	 "}");
>-		
>-		superClass2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass2.java",
>-	 "public class CompletionSuperClass2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
>-		
>-		superInterface = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface.java",
>-	 "public interface CompletionSuperInterface{\n" +
>-	 "	public int eqFoo(int a,Object b);\n" +
>+		aType = getWorkingCopy(
>+	 "/Completion/src/test/AInterface.java",
>+	 "package test;\n" +
>+	 "public interface AInterface{\n"+
> 	 "}");
> 		
>-		superInterface2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface2.java",
>-	 "public interface CompletionSuperInterface2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>+	 this.wc = getWorkingCopy(
>+	 "/Completion/src/test/Test.java",
>+	 "package test;\n" +
>+	 "public class Test{\n"+
>+	 " void foo() {\n"+
>+	 " AInterface a = new \n"+
>+	 " }\n"+
> 	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType6.java",
>-	 "public interface CompletionSuperType6 extends CompletionSuper");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuper";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE + R_NON_RESTRICTED)+"}\n" +
>-				"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-		if(superClass2 != null) {
>-			superClass2.discardWorkingCopy();
>-		}
>-		if(superInterface != null) {
>-			superInterface.discardWorkingCopy();
>-		}
>-		if(superInterface2 != null) {
>-			superInterface2.discardWorkingCopy();
>-		}
>-	}
>-}
>-
>-public void testCompletionSuperType7() throws JavaModelException {
>-	ICompilationUnit superClass2 = null;
>-	try {
>-		superClass2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperClass2.java",
>-	 "public class CompletionSuperClass2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType7.java",
>-	 "public interface CompletionSuperType7 extends CompletionSuperClass2.Inner");
> 	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuperClass2.Inner";
>+	 String completeBehind = "AInterface a = new ";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-		assertResults(
>-			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>-			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	 assertResults(
>+	 "expectedTypesSignatures={Ltest.AInterface;}\n"+
>+	 "expectedTypesKeys={Ltest/AInterface;}",
>+	 requestor.getContext());
>+	 
>+	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+			assertResults(
>+		 "AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+		 requestor.getResults());
>+	 } else {
>+	 	assertResults(
>+		 "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+					"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+		 requestor.getResults());
>+	 }
> 	} finally {
>-		if(superClass2 != null) {
>-			superClass2.discardWorkingCopy();
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
> 		}
> 	}
> }
> 
>-public void testCompletionSuperType8() throws JavaModelException {
>-	ICompilationUnit superInterface2 = null;
>-	try {
>-		superInterface2 = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface2.java",
>-	 "public interface CompletionSuperInterface2 {\n" +
>-	 "	public class InnerClass {}\n" +
>-	 "	public interface InnerInterface {}\n" +
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperType8.java",
>-	 "public interface CompletionSuperType8 extends CompletionSuperInterface2.Inner");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "CompletionSuperInterface2.Inner";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>-			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superInterface2 != null) {
>-			superInterface2.discardWorkingCopy();
>-		}
>-	}
>-}
> 
>-public void testCompletionMethodThrowsClause() throws JavaModelException {
>+public void testCompletionFieldInitializer1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodThrowsClause.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Ex";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionMethodThrowsClause2() throws JavaModelException {
>+
>+public void testCompletionFieldInitializer2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodThrowsClause2.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Ex";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_NON_RESTRICTED),
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionThrowStatement() throws JavaModelException {
>+
>+public void testCompletionFieldInitializer3() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionThrowStatement.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer3.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Ex";
>+	String completeBehind = "Objec";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionUnresolvedReturnType() throws JavaModelException {
>+
>+public void testCompletionFieldInitializer4() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedReturnType.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer4.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "Objec";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:barPlus completion:barPlus() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionUnresolvedParameterType() throws JavaModelException {
>+
>+public void testCompletionFieldName() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedParameterType.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldName.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "bar";
>+	String completeBehind = "ClassWithComplexName ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:barPlus completion:barPlus() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		"should have two completions",
>+		"element:classWithComplexName completion:classWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:complexName2 completion:complexName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:withComplexName completion:withComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionUnresolvedFieldType() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedFieldType.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "bar";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"element:barPlus completion:barPlus() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-/*
>- * bug : http://dev.eclipse.org/bugs/show_bug.cgi?id=24440
>+/**
>+ * Complete the type "A" from "new A".
> */
>-public void testCompletionUnresolvedEnclosingType() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedEnclosingType.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "new ZZZ(";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+public void testCompletionFindClass() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindClass.java",
>+ "public class CompletionFindClass {\n" +
>+ "	private A[] a;\n" +
>+ "	public CompletionFindClass () {\n" +
>+ "		this.a = new A\n" +
>+ "	}\n" +
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "A";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertTrue(
>-		requestor.getResults().length() == 0);
>+ assertResults(
>+ 		"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+ 		"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+			"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+			"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+ requestor.getResults());
> }
>-public void testCompletionReturnStatementIsParent1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionReturnStatementIsParent1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"element:zz00 completion:zz00 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz00M completion:zz00M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz01 completion:zz01 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz01M completion:zz01M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz02 completion:zz02 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz02M completion:zz02M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz10 completion:zz10 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz10M completion:zz10M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz11 completion:zz11 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz11M completion:zz11M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz12 completion:zz12 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz12M completion:zz12M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz20 completion:zz20 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz20M completion:zz20M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz21 completion:zz21 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz21M completion:zz21M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz22 completion:zz22 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz22M completion:zz22M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzOb completion:zzOb relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzObM completion:zzObM() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
> 
>-public void testCompletionReturnStatementIsParent2() throws JavaModelException {
>+/**
>+ * The same type must be find only once
>+ */
>+public void testCompletionFindClass2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionReturnStatementIsParent2.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindClass2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "xx";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "PX";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:XX00 completion:XX00 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX01 completion:XX01 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX02 completion:XX02 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX10 completion:XX10 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX11 completion:XX11 relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX12 completion:XX12 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX20 completion:XX20 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX21 completion:XX21 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX22 completion:XX22 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"should have one classe", 
>+		"element:PX completion:pack1.PX relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_QUALIFIED + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionCastIsParent1() throws JavaModelException {
>+
>+/**
>+ * Complete the type "Default" in the default package example.
>+ */
>+public void testCompletionFindClassDefaultPackage() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCastIsParent1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionDefaultPackage.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "Def";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:zz00 completion:zz00 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz00M completion:zz00M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz01 completion:zz01 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz01M completion:zz01M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz02 completion:zz02 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz02M completion:zz02M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz10 completion:zz10 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz10M completion:zz10M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz11 completion:zz11 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz11M completion:zz11M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz12 completion:zz12 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz12M completion:zz12M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz20 completion:zz20 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz20M completion:zz20M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz21 completion:zz21 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz21M completion:zz21M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz22 completion:zz22 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zz22M completion:zz22M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzOb completion:zzOb relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzObM completion:zzObM() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+		"should have one class", 
>+		"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+		requestor.getResults());	
> }
> 
>-public void testCompletionCastIsParent2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCastIsParent2.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "xx";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+/**
>+ * Complete the constructor "CompletionFindConstructor" from "new CompletionFindConstructor(".
>+ */
>+public void testCompletionFindConstructor() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindConstructor.java",
>+ "public class CompletionFindConstructor {\n"+
>+ "	public CompletionFindConstructor (int i) {\n"+
>+ "	}\n"+
>+ "	publuc void foo(){\n"+
>+ "		int x = 45;\n"+
>+ "		new CompletionFindConstructor(i);\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "CompletionFindConstructor(";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:XX00 completion:XX00 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX01 completion:XX01 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX02 completion:XX02 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX10 completion:XX10 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX11 completion:XX11 relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX12 completion:XX12 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX20 completion:XX20 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX21 completion:XX21 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:XX22 completion:XX22 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+ assertResults(
>+			"CompletionFindConstructor[ANONYMOUS_CLASS_DECLARATION]{, LCompletionFindConstructor;, (I)V, null, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+			"CompletionFindConstructor[METHOD_REF<CONSTRUCTOR>]{, LCompletionFindConstructor;, (I)V, CompletionFindConstructor, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMessageSendIsParent1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent1.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+/**
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>+ */
>+public void testCompletionFindConstructor2() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindConstructor2.java",
>+ "import zconstructors.*;\n"+
>+ "public class CompletionFindConstructor2 {\n"+
>+ "	Constructor2 c = new Constructor2();\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "Constructor2(";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+ assertEquals(
>+			"Constructor2[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor2;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"Constructor2[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor2;, ()V, Constructor2, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMessageSendIsParent2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent2.java");
>+/**
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>+ */
>+public void testCompletionFindConstructor3() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindConstructor3.java",
>+ "import zconstructors.*;\n"+
>+ "public class CompletionFindConstructor3 {\n"+
>+ "	Constructor3 c = new Constructor3();\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "Constructor3(";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+ assertEquals(
>+			"Constructor3[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor3;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"Constructor3[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor3;, ()V, Constructor3, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+
>+/**
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>+ */
>+public void testCompletionFindConstructor4() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindConstructor4.java",
>+ "import zconstructors.*;\n"+
>+ "public class CompletionFindConstructor4 {\n"+
>+ "	Constructor4 c = new Constructor4();\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "Constructor4(";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+			"Constructor4[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor4;, (I)V, null, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"Constructor4[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor4;, (I)V, Constructor4, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionMessageSendIsParent3() throws JavaModelException {
>+/**
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78801
>+ */
>+public void testCompletionFindConstructor5() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindConstructor5.java",
>+ "import zconstructors.*;\n"+
>+ "public class CompletionFindConstructor5 {\n"+
>+ "	Constructor5 c = new Constructor5();\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "Constructor5(";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+	assertEquals(
>+			"Constructor5[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor5;, (I)V, null, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"Constructor5[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor5;, (I)V, Constructor5, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+
>+/**
>+ * Complete the exception "Exception" in a catch clause.
>+ */
>+public void testCompletionFindExceptions1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent3.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindException1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "Ex";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
>+	
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"should have one class", 
>+		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionMessageSendIsParent4() throws JavaModelException {
>+/**
>+ * Complete the exception "Exception" in a throws clause.
>+ */
>+public void testCompletionFindExceptions2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent4.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindException2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "Ex";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"should have one class",
>+		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionMessageSendIsParent5() throws JavaModelException {
>+/**
>+ * Complete the field "var" from "va";
>+ */
>+public void testCompletionFindField1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent5.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "va";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
>+	
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+		"should have one field: 'var' and one variable: 'var'", 
>+		"element:var completion:this.var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n"+
>+		"element:var completion:var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+		requestor.getResults());	
> }
> 
>-public void testCompletionMessageSendIsParent6() throws JavaModelException {
>+/**
>+ * Complete the field "var" from "this.va";
>+ */
>+public void testCompletionFindField2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent6.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "va";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
>+	
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"should have 1 field of starting with 'va'",
>+		"element:var completion:var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionAllocationExpressionIsParent1() throws JavaModelException {
>+public void testCompletionFindField3() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindField3.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "b.ba";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"element:bar completion:bar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionAllocationExpressionIsParent2() throws JavaModelException {
>+/**
>+ * Complete the import, "import pac"
>+ */
>+public void testCompletionFindImport1() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAllocationExpressionIsParent2.java",
>- "public class CompletionAllocationExpressionIsParent2 {\n" +
>- "	public class Inner {\n" +
>- "		public Inner(long i, long j){super();}\n" +
>- "		public Inner(Object i, Object j){super();}\n" +
>- "		\n" +
>- "	}\n" +
>- "	\n" +
>- "	long zzlong;\n" +
>- "	int zzint;\n" +
>- "	double zzdouble;\n" +
>- "	boolean zzboolean;\n" +
>- "	Object zzObject;\n" +
>- "	\n" +
>- "	void foo() {\n" +
>- "		this.new Inner(1, zz\n" +
>- "	}\n" +
>+ "/Completion/src/CompletionFindImport1.java",
>+ "import pac\n"+
>+ "\n"+
>+ "public class CompletionFindImport1 {\n"+
>+ "\n"+
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "zz";
>+ String completeBehind = "pac";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>- assertResults(
>- "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent2;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent2;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent2;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent2;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent2;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>- requestor.getResults());
>+ 
>+	assertResults(
>+			"pack[PACKAGE_REF]{pack.*;, pack, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"pack1[PACKAGE_REF]{pack1.*;, pack1, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"pack2[PACKAGE_REF]{pack2.*;, pack2, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionAllocationExpressionIsParent3() throws JavaModelException {
>+public void testCompletionFindImport2() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAllocationExpressionIsParent3.java",
>- "public class CompletionAllocationExpressionIsParent3 {\n" +
>- "	public class Inner {\n" +
>- "		public Inner(long i, long j){super();}\n" +
>- "		public Inner(Object i, Object j){super();}\n" +
>- "		\n" +
>- "	}\n" +
>- "	\n" +
>- "	long zzlong;\n" +
>- "	int zzint;\n" +
>- "	double zzdouble;\n" +
>- "	boolean zzboolean;\n" +
>- "	Object zzObject;\n" +
>- "	\n" +
>- "	void foo() {\n" +
>- "		new CompletionAllocationExpressionIsParent3().new Inner(1, zz\n" +
>- "	}\n" +
>+ "/Completion/src/CompletionFindImport2.java",
>+ "import pack1.P\n"+
>+ "\n"+
>+ "public class CompletionFindImport2 {\n"+
>+ "\n"+
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "zz";
>+ String completeBehind = "pack1.P";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>- assertResults(
>- "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent3;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent3;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent3;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent3;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent3;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>- requestor.getResults());
>+ 
>+	assertResults(
>+			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
>+			"PX[TYPE_REF]{pack1.PX;, pack1, Lpack1.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionAllocationExpressionIsParent4() throws JavaModelException {
>+/**
>+ * Complete the local variable "var";
>+ */
>+public void testCompletionFindLocalVariable() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent4.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindLocalVariable.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "va";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+		"should have one local variable of 'var'", 
>+		"element:var completion:var relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+		requestor.getResults());	
> }
> 
>-public void testCompletionAllocationExpressionIsParent5() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAllocationExpressionIsParent5.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+public void testCompletionFindMemberType1() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindMemberType1.java",
>+ "interface A1 {\n"+
>+ "	class Inner1 {\n"+
>+ "	}\n"+
>+ "}\n"+
>+ "interface B1 extends A1 {\n"+
>+ "	class Inner1 {\n"+
>+ "	}\n"+
>+ "}\n"+
>+ "public class CompletionFindMemberType1 {\n"+
>+ "	public void foo() {\n"+
>+ "		B1.Inner\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "Inner";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+	assertResults(
>+		"B1.Inner1[TYPE_REF]{Inner1, , LB1$Inner1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) +"}",
> 		requestor.getResults());
> }
> 
>-public void testCompletionAllocationExpressionIsParent6() throws JavaModelException {
>+public void testCompletionFindMemberType2() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAllocationExpressionIsParent6.java",
>- "public class CompletionAllocationExpressionIsParent6 {\n" +
>- "	\n" +
>- "	long zzlong;\n" +
>- "	int zzint;\n" +
>- "	double zzdouble;\n" +
>- "	boolean zzboolean;\n" +
>- "	Object zzObject;\n" +
>- "	\n" +
>- "	void foo() {\n" +
>- "		new CompletionAllocation_ERROR_ExpressionIsParent6Plus().new Inner(1, zz\n" +
>- "	}\n" +
>- "}\n" +
>- "class CompletionAllocationExpressionIsParent6Plus {\n" +
>- "	public class Inner {\n" +
>- "		public Inner(long i, long j){\n" +
>- "			\n" +
>- "		}	\n" +
>- "	}	\n" +
>+ "/Completion/src/CompletionPrefixMethodName2.java",
>+ "interface A2 {\n"+
>+ "	class ZInner2{\n"+
>+ "	}\n"+
>+ "}\n"+
>+ "interface B2 extends A2 {\n"+
>+ "	class ZInner2 {\n"+
>+ "	}\n"+
>+ "}\n"+
>+ "public class CompletionFindMemberType2 implements B2{\n"+
>+ "	public void foo() {\n"+
>+ "		ZInner\n"+
>+ "	}\n"+
> "}");
> 
>- 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "zz";
>+ String completeBehind = "ZInner";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>- "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent6;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent6;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent6;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent6;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>- "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent6;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>- requestor.getResults());
>+	assertResults(
>+		"B2.ZInner2[TYPE_REF]{ZInner2, , LB2$ZInner2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
> }
> 
>-public void testCompletionFieldInitializer1() throws JavaModelException {
>+/**
>+ * Complete the method call "a.foobar" from "a.fooba";
>+ */
>+public void testCompletionFindMethod1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethod1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "fooba";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+		"should have two methods of 'foobar'", 
>+		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>+		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
>+		requestor.getResults());		
> }
>-
>-public void testCompletionFieldInitializer2() throws JavaModelException {
>+/**
>+ * Too much Completion match on interface
>+ */
>+public void testCompletionFindMethod2() throws JavaModelException {
>+	
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer2.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethod2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "fooba";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+		"should have two completions", 
>+		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>+		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
>+		requestor.getResults());	
> }
>-
>-public void testCompletionFieldInitializer3() throws JavaModelException {
>+/**
>+ * Complete the method call "foobar" from "fooba";
>+ */
>+public void testCompletionFindMethodInThis() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer3.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethodInThis.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+	String completeBehind = "fooba";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
> 	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+		"should have one method of 'foobar'", 
>+		"element:foobar completion:foobar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+		requestor.getResults());		
> }
> 
>-public void testCompletionFieldInitializer4() throws JavaModelException {
>+/**
>+ * Complete the method call "foobar" from "fooba". The compilation
>+ * unit simulates typing in process; ie it has incomplete structure/syntax errors.
>+ */
>+public void testCompletionFindMethodWhenInProcess() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFieldInitializer4.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindMethodInProcess.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+	String completeBehind = "fooba";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
> 	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"should have a method of 'foobar'", 
>+		"element:foobar completion:foobar() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 		requestor.getResults());
>+	cu.close();
> }
>-public void testCompletionVariableInitializerInInitializer1() throws JavaModelException {
>+
>+public void testCompletionFindSecondaryType1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindSecondaryType1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zz";
>+	String completeBehind = "/**/Secondary";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"element:SecondaryType1 completion:SecondaryType1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:SecondaryType2 completion:SecondaryType2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionVariableInitializerInInitializer2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+public void testCompletionFindSuperInterface() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionFindSuperInterface.java",
>+ "public class CompletionFindSuperInterface implements SuperInterface {\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "Super";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ "SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionVariableInitializerInInitializer3() throws JavaModelException {
>+/**
>+ * Complete the field "bar" from "this.ba"
>+ */
>+public void testCompletionFindThisDotField() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer3.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindThisDotField.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+	String completeBehind = "this.ba";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
>-
> 	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"should have one result of 'bar'", 
>+		"element:bar completion:bar relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
> 		requestor.getResults());
> }
> 
>-public void testCompletionVariableInitializerInInitializer4() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer4.java");
>+public void testCompletionImportedType1() throws JavaModelException {
>+ this.workingCopies = new ICompilationUnit[2];
>+ this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/imported/ZZZZ.java",
>+		"package test.imported;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+		
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/CompletionImportedType1.java",
>+			"package test;"+
>+			"public class CompletionImportedType1 {"+
>+			" ZZZ\n"+
>+			"}");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[1].getSource();
>+	String completeBehind = "ZZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.workingCopies[1].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType1;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported.ZZZZ, test.imported, Ltest.imported.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-public void testCompletionVariableInitializerInMethod1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod1.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>+public void testCompletionImportedType2() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/imported1/ZZZZ.java",
>+		"package test.imported1;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/imported2/ZZZZ.java",
>+		"package test.imported2;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	this.workingCopies[2] = getWorkingCopy(
>+		"/Completion/src/test/imported3/ZZZZ.java",
>+		"package test.imported3;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+		"/Completion/src/test/CompletionImportedType2.java",
>+		"package test;"+
>+		"import test.imported1.*;"+
>+		"import test.imported2.*;"+
>+		"import test.imported3.*;"+
>+		"public class CompletionImportedType2 {"+
>+		" ZZZ\n"+
>+		"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[3].getSource();
>+	String completeBehind = "ZZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType2;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionVariableInitializerInMethod2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>+public void testCompletionImportedType3() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[4];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/imported1/ZZZZ.java",
>+		"package test.imported1;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/imported2/ZZZZ.java",
>+		"package test.imported2;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	this.workingCopies[2] = getWorkingCopy(
>+		"/Completion/src/test/imported3/ZZZZ.java",
>+		"package test.imported3;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	
>+	this.workingCopies[3] = getWorkingCopy(
>+		"/Completion/src/test/CompletionImportedType3.java",
>+		"package test;"+
>+		"import test.imported2.*;"+
>+		"public class CompletionImportedType3 {"+
>+		" ZZZ\n"+
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[3].getSource();
>+	String completeBehind = "ZZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType3;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionVariableInitializerInMethod3() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod3.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+public void testCompletionImportedType4() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[3];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/imported1/ZZZZ.java",
>+		"package test.imported1;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/imported2/ZZZZ.java",
>+		"package test.imported2;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+		
>+	this.workingCopies[2] = getWorkingCopy(
>+		"/Completion/src/test/CompletionImportedType4.java",
>+		"package test;"+
>+		"import test.imported1.*;"+
>+		"public class CompletionImportedType4 {"+
>+		" ZZZ\n"+
>+		"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[2].getSource();
>+	String completeBehind = "ZZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType4;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionVariableInitializerInMethod4() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod4.java");
>+public void testCompletionImportedType5() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[3];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/imported1/ZZZZ.java",
>+		"package test.imported1;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/imported2/ZZZZ.java",
>+		"package test.imported2;"+
>+		"public class ZZZZ {\n"+
>+		" \n"+
>+		"}");
>+		
>+	this.workingCopies[2] = getWorkingCopy(
>+		"/Completion/src/test/CompletionImportedType5.java",
>+		"package test;"+
>+		"import test.imported2.*;"+
>+		"public class CompletionImportedType5 {"+
>+		" ZZZ\n"+
>+		"}");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[2].getSource();
>+	String completeBehind = "ZZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType5;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-public void testCompletionAssignmentInMethod1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod1.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends1() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends1.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends1 extends {\n" +
>+			" public class CompletionInsideExtends1Inner {}\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends1TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertResults(
>+				"",
>+				requestor.getResults());
>+	} else {
>+		assertResults(
>+				"CompletionInsideExtends1TopLevel[TYPE_REF]{CompletionInsideExtends1TopLevel, test, Ltest.CompletionInsideExtends1TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	}
>+	
> }
> 
>-public void testCompletionAssignmentInMethod2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends10() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends10.java",
>+			"package test;\n" +
>+			"public interface CompletionInsideExtends10 {\n" +
>+			" public interface CompletionInsideExtends10Inner extends CompletionInsideExtends{\n" +
>+			" public interface CompletionInsideExtends10InnerInner {\n" +
>+			" }\n" +
>+			" }\n" +
>+			"}\n" +
>+			"interface CompletionInsideExtends10TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends CompletionInsideExtends";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"CompletionInsideExtends10.CompletionInsideExtends10Inner.CompletionInsideExtends10InnerInner[TYPE_REF]{test.CompletionInsideExtends10.CompletionInsideExtends10Inner.CompletionInsideExtends10InnerInner, test, Ltest.CompletionInsideExtends10$CompletionInsideExtends10Inner$CompletionInsideExtends10InnerInner;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionInsideExtends10[TYPE_REF]{CompletionInsideExtends10, test, Ltest.CompletionInsideExtends10;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionInsideExtends10TopLevel[TYPE_REF]{CompletionInsideExtends10TopLevel, test, Ltest.CompletionInsideExtends10TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> 
>-public void testCompletionAssignmentInMethod3() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod3.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends11() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends11.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends11 implements {\n" +
>+			" public class CompletionInsideExtends11Inner {\n" +
>+			" }\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends11TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "implements ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertResults(
>+				"",
>+				requestor.getResults());
>+	} else {
>+		assertResults(
>+				"",
>+				requestor.getResults());
>+	}
> }
> 
>-public void testCompletionAssignmentInMethod4() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAssignmentInMethod4.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "Objec";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends12() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends12.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends12 implements CompletionInsideExtends {\n" +
>+			" public class CompletionInsideExtends12Inner {\n" +
>+			" }\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends12TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "implements CompletionInsideExtends";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"",
>+			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=24565
>-*/
>-public void testCompletionObjectsMethodWithInterfaceReceiver() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionObjectsMethodWithInterfaceReceiver.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "hash";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends2() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends2.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends2 extends CompletionInsideExtends {\n" +
>+			" public class CompletionInsideExtends2Inner {}\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends2TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends CompletionInsideExtends";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"CompletionInsideExtends2TopLevel[TYPE_REF]{CompletionInsideExtends2TopLevel, test, Ltest.CompletionInsideExtends2TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=24939
>-*/
>-public void testCompletionConstructorForAnonymousType() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConstructorForAnonymousType.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "TypeWithConstructor(";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertEquals(
>-		"element:TypeWithConstructor completion: relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25221
>-*/
>-public void testCompletionEmptyTypeName1() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends3() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionEmptyTypeName1.java",
>- "public class CompletionEmptyTypeName1 {\n"+
>- "	void foo() {\n"+
>- "		A a = new \n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "new ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+			"/Completion/src/test/CompletionInsideExtends3.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends3 {\n" +
>+			" public class CompletionInsideExtends3Inner extends {\n" +
>+			" public class CompletionInsideExtends3InnerInner {\n" +
>+			" }\n" +
>+			" }\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends3TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
> 		assertResults(
>-			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+				"",
>+				requestor.getResults());
> 	} else {
> 		assertResults(
>-			"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+
>-			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+				"CompletionInsideExtends3[TYPE_REF]{CompletionInsideExtends3, test, Ltest.CompletionInsideExtends3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionInsideExtends3TopLevel[TYPE_REF]{CompletionInsideExtends3TopLevel, test, Ltest.CompletionInsideExtends3TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
> 	}
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25221
>-*/
>-public void testCompletionEmptyTypeName2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyTypeName2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = " = ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertEquals(
>-			"element:a completion:a relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-	} else {
>-		assertEquals(
>-			"element:A completion:A relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:CompletionEmptyTypeName2 completion:CompletionEmptyTypeName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:a completion:a relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends4() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends4.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends4 {\n" +
>+			" public class CompletionInsideExtends4Inner extends CompletionInsideExtends{\n" +
>+			" public class CompletionInsideExtends4InnerInner {\n" +
>+			" }\n" +
>+			" }\n" +
>+			"\n}" +
>+			"class CompletionInsideExtends4TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends CompletionInsideExtends";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"CompletionInsideExtends4[TYPE_REF]{CompletionInsideExtends4, test, Ltest.CompletionInsideExtends4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionInsideExtends4TopLevel[TYPE_REF]{CompletionInsideExtends4TopLevel, test, Ltest.CompletionInsideExtends4TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
>-	}
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=41643
>-*/
>-public void testCompletionEmptyTypeName3() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyTypeName3.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = " = ";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends5() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends5.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends5 {\n" +
>+			" void foo() {\n" +
>+			" public class CompletionInsideExtends5Inner extends {\n" +
>+			" public class CompletionInsideExtends5InnerInner {\n" +
>+			" }\n" +
>+			" }\n" +
>+			" }\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends5TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertEquals(
>-			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:x completion:x relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-	} else {
>-		assertEquals(
>-			"element:CompletionEmptyTypeName2 completion:CompletionEmptyTypeName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:CompletionEmptyTypeName3 completion:CompletionEmptyTypeName3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:CompletionEmptyTypeName3.CompletionEmptyTypeName3_1 completion:CompletionEmptyTypeName3_1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:CompletionEmptyTypeName3_2 completion:CompletionEmptyTypeName3_2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:getClass completion:getClass() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notify completion:notify() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:notifyAll completion:notifyAll() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:toString completion:toString() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:wait completion:wait() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:x completion:x relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-	}
>-}
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25578
>-*/
>-public void testCompletionAbstractMethodRelevance1() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionAbstractSuperClass.java",
>-	 "public abstract class CompletionAbstractSuperClass {\n"+
>-	 "	public void foo1(){}\n"+
>-	 "	public abstract void foo2();\n"+
>-	 "	public void foo3(){}\n"+
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionAbstractMethodRelevance1.java",
>-	 "public class CompletionAbstractMethodRelevance1 extends CompletionAbstractSuperClass {\n"+
>-	 "	foo\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
> 		assertResults(
>-			"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionAbstractMethodRelevance1;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-			"foo1[METHOD_DECLARATION]{public void foo1(), LCompletionAbstractSuperClass;, ()V, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>-			"foo3[METHOD_DECLARATION]{public void foo3(), LCompletionAbstractSuperClass;, ()V, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>-			"foo2[METHOD_DECLARATION]{public void foo2(), LCompletionAbstractSuperClass;, ()V, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>-	}
>-}
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25578
>-*/
>-public void testCompletionAbstractMethodRelevance2() throws JavaModelException {
>-	ICompilationUnit superClass = null;
>-	try {
>-		superClass = getWorkingCopy(
>-	 "/Completion/src/CompletionSuperInterface.java",
>-	 "public interface CompletionSuperInterface{\n"+
>-	 "	public int eqFoo(int a,Object b);\n"+
>-	 "}");
>-		
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionAbstractMethodRelevance2.java",
>-	 "public class CompletionAbstractMethodRelevance2 implements CompletionSuperInterface {\n"+
>-	 "	eq\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "eq";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>+				"",
>+				requestor.getResults());
>+	} else {
> 		assertResults(
>-			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionAbstractMethodRelevance2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>-			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>-			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	} finally {
>-		if(superClass != null) {
>-			superClass.discardWorkingCopy();
>-		}
>+				"CompletionInsideExtends5[TYPE_REF]{CompletionInsideExtends5, test, Ltest.CompletionInsideExtends5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionInsideExtends5TopLevel[TYPE_REF]{CompletionInsideExtends5TopLevel, test, Ltest.CompletionInsideExtends5TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
> 	}
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25591
>-*/
>-public void testCompletionReturnInInitializer() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionReturnInInitializer.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "eq";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends6() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends6.java",
>+			"package test;\n" +
>+			"public class CompletionInsideExtends6 {\n" +
>+			" void foo() {\n" +
>+			" public class CompletionInsideExtends6Inner extends CompletionInsideExtends {\n" +
>+			" public class CompletionInsideExtends6InnerInner {\n" +
>+			" }\n" +
>+			" }\n" +
>+			" }\n" +
>+			"}\n" +
>+			"class CompletionInsideExtends6TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends CompletionInsideExtends";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"CompletionInsideExtends6[TYPE_REF]{CompletionInsideExtends6, test, Ltest.CompletionInsideExtends6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionInsideExtends6TopLevel[TYPE_REF]{CompletionInsideExtends6TopLevel, test, Ltest.CompletionInsideExtends6TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25811
>-*/
>-public void testCompletionVariableName1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableName1.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "TEST_FOO_MyClass ";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends7() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends7.java",
>+			"package test;\n" +
>+			"public interface CompletionInsideExtends7 extends {\n" +
>+			" public interface CompletionInsideExtends7Inner {}\n" +
>+			"}\n" +
>+			"interface CompletionInsideExtends7TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:class1 completion:class1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:myClass completion:myClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertResults(
>+				"",
>+				requestor.getResults());
>+	} else {
>+		assertResults(
>+				"CompletionInsideExtends7TopLevel[TYPE_REF]{CompletionInsideExtends7TopLevel, test, Ltest.CompletionInsideExtends7TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	}
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25811
>-*/
>-public void testCompletionVariableName2() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableName2.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "Test_Bar_MyClass ";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends8() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends8.java",
>+			"package test;\n" +
>+			"public interface CompletionInsideExtends8 extends CompletionInsideExtends {\n" +
>+			" public interface CompletionInsideExtends8Inner {}\n" +
>+			"}\n" +
>+			"interface CompletionInsideExtends8TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends CompletionInsideExtends";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"element:bar_MyClass completion:bar_MyClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:class1 completion:class1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:myClass completion:myClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-		"element:test_Bar_MyClass completion:test_Bar_MyClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+	assertResults(
>+			"CompletionInsideExtends8TopLevel[TYPE_REF]{CompletionInsideExtends8TopLevel, test, Ltest.CompletionInsideExtends8TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25820
>-*/
>-public void testCompletionExpectedTypeIsNotValid() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionExpectedTypeIsNotValid.java");
> 
>-	String str = cu.getSource();
>-	String completeBehind = "new U";
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>+public void testCompletionInsideExtends9() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionInsideExtends9.java",
>+			"package test;\n" +
>+			"public interface CompletionInsideExtends9 {\n" +
>+			" public interface CompletionInsideExtends9Inner extends {\n" +
>+			" public interface CompletionInsideExtends9InnerInner {\n" +
>+			" }\n" +
>+			" }\n" +
>+			"}\n" +
>+			"interface CompletionInsideExtends9TopLevel {\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "extends ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertEquals(
>-		"",
>-		requestor.getResults());
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertResults(
>+				"",
>+				requestor.getResults());
>+	} else {
>+		assertResults(
>+				"CompletionInsideExtends9[TYPE_REF]{CompletionInsideExtends9, test, Ltest.CompletionInsideExtends9;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"CompletionInsideExtends9TopLevel[TYPE_REF]{CompletionInsideExtends9TopLevel, test, Ltest.CompletionInsideExtends9TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	}
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25815
>-*/
>-public void testCompletionMemberType() throws JavaModelException {
>+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=82740
>+public void testCompletionInsideGenericClass() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionMemberType.java",
>- "public class CompletionMemberType {\n"+
>- "	public class Y {\n"+
>- "		public void foo(){\n"+
>- "			Y var = new Y\n"+
>- "		}\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "new Y";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+			"/Completion/src/test/CompletionInsideGenericClass.java",
>+			"package test;\n" +
>+			"public class CompletionInsideGenericClass <CompletionInsideGenericClassParameter> {\n" +
>+			" CompletionInsideGenericClas\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "CompletionInsideGenericClas";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>-		"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>-		requestor.getResults());
>+	assertResults(
>+			"CompletionInsideGenericClas[POTENTIAL_METHOD_DECLARATION]{CompletionInsideGenericClas, Ltest.CompletionInsideGenericClass;, ()V, CompletionInsideGenericClas, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+			"CompletionInsideGenericClass[TYPE_REF]{CompletionInsideGenericClass, test, Ltest.CompletionInsideGenericClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25815
>-*/
>-public void testCompletionVoidMethod() throws JavaModelException {
>+
>+public void testCompletionInsideStaticMethod() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVoidMethod.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionInsideStaticMethod.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "foo";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "doT";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:foo1 completion:foo1() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-		"element:foo3 completion:foo3() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>+			"element:doTheThing completion:doTheThing() relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25890
>-*/
>-public void testCompletionOnStaticMember1() throws JavaModelException {
>+public void testCompletionInstanceofOperator1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionOnStaticMember1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionInstanceofOperator1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "x instanceof WWWCompletionInstanceof";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+			"element:WWWCompletionInstanceof1 completion:WWWCompletionInstanceof1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:WWWCompletionInstanceof2 completion:WWWCompletionInstanceof2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:WWWCompletionInstanceof3 completion:WWWCompletionInstanceof3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:WWWCompletionInstanceof4 completion:WWWCompletionInstanceof4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=25890
>-*/
>-public void testCompletionOnStaticMember2() throws JavaModelException {
>+
>+public void testCompletionKeywordAbstract1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionOnStaticMember2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "method";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:method1 completion:method1() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>-			"element:method2 completion:method2() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-/*
>-* http://dev.eclipse.org/bugs/show_bug.cgi?id=26677
>-*/
>-public void testCompletionQualifiedExpectedType() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionQualifiedExpectedType.java",
>- "import pack1.PX;\n"+
>- "\n"+
>- "public class CompletionQualifiedExpectedType {\n"+
>- "	void foo() {\n"+
>- "		pack2.PX var = new \n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "new ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>- 	assertResults(
>-	 "PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
>-				requestor.getResults());
>- } else {
>-	 assertResults(
>-	 "CompletionQualifiedExpectedType[TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>-				"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
>-				requestor.getResults());
>- }
>-}
>-public void testCompletionUnaryOperator1() throws JavaModelException {
>+public void testCompletionKeywordAbstract10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnaryOperator1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionUnaryOperator2() throws JavaModelException {
>+
>+public void testCompletionKeywordAbstract11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnaryOperator2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionBinaryOperator1() throws JavaModelException {
>+public void testCompletionKeywordAbstract12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionBinaryOperator2() throws JavaModelException {
>+
>+public void testCompletionKeywordAbstract13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionBinaryOperator3() throws JavaModelException {
>+
>+public void testCompletionKeywordAbstract14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBinaryOperator3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionInstanceofOperator1() throws JavaModelException {
>+
>+public void testCompletionKeywordAbstract15() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionInstanceofOperator1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract15.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "x instanceof WWWCompletionInstanceof";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:WWWCompletionInstanceof1 completion:WWWCompletionInstanceof1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:WWWCompletionInstanceof2 completion:WWWCompletionInstanceof2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:WWWCompletionInstanceof3 completion:WWWCompletionInstanceof3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:WWWCompletionInstanceof4 completion:WWWCompletionInstanceof4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionConditionalExpression1() throws JavaModelException {
>+public void testCompletionKeywordAbstract16() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract16.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionConditionalExpression2() throws JavaModelException {
>+public void testCompletionKeywordAbstract2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionConditionalExpression3() throws JavaModelException {
>+public void testCompletionKeywordAbstract3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionConditionalExpression3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "var";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>-			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>-			"element:var4 completion:var4 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis1() throws JavaModelException {
>+public void testCompletionKeywordAbstract4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis2() throws JavaModelException {
>+public void testCompletionKeywordAbstract5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis3() throws JavaModelException {
>+public void testCompletionKeywordAbstract6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -4383,311 +4378,272 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis4() throws JavaModelException {
>+public void testCompletionKeywordAbstract7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis5() throws JavaModelException {
>+public void testCompletionKeywordAbstract8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis6() throws JavaModelException {
>+public void testCompletionKeywordAbstract9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "abs";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
>+			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis7() throws JavaModelException {
>+public void testCompletionKeywordAssert1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "as";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:assert completion:assert relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper1() throws JavaModelException {
>+public void testCompletionKeywordAssert2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "as";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper2() throws JavaModelException {
>+public void testCompletionKeywordAssert3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "as";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper3() throws JavaModelException {
>+public void testCompletionKeywordAssert4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "as";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:assert completion:assert relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper4() throws JavaModelException {
>+public void testCompletionKeywordAssert5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "as";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper5() throws JavaModelException {
>+public void testCompletionKeywordAssert6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "as";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordSuper6() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src2/CompletionKeywordSuper6.java",
>- "public class CompletionKeywordSuper6 {\n"+
>- "	public CompletionKeywordSuper6() {\n"+
>- "		sup\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
>- String str = this.wc.getSource();
>- String completeBehind = "sup";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>- assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>- assertResults(
>- "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
>-			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTry1() throws JavaModelException {
>+public void testCompletionKeywordBreak1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tr";
>+		String completeBehind = "bre";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:try completion:try relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTry2() throws JavaModelException {
>+public void testCompletionKeywordBreak2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tr";
>+		String completeBehind = "bre";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTry3() throws JavaModelException {
>+public void testCompletionKeywordBreak3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "try";
>+		String completeBehind = "bre";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDo1() throws JavaModelException {
>+public void testCompletionKeywordBreak4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "do";
>+		String completeBehind = "bre";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:do completion:do relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
>-			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDo2() throws JavaModelException {
>+public void testCompletionKeywordBreak5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "do";
>+		String completeBehind = "bre";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDo3() throws JavaModelException {
>+public void testCompletionKeywordBreak6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "do";
>+		String completeBehind = "bre";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFor1() throws JavaModelException {
>+public void testCompletionKeywordCase1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fo";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:for completion:for relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFor2() throws JavaModelException {
>+public void testCompletionKeywordCase10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fo";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFor3() throws JavaModelException {
>+public void testCompletionKeywordCase2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fo";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordIf1() throws JavaModelException {
>+public void testCompletionKeywordCase3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "if";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:if completion:if relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordIf2() throws JavaModelException {
>+public void testCompletionKeywordCase4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "if";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordIf3() throws JavaModelException {
>+public void testCompletionKeywordCase5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "if";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -4695,156 +4651,157 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordReturn1() throws JavaModelException {
>+public void testCompletionKeywordCase6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "re";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:return completion:return relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordReturn2() throws JavaModelException {
>+public void testCompletionKeywordCase7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "re";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordReturn3() throws JavaModelException {
>+public void testCompletionKeywordCase8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "re";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSwitch1() throws JavaModelException {
>+public void testCompletionKeywordCase9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sw";
>+		String completeBehind = "cas";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:switch completion:switch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSwitch2() throws JavaModelException {
>+public void testCompletionKeywordCatch1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sw";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSwitch3() throws JavaModelException {
>+public void testCompletionKeywordCatch10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sw";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:catchz completion:catchz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrow1() throws JavaModelException {
>+public void testCompletionKeywordCatch2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thr";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:throw completion:throw relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrow2() throws JavaModelException {
>+public void testCompletionKeywordCatch3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thr";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrow3() throws JavaModelException {
>+public void testCompletionKeywordCatch4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thr";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAssert1() throws JavaModelException {
>+public void testCompletionKeywordCatch5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "as";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:assert completion:assert relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:catchz completion:catchz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAssert2() throws JavaModelException {
>+public void testCompletionKeywordCatch6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "as";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAssert3() throws JavaModelException {
>+public void testCompletionKeywordCatch7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "as";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -4852,25 +4809,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse1() throws JavaModelException {
>+public void testCompletionKeywordCatch8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:else completion:else relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse2() throws JavaModelException {
>+public void testCompletionKeywordCatch9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "cat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -4878,339 +4835,365 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse3() throws JavaModelException {
>+public void testCompletionKeywordClass1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse4() throws JavaModelException {
>+public void testCompletionKeywordClass10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch1() throws JavaModelException {
>+public void testCompletionKeywordClass11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch2() throws JavaModelException {
>+public void testCompletionKeywordClass12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch3() throws JavaModelException {
>+public void testCompletionKeywordClass13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch4() throws JavaModelException {
>+public void testCompletionKeywordClass14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch5() throws JavaModelException {
>+public void testCompletionKeywordClass15() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass15.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:catchz completion:catchz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally1() throws JavaModelException {
>+public void testCompletionKeywordClass16() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass16.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally2() throws JavaModelException {
>+public void testCompletionKeywordClass17() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass17.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally3() throws JavaModelException {
>+public void testCompletionKeywordClass18() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass18.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally4() throws JavaModelException {
>+public void testCompletionKeywordClass19() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass19.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally5() throws JavaModelException {
>+public void testCompletionKeywordClass2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally6() throws JavaModelException {
>+public void testCompletionKeywordClass20() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass20.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally7() throws JavaModelException {
>+public void testCompletionKeywordClass21() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass21.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordContinue1() throws JavaModelException {
>+public void testCompletionKeywordClass22() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass22.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cont";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:continue completion:continue relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordContinue2() throws JavaModelException {
>+public void testCompletionKeywordClass23() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass23.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cont";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordBreak1() throws JavaModelException {
>+public void testCompletionKeywordClass24() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass24.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "bre";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordBreak2() throws JavaModelException {
>+public void testCompletionKeywordClass3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "bre";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordBreak3() throws JavaModelException {
>+public void testCompletionKeywordClass4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "bre";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile1() throws JavaModelException {
>+public void testCompletionKeywordClass5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile2() throws JavaModelException {
>+public void testCompletionKeywordClass6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile3() throws JavaModelException {
>+public void testCompletionKeywordClass7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile4() throws JavaModelException {
>+public void testCompletionKeywordClass8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile5() throws JavaModelException {
>+public void testCompletionKeywordClass9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "cla";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends1() throws JavaModelException {
>+public void testCompletionKeywordContinue1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "cont";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:continue completion:continue relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends2() throws JavaModelException {
>+public void testCompletionKeywordContinue2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "cont";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -5218,626 +5201,651 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends3() throws JavaModelException {
>+public void testCompletionKeywordContinue3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "cont";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:continue completion:continue relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends4() throws JavaModelException {
>+public void testCompletionKeywordContinue4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "cont";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends5() throws JavaModelException {
>+public void testCompletionKeywordDefault1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImplements1() throws JavaModelException {
>+public void testCompletionKeywordDefault10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImplements2() throws JavaModelException {
>+public void testCompletionKeywordDefault2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImplements3() throws JavaModelException {
>+public void testCompletionKeywordDefault3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage1() throws JavaModelException {
>+public void testCompletionKeywordDefault4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:package completion:package relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage2() throws JavaModelException {
>+public void testCompletionKeywordDefault5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordPackage2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage3() throws JavaModelException {
>+public void testCompletionKeywordDefault6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage4() throws JavaModelException {
>+public void testCompletionKeywordDefault7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport1() throws JavaModelException {
>+public void testCompletionKeywordDefault8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport2() throws JavaModelException {
>+public void testCompletionKeywordDefault9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordImport2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "def";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport3() throws JavaModelException {
>+public void testCompletionKeywordDo1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "do";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:do completion:do relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
>+			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport4() throws JavaModelException {
>+public void testCompletionKeywordDo2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "do";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase1() throws JavaModelException {
>+public void testCompletionKeywordDo3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "do";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase2() throws JavaModelException {
>+public void testCompletionKeywordDo4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "do";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:do completion:do relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
>+			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase3() throws JavaModelException {
>+public void testCompletionKeywordDo5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "do";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase4() throws JavaModelException {
>+public void testCompletionKeywordDo6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "do";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase5() throws JavaModelException {
>+public void testCompletionKeywordElse1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:else completion:else relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault1() throws JavaModelException {
>+public void testCompletionKeywordElse2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault2() throws JavaModelException {
>+public void testCompletionKeywordElse3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault3() throws JavaModelException {
>+public void testCompletionKeywordElse4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault4() throws JavaModelException {
>+public void testCompletionKeywordElse5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:else completion:else relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault5() throws JavaModelException {
>+public void testCompletionKeywordElse6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass1() throws JavaModelException {
>+public void testCompletionKeywordElse7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass2() throws JavaModelException {
>+public void testCompletionKeywordElse8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "els";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass3() throws JavaModelException {
>+public void testCompletionKeywordExtends1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass4() throws JavaModelException {
>+public void testCompletionKeywordExtends10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass5() throws JavaModelException {
>+public void testCompletionKeywordExtends2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass6() throws JavaModelException {
>+public void testCompletionKeywordExtends3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass7() throws JavaModelException {
>+public void testCompletionKeywordExtends4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass8() throws JavaModelException {
>+public void testCompletionKeywordExtends5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass9() throws JavaModelException {
>+public void testCompletionKeywordExtends6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass10() throws JavaModelException {
>+public void testCompletionKeywordExtends7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass11() throws JavaModelException {
>+public void testCompletionKeywordExtends8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass12() throws JavaModelException {
>+public void testCompletionKeywordExtends9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "ext";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface1() throws JavaModelException {
>+public void testCompletionKeywordFalse1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fal";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface2() throws JavaModelException {
>+public void testCompletionKeywordFalse2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fal";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:false completion:false relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface3() throws JavaModelException {
>+public void testCompletionKeywordFalse3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fal";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface4() throws JavaModelException {
>+public void testCompletionKeywordFalse4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fal";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:false completion:false relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface5() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=95008
>+public void testCompletionKeywordFalse5() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" boolean test = ;\n" + 
>+		"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "boolean test = ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"test[FIELD_REF]{test, Ltest.Test;, Z, test, null, " + (R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>+			"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>+			"false[KEYWORD]{false, null, null, false, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}\n" +
>+			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+public void testCompletionKeywordFinal1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface6() throws JavaModelException {
>+public void testCompletionKeywordFinal10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface7() throws JavaModelException {
>+public void testCompletionKeywordFinal11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface8() throws JavaModelException {
>+public void testCompletionKeywordFinal12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface9() throws JavaModelException {
>+public void testCompletionKeywordFinal13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows1() throws JavaModelException {
>+public void testCompletionKeywordFinal14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows2() throws JavaModelException {
>+public void testCompletionKeywordFinal15() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal15.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -5845,51 +5853,53 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows3() throws JavaModelException {
>+public void testCompletionKeywordFinal16() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal16.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows4() throws JavaModelException {
>+public void testCompletionKeywordFinal17() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal17.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized1() throws JavaModelException {
>+public void testCompletionKeywordFinal18() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal18.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "syn";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized2() throws JavaModelException {
>+public void testCompletionKeywordFinal2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "syn";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -5897,51 +5907,52 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized3() throws JavaModelException {
>+public void testCompletionKeywordFinal3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "syn";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized4() throws JavaModelException {
>+public void testCompletionKeywordFinal4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "syn";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized5() throws JavaModelException {
>+public void testCompletionKeywordFinal5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "syn";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized6() throws JavaModelException {
>+public void testCompletionKeywordFinal6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "syn";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -5949,77 +5960,79 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative1() throws JavaModelException {
>+public void testCompletionKeywordFinal7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative2() throws JavaModelException {
>+public void testCompletionKeywordFinal8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative3() throws JavaModelException {
>+public void testCompletionKeywordFinal9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "fin";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE +R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative4() throws JavaModelException {
>+public void testCompletionKeywordFinally1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp1() throws JavaModelException {
>+public void testCompletionKeywordFinally10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp2() throws JavaModelException {
>+public void testCompletionKeywordFinally11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6027,51 +6040,52 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp3() throws JavaModelException {
>+public void testCompletionKeywordFinally12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp4() throws JavaModelException {
>+public void testCompletionKeywordFinally13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile1() throws JavaModelException {
>+public void testCompletionKeywordFinally14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile2() throws JavaModelException {
>+public void testCompletionKeywordFinally2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6079,25 +6093,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile3() throws JavaModelException {
>+public void testCompletionKeywordFinally3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile4() throws JavaModelException {
>+public void testCompletionKeywordFinally4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6105,207 +6119,210 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient1() throws JavaModelException {
>+public void testCompletionKeywordFinally5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient2() throws JavaModelException {
>+public void testCompletionKeywordFinally6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient3() throws JavaModelException {
>+public void testCompletionKeywordFinally7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient4() throws JavaModelException {
>+public void testCompletionKeywordFinally8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew1() throws JavaModelException {
>+public void testCompletionKeywordFinally9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "finall";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew2() throws JavaModelException {
>+public void testCompletionKeywordFor1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:for completion:for relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew3() throws JavaModelException {
>+public void testCompletionKeywordFor2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew4() throws JavaModelException {
>+public void testCompletionKeywordFor3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew5() throws JavaModelException {
>+public void testCompletionKeywordFor4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:for completion:for relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew6() throws JavaModelException {
>+public void testCompletionKeywordFor5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew7() throws JavaModelException {
>+public void testCompletionKeywordFor6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew8() throws JavaModelException {
>+public void testCompletionKeywordIf1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "if";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:if completion:if relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic1() throws JavaModelException {
>+public void testCompletionKeywordIf2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "if";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic2() throws JavaModelException {
>+public void testCompletionKeywordIf3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "if";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic3() throws JavaModelException {
>+public void testCompletionKeywordIf4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "if";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:if completion:if relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic4() throws JavaModelException {
>+public void testCompletionKeywordIf5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "if";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6313,142 +6330,142 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic5() throws JavaModelException {
>+public void testCompletionKeywordIf6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "if";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic1() throws JavaModelException {
>+public void testCompletionKeywordImplements1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic2() throws JavaModelException {
>+public void testCompletionKeywordImplements2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic3() throws JavaModelException {
>+public void testCompletionKeywordImplements3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic4() throws JavaModelException {
>+public void testCompletionKeywordImplements4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic5() throws JavaModelException {
>+public void testCompletionKeywordImplements5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic6() throws JavaModelException {
>+public void testCompletionKeywordImplements6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic7() throws JavaModelException {
>+public void testCompletionKeywordImport1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic8() throws JavaModelException {
>+public void testCompletionKeywordImport2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordImport2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic9() throws JavaModelException {
>+public void testCompletionKeywordImport3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic10() throws JavaModelException {
>+public void testCompletionKeywordImport4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6456,116 +6473,116 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate1() throws JavaModelException {
>+public void testCompletionKeywordImport5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate2() throws JavaModelException {
>+public void testCompletionKeywordImport6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate3() throws JavaModelException {
>+public void testCompletionKeywordImport7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate4() throws JavaModelException {
>+public void testCompletionKeywordImport8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordImport8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "imp";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate5() throws JavaModelException {
>+public void testCompletionKeywordInstanceof1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "ins";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:instanceof completion:instanceof relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected1() throws JavaModelException {
>+public void testCompletionKeywordInstanceof2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "ins";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected2() throws JavaModelException {
>+public void testCompletionKeywordInstanceof3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "ins";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected3() throws JavaModelException {
>+public void testCompletionKeywordInstanceof4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "ins";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:instanceof completion:instanceof relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected4() throws JavaModelException {
>+public void testCompletionKeywordInstanceof5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "ins";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6573,12 +6590,12 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected5() throws JavaModelException {
>+public void testCompletionKeywordInstanceof6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "ins";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6586,262 +6603,259 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal1() throws JavaModelException {
>+public void testCompletionKeywordInterface1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal2() throws JavaModelException {
>+public void testCompletionKeywordInterface10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal3() throws JavaModelException {
>+public void testCompletionKeywordInterface11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal4() throws JavaModelException {
>+public void testCompletionKeywordInterface12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal5() throws JavaModelException {
>+public void testCompletionKeywordInterface13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal6() throws JavaModelException {
>+public void testCompletionKeywordInterface14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal7() throws JavaModelException {
>+public void testCompletionKeywordInterface15() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface15.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal8() throws JavaModelException {
>+public void testCompletionKeywordInterface16() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface16.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal9() throws JavaModelException {
>+public void testCompletionKeywordInterface17() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface17.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE +R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract1() throws JavaModelException {
>+public void testCompletionKeywordInterface18() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface18.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract2() throws JavaModelException {
>+public void testCompletionKeywordInterface2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract3() throws JavaModelException {
>+public void testCompletionKeywordInterface3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract4() throws JavaModelException {
>+public void testCompletionKeywordInterface4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract5() throws JavaModelException {
>+public void testCompletionKeywordInterface5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract6() throws JavaModelException {
>+public void testCompletionKeywordInterface6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract7() throws JavaModelException {
>+public void testCompletionKeywordInterface7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract8() throws JavaModelException {
>+public void testCompletionKeywordInterface8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTrue1() throws JavaModelException {
>+public void testCompletionKeywordInterface9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tru";
>+		String completeBehind = "interf";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTrue2() throws JavaModelException {
>+public void testCompletionKeywordNative1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tru";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFalse1() throws JavaModelException {
>+public void testCompletionKeywordNative2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fal";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6849,25 +6863,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFalse2() throws JavaModelException {
>+public void testCompletionKeywordNative3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fal";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:false completion:false relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNull1() throws JavaModelException {
>+public void testCompletionKeywordNative4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nul";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6875,51 +6889,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNull2() throws JavaModelException {
>+public void testCompletionKeywordNative5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nul";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:null completion:null relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInstanceof1() throws JavaModelException {
>+public void testCompletionKeywordNative6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ins";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:instanceof completion:instanceof relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInstanceof2() throws JavaModelException {
>+public void testCompletionKeywordNative7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof2.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ins";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInstanceof3() throws JavaModelException {
>+public void testCompletionKeywordNative8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ins";
>+		String completeBehind = "nat";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -6927,340 +6941,285 @@
> 			"",
> 			requestor.getResults());
> }
>-
>-public void testCompletionKeywordThis8() throws JavaModelException {
>+public void testCompletionKeywordNew1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis9() throws JavaModelException {
>+public void testCompletionKeywordNew10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis10() throws JavaModelException {
>+public void testCompletionKeywordNew11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis11() throws JavaModelException {
>+public void testCompletionKeywordNew12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis12() throws JavaModelException {
>+public void testCompletionKeywordNew13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis13() throws JavaModelException {
>+public void testCompletionKeywordNew14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThis14() throws JavaModelException {
>+public void testCompletionKeywordNew15() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew15.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thi";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-/*
>- * bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=42402
>- */
>-public void testCompletionKeywordThis15() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src2/CompletionKeywordThis15.java",
>- "public class CompletionKeywordThis15 {\n" +
>- "	public class InnerClass {\n" +
>- "		public InnerClass() {\n" +
>- "			CompletionKeywordThis15 a = CompletionKeywordThis15.this;\n" +
>- "		}\n" +
>- "	}\n" +
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "CompletionKeywordThis15.";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	assertResults(
>-			"CompletionKeywordThis15.InnerClass[TYPE_REF]{InnerClass, , LCompletionKeywordThis15$InnerClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n"+
>-			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>-		requestor.getResults());
>-}
>-public void testCompletionKeywordSuper7() throws JavaModelException {
>+public void testCompletionKeywordNew16() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew16.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper8() throws JavaModelException {
>+public void testCompletionKeywordNew2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper9() throws JavaModelException {
>+public void testCompletionKeywordNew3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper10() throws JavaModelException {
>+public void testCompletionKeywordNew4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper11() throws JavaModelException {
>+public void testCompletionKeywordNew5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sup";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSuper12() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src2/CompletionKeywordSuper12.java",
>- "public class CompletionKeywordSuper12 {\n"+
>- "	public CompletionKeywordSuper12() {\n"+
>- "		#\n"+
>- "		sup\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- 
>- String str = this.wc.getSource();
>- String completeBehind = "sup";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionKeywordNew6() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew6.java");
> 
>- assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>- assertResults(
>- "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
>-			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+		String str = cu.getSource();
>+		String completeBehind = "ne";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTry4() throws JavaModelException {
>+public void testCompletionKeywordNew7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tr";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:try completion:try relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTry5() throws JavaModelException {
>+public void testCompletionKeywordNew8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tr";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTry6() throws JavaModelException {
>+public void testCompletionKeywordNew9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "try";
>+		String completeBehind = "ne";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDo4() throws JavaModelException {
>+public void testCompletionKeywordNull1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "do";
>+		String completeBehind = "nul";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:do completion:do relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
>-			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDo5() throws JavaModelException {
>+public void testCompletionKeywordNull2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "do";
>+		String completeBehind = "nul";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:null completion:null relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDo6() throws JavaModelException {
>+public void testCompletionKeywordNull3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDo6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "do";
>+		String completeBehind = "nul";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:double completion:double relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFor4() throws JavaModelException {
>+public void testCompletionKeywordNull4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fo";
>+		String completeBehind = "nul";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:for completion:for relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:null completion:null relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFor5() throws JavaModelException {
>+public void testCompletionKeywordPackage1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fo";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:package completion:package relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFor6() throws JavaModelException {
>+public void testCompletionKeywordPackage2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFor6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordPackage2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fo";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7268,25 +7227,26 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordIf4() throws JavaModelException {
>+
>+public void testCompletionKeywordPackage3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "if";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:if completion:if relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordIf5() throws JavaModelException {
>+public void testCompletionKeywordPackage4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "if";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7294,12 +7254,12 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordIf6() throws JavaModelException {
>+public void testCompletionKeywordPackage5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordIf6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "if";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7307,25 +7267,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordReturn4() throws JavaModelException {
>+public void testCompletionKeywordPackage6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "re";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:return completion:return relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordReturn5() throws JavaModelException {
>+public void testCompletionKeywordPackage7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "re";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7333,12 +7293,12 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordReturn6() throws JavaModelException {
>+public void testCompletionKeywordPackage8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordPackage8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "re";
>+		String completeBehind = "pac";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7346,25 +7306,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSwitch4() throws JavaModelException {
>+public void testCompletionKeywordPrivate1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sw";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:switch completion:switch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSwitch5() throws JavaModelException {
>+public void testCompletionKeywordPrivate10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sw";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7372,130 +7332,129 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSwitch6() throws JavaModelException {
>+public void testCompletionKeywordPrivate2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sw";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrow4() throws JavaModelException {
>+public void testCompletionKeywordPrivate3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thr";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:throw completion:throw relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrow5() throws JavaModelException {
>+public void testCompletionKeywordPrivate4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thr";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrow6() throws JavaModelException {
>+public void testCompletionKeywordPrivate5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thr";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAssert4() throws JavaModelException {
>+public void testCompletionKeywordPrivate6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "as";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:assert completion:assert relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAssert5() throws JavaModelException {
>+public void testCompletionKeywordPrivate7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "as";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAssert6() throws JavaModelException {
>+public void testCompletionKeywordPrivate8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAssert6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "as";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse5() throws JavaModelException {
>+public void testCompletionKeywordPrivate9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "pri";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:else completion:else relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse6() throws JavaModelException {
>+public void testCompletionKeywordProtected1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse7() throws JavaModelException {
>+public void testCompletionKeywordProtected10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7503,38 +7462,38 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordElse8() throws JavaModelException {
>+public void testCompletionKeywordProtected2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordElse8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "els";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch6() throws JavaModelException {
>+public void testCompletionKeywordProtected3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch7() throws JavaModelException {
>+public void testCompletionKeywordProtected4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7542,12 +7501,12 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch8() throws JavaModelException {
>+public void testCompletionKeywordProtected5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7555,52 +7514,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch9() throws JavaModelException {
>+public void testCompletionKeywordProtected6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCatch10() throws JavaModelException {
>+public void testCompletionKeywordProtected7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCatch10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cat";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:catch completion:catch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:catchz completion:catchz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally8() throws JavaModelException {
>+public void testCompletionKeywordProtected8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally9() throws JavaModelException {
>+public void testCompletionKeywordProtected9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7608,25 +7566,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally10() throws JavaModelException {
>+public void testCompletionKeywordPublic1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally11() throws JavaModelException {
>+public void testCompletionKeywordPublic10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7634,65 +7592,64 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally12() throws JavaModelException {
>+public void testCompletionKeywordPublic11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally13() throws JavaModelException {
>+public void testCompletionKeywordPublic12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finally completion:finally relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinally14() throws JavaModelException {
>+public void testCompletionKeywordPublic13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinally14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "finall";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:finallyz completion:finallyz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordContinue3() throws JavaModelException {
>+public void testCompletionKeywordPublic14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cont";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:continue completion:continue relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordContinue4() throws JavaModelException {
>+public void testCompletionKeywordPublic15() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordContinue4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic15.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cont";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7700,77 +7657,77 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordBreak4() throws JavaModelException {
>+public void testCompletionKeywordPublic16() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic16.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "bre";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordBreak5() throws JavaModelException {
>+public void testCompletionKeywordPublic17() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic17.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "bre";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordBreak6() throws JavaModelException {
>+public void testCompletionKeywordPublic18() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordBreak6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic18.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "bre";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:break completion:break relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile6() throws JavaModelException {
>+public void testCompletionKeywordPublic19() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic19.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile7() throws JavaModelException {
>+public void testCompletionKeywordPublic2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile8() throws JavaModelException {
>+public void testCompletionKeywordPublic20() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7778,90 +7735,90 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile9() throws JavaModelException {
>+public void testCompletionKeywordPublic3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordWhile10() throws JavaModelException {
>+public void testCompletionKeywordPublic4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "wh";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends6() throws JavaModelException {
>+public void testCompletionKeywordPublic5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends7() throws JavaModelException {
>+public void testCompletionKeywordPublic6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends8() throws JavaModelException {
>+public void testCompletionKeywordPublic7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends9() throws JavaModelException {
>+public void testCompletionKeywordPublic8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:extends completion:extends relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordExtends10() throws JavaModelException {
>+public void testCompletionKeywordPublic9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordExtends10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ext";
>+		String completeBehind = "pub";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7869,38 +7826,38 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImplements4() throws JavaModelException {
>+public void testCompletionKeywordReturn1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements4.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "re";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:return completion:return relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImplements5() throws JavaModelException {
>+public void testCompletionKeywordReturn2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "re";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:implements completion:implements relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImplements6() throws JavaModelException {
>+public void testCompletionKeywordReturn3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImplements6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "re";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7908,25 +7865,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage5() throws JavaModelException {
>+public void testCompletionKeywordReturn4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "re";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:return completion:return relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage6() throws JavaModelException {
>+public void testCompletionKeywordReturn5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "re";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7934,12 +7891,12 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage7() throws JavaModelException {
>+public void testCompletionKeywordReturn6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPackage7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordReturn6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "re";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -7947,129 +7904,129 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPackage8() throws JavaModelException {
>+public void testCompletionKeywordStatic1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordPackage8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pac";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport5() throws JavaModelException {
>+public void testCompletionKeywordStatic10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport6() throws JavaModelException {
>+public void testCompletionKeywordStatic2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport7() throws JavaModelException {
>+public void testCompletionKeywordStatic3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordImport7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordImport8() throws JavaModelException {
>+public void testCompletionKeywordStatic4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "p", "CompletionKeywordImport8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "imp";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:import completion:import relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase6() throws JavaModelException {
>+public void testCompletionKeywordStatic5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase7() throws JavaModelException {
>+public void testCompletionKeywordStatic6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase8() throws JavaModelException {
>+public void testCompletionKeywordStatic7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase9() throws JavaModelException {
>+public void testCompletionKeywordStatic8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:case completion:case relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordCase10() throws JavaModelException {
>+public void testCompletionKeywordStatic9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordCase10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cas";
>+		String completeBehind = "sta";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -8077,415 +8034,461 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault6() throws JavaModelException {
>+public void testCompletionKeywordStrictfp1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault7() throws JavaModelException {
>+public void testCompletionKeywordStrictfp2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault8() throws JavaModelException {
>+public void testCompletionKeywordStrictfp3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:default completion:default relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault9() throws JavaModelException {
>+public void testCompletionKeywordStrictfp4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordDefault10() throws JavaModelException {
>+public void testCompletionKeywordStrictfp5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordDefault10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "def";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Default completion:Default relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass13() throws JavaModelException {
>+public void testCompletionKeywordStrictfp6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass14() throws JavaModelException {
>+public void testCompletionKeywordStrictfp7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass15() throws JavaModelException {
>+public void testCompletionKeywordStrictfp8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass15.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "stric";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass16() throws JavaModelException {
>+public void testCompletionKeywordSuper1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass16.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass17() throws JavaModelException {
>+public void testCompletionKeywordSuper10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass17.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass18() throws JavaModelException {
>+public void testCompletionKeywordSuper11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass18.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass19() throws JavaModelException {
>+public void testCompletionKeywordSuper12() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src2/CompletionKeywordSuper12.java",
>+ "public class CompletionKeywordSuper12 {\n"+
>+ "	public CompletionKeywordSuper12() {\n"+
>+ "		#\n"+
>+ "		sup\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "sup";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+ assertResults(
>+ "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
>+			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+public void testCompletionKeywordSuper2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass19.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass20() throws JavaModelException {
>+public void testCompletionKeywordSuper3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass20.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass21() throws JavaModelException {
>+public void testCompletionKeywordSuper4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass21.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass22() throws JavaModelException {
>+public void testCompletionKeywordSuper5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass22.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass23() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass23.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "cla";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>+public void testCompletionKeywordSuper6() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src2/CompletionKeywordSuper6.java",
>+ "public class CompletionKeywordSuper6 {\n"+
>+ "	public CompletionKeywordSuper6() {\n"+
>+ "		sup\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ 
>+ String str = this.wc.getSource();
>+ String completeBehind = "sup";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+ assertResults(
>+ "expectedTypesSignatures=null\n"+
>+ "expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+ assertResults(
>+ "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
>+			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordClass24() throws JavaModelException {
>+public void testCompletionKeywordSuper7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordClass24.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "cla";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:Class completion:Class relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:ClassWithComplexName completion:ClassWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface10() throws JavaModelException {
>+public void testCompletionKeywordSuper8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface1.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:super completion:super relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface11() throws JavaModelException {
>+public void testCompletionKeywordSuper9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSuper9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sup";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:SuperClass completion:SuperClass relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:SuperInterface completion:SuperInterface relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface12() throws JavaModelException {
>+public void testCompletionKeywordSwitch1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sw";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:switch completion:switch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface13() throws JavaModelException {
>+public void testCompletionKeywordSwitch2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sw";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface14() throws JavaModelException {
>+public void testCompletionKeywordSwitch3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sw";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface15() throws JavaModelException {
>+public void testCompletionKeywordSwitch4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface15.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sw";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:switch completion:switch relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface16() throws JavaModelException {
>+public void testCompletionKeywordSwitch5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface16.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sw";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface17() throws JavaModelException {
>+public void testCompletionKeywordSwitch6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface17.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSwitch6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "sw";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordInterface18() throws JavaModelException {
>+public void testCompletionKeywordSynchronized1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInterface18.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "interf";
>+		String completeBehind = "syn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:interface completion:interface relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows5() throws JavaModelException {
>+public void testCompletionKeywordSynchronized10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "syn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows6() throws JavaModelException {
>+public void testCompletionKeywordSynchronized11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "syn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows7() throws JavaModelException {
>+public void testCompletionKeywordSynchronized12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "syn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordThrows8() throws JavaModelException {
>+public void testCompletionKeywordSynchronized2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "thro";
>+		String completeBehind = "syn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized7() throws JavaModelException {
>+public void testCompletionKeywordSynchronized3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized3.java");
> 
> 		String str = cu.getSource();
> 		String completeBehind = "syn";
>@@ -8496,9 +8499,9 @@
> 			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized8() throws JavaModelException {
>+public void testCompletionKeywordSynchronized4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized4.java");
> 
> 		String str = cu.getSource();
> 		String completeBehind = "syn";
>@@ -8509,9 +8512,9 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized9() throws JavaModelException {
>+public void testCompletionKeywordSynchronized5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized5.java");
> 
> 		String str = cu.getSource();
> 		String completeBehind = "syn";
>@@ -8522,9 +8525,9 @@
> 			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized10() throws JavaModelException {
>+public void testCompletionKeywordSynchronized6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized6.java");
> 
> 		String str = cu.getSource();
> 		String completeBehind = "syn";
>@@ -8535,9 +8538,9 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized11() throws JavaModelException {
>+public void testCompletionKeywordSynchronized7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized7.java");
> 
> 		String str = cu.getSource();
> 		String completeBehind = "syn";
>@@ -8548,9 +8551,9 @@
> 			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordSynchronized12() throws JavaModelException {
>+public void testCompletionKeywordSynchronized8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized8.java");
> 
> 		String str = cu.getSource();
> 		String completeBehind = "syn";
>@@ -8561,129 +8564,143 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative5() throws JavaModelException {
>+public void testCompletionKeywordSynchronized9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordSynchronized9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "syn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:synchronized completion:synchronized relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative6() throws JavaModelException {
>+public void testCompletionKeywordThis1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative7() throws JavaModelException {
>+public void testCompletionKeywordThis10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:native completion:native relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNative8() throws JavaModelException {
>+public void testCompletionKeywordThis11() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNative8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis11.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "nat";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp5() throws JavaModelException {
>+public void testCompletionKeywordThis12() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis12.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp6() throws JavaModelException {
>+public void testCompletionKeywordThis13() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis13.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp7() throws JavaModelException {
>+public void testCompletionKeywordThis14() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis14.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "stric";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:strictfp completion:strictfp relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStrictfp8() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStrictfp8.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "stric";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>+/*
>+ * bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=42402
>+ */
>+public void testCompletionKeywordThis15() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src2/CompletionKeywordThis15.java",
>+ "public class CompletionKeywordThis15 {\n" +
>+ "	public class InnerClass {\n" +
>+ "		public InnerClass() {\n" +
>+ "			CompletionKeywordThis15 a = CompletionKeywordThis15.this;\n" +
>+ "		}\n" +
>+ "	}\n" +
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "CompletionKeywordThis15.";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		assertEquals(
>-			"",
>-			requestor.getResults());
>+	assertResults(
>+			"CompletionKeywordThis15.InnerClass[TYPE_REF]{InnerClass, , LCompletionKeywordThis15$InnerClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n"+
>+			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+		requestor.getResults());
> }
>-public void testCompletionKeywordVolatile5() throws JavaModelException {
>+public void testCompletionKeywordThis2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile6() throws JavaModelException {
>+public void testCompletionKeywordThis3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -8691,25 +8708,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile7() throws JavaModelException {
>+public void testCompletionKeywordThis4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordVolatile8() throws JavaModelException {
>+public void testCompletionKeywordThis5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "vol";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -8717,25 +8734,25 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient5() throws JavaModelException {
>+public void testCompletionKeywordThis6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient5.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient6() throws JavaModelException {
>+public void testCompletionKeywordThis7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -8743,181 +8760,183 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient7() throws JavaModelException {
>+public void testCompletionKeywordThis8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTransient8() throws JavaModelException {
>+public void testCompletionKeywordThis9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThis9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tran";
>+		String completeBehind = "thi";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:this completion:this relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew9() throws JavaModelException {
>+public void testCompletionKeywordThrow1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:throw completion:throw relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew10() throws JavaModelException {
>+public void testCompletionKeywordThrow2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew11() throws JavaModelException {
>+public void testCompletionKeywordThrow3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew12() throws JavaModelException {
>+public void testCompletionKeywordThrow4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+			"element:throw completion:throw relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew13() throws JavaModelException {
>+public void testCompletionKeywordThrow5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew14() throws JavaModelException {
>+public void testCompletionKeywordThrow6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrow6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:Throwable completion:Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew15() throws JavaModelException {
>+public void testCompletionKeywordThrows1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew15.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordNew16() throws JavaModelException {
>+public void testCompletionKeywordThrows2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNew16.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "ne";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:new completion:new relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic6() throws JavaModelException {
>+public void testCompletionKeywordThrows3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic7() throws JavaModelException {
>+public void testCompletionKeywordThrows4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic8() throws JavaModelException {
>+public void testCompletionKeywordThrows5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic9() throws JavaModelException {
>+public void testCompletionKeywordThrows6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -8925,51 +8944,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordStatic10() throws JavaModelException {
>+public void testCompletionKeywordThrows7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordStatic10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "sta";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:static completion:static relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic20() throws JavaModelException {
>+public void testCompletionKeywordThrows8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordThrows8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "thro";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:throws completion:throws relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic11() throws JavaModelException {
>+public void testCompletionKeywordTransient1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic12() throws JavaModelException {
>+public void testCompletionKeywordTransient2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -8977,51 +8996,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic13() throws JavaModelException {
>+public void testCompletionKeywordTransient3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic14() throws JavaModelException {
>+public void testCompletionKeywordTransient4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic15() throws JavaModelException {
>+public void testCompletionKeywordTransient5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic15.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic16() throws JavaModelException {
>+public void testCompletionKeywordTransient6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic16.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -9029,155 +9048,236 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic17() throws JavaModelException {
>+public void testCompletionKeywordTransient7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic17.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:transient completion:transient relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic18() throws JavaModelException {
>+public void testCompletionKeywordTransient8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic18.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTransient8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tran";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPublic19() throws JavaModelException {
>+public void testCompletionKeywordTrue1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPublic19.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pub";
>+		String completeBehind = "tru";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:public completion:public relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate6() throws JavaModelException {
>+public void testCompletionKeywordTrue2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "tru";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate7() throws JavaModelException {
>+public void testCompletionKeywordTrue3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "tru";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate8() throws JavaModelException {
>+public void testCompletionKeywordTrue4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "tru";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:private completion:private relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate9() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
>+public void testCompletionKeywordTrue5() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionKeywordTrue5.java",
>+			"package test;\n" +
>+			"public class CompletionKeywordTrue5 {\n" +
>+			" public void foo() {\n" +
>+			" boolean var;\n" +
>+			" var = tr\n" +
>+			" }\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "tr";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
>+public void testCompletionKeywordTrue6() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+			"/Completion/src/test/CompletionKeywordTrue6.java",
>+			"package test;\n" +
>+			"public class CompletionKeywordTrue6 {\n" +
>+			" public void foo() {\n" +
>+			" boolean var;\n" +
>+			" var = \n" +
>+			" }\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "var = ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+		assertResults(
>+				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>+				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>+				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
>+				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} else {
>+		assertResults(
>+				"CompletionKeywordTrue6[TYPE_REF]{CompletionKeywordTrue6, test, Ltest.CompletionKeywordTrue6;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>+				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>+				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
>+				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	}
>+}
>+public void testCompletionKeywordTry1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "tr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:try completion:try relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordPrivate10() throws JavaModelException {
>+public void testCompletionKeywordTry2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordPrivate10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pri";
>+		String completeBehind = "tr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected6() throws JavaModelException {
>+public void testCompletionKeywordTry3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected6.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "try";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected7() throws JavaModelException {
>+public void testCompletionKeywordTry4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected7.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "tr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:try completion:try relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected8() throws JavaModelException {
>+public void testCompletionKeywordTry5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected8.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "tr";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:protected completion:protected relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected9() throws JavaModelException {
>+public void testCompletionKeywordTry6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTry6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "try";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -9185,52 +9285,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordProtected10() throws JavaModelException {
>+public void testCompletionKeywordVolatile1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordProtected10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "pro";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal18() throws JavaModelException {
>+public void testCompletionKeywordVolatile2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal18.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:finalize() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal10() throws JavaModelException {
>+public void testCompletionKeywordVolatile3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal11() throws JavaModelException {
>+public void testCompletionKeywordVolatile4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -9238,52 +9337,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal12() throws JavaModelException {
>+public void testCompletionKeywordVolatile5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal13() throws JavaModelException {
>+public void testCompletionKeywordVolatile6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal14() throws JavaModelException {
>+public void testCompletionKeywordVolatile7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+			"element:volatile completion:volatile relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal15() throws JavaModelException {
>+public void testCompletionKeywordVolatile8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal15.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordVolatile8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "vol";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -9291,52 +9389,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal16() throws JavaModelException {
>+public void testCompletionKeywordWhile1() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal16.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile1.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:protected void finalize() throws Throwable relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordFinal17() throws JavaModelException {
>+public void testCompletionKeywordWhile10() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFinal17.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile10.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "fin";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:final completion:final relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract9() throws JavaModelException {
>+public void testCompletionKeywordWhile2() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract9.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile2.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract10() throws JavaModelException {
>+public void testCompletionKeywordWhile3() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract10.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile3.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -9344,51 +9441,51 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract11() throws JavaModelException {
>+public void testCompletionKeywordWhile4() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract11.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile4.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract12() throws JavaModelException {
>+public void testCompletionKeywordWhile5() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract12.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile5.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract13() throws JavaModelException {
>+public void testCompletionKeywordWhile6() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract13.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile6.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract14() throws JavaModelException {
>+public void testCompletionKeywordWhile7() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract14.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile7.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
>@@ -9396,516 +9493,320 @@
> 			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordAbstract15() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract15.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "abs";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordAbstract16() throws JavaModelException {
>+public void testCompletionKeywordWhile8() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordAbstract16.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile8.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "abs";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"element:abstract completion:abstract relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+			"",
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTrue3() throws JavaModelException {
>+public void testCompletionKeywordWhile9() throws JavaModelException {
> 		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue3.java");
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordWhile9.java");
> 
> 		String str = cu.getSource();
>-		String completeBehind = "tru";
>+		String completeBehind = "wh";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		cu.codeComplete(cursorLocation, requestor);
> 
> 		assertEquals(
>-			"",
>+			"element:while completion:while relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionKeywordTrue4() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordTrue4.java");
>+public void testCompletionLocalName() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionLocalName.java");
> 
>-		String str = cu.getSource();
>-		String completeBehind = "tru";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>+	String str = cu.getSource();
>+	String completeBehind = "ClassWithComplexName ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-		assertEquals(
>-			"element:true completion:true relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-			requestor.getResults());
>+	assertEquals(
>+		"should have two completions", 
>+		"element:classWithComplexName completion:classWithComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:complexName2 completion:complexName2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:withComplexName completion:withComplexName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
>-public void testCompletionKeywordTrue5() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionKeywordTrue5.java",
>-			"package test;\n" +
>-			"public class CompletionKeywordTrue5 {\n" +
>-			" public void foo() {\n" +
>-			" boolean var;\n" +
>-			" var = tr\n" +
>-			" }\n" +
>-			"}");
>-	
>+public void testCompletionLocalType1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/CompletionLocalType1.java",
>+		"public class CompletionLocalType1 {\n" +
>+		"	void foo() {\n" +
>+		"		class ZZZZ {\n" +
>+		"			ZZZ\n" +
>+		"		}\n" +
>+		"	}\n" +
>+		"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "tr";
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "ZZZ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
>+			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, LZZZZ;, ()V, ZZZ, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
>+			"ZZZZ[TYPE_REF]{ZZZZ, , LZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
>-public void testCompletionKeywordTrue6() throws JavaModelException {
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25815
>+*/
>+public void testCompletionMemberType() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionKeywordTrue6.java",
>-			"package test;\n" +
>-			"public class CompletionKeywordTrue6 {\n" +
>-			" public void foo() {\n" +
>-			" boolean var;\n" +
>-			" var = \n" +
>-			" }\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "var = ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+ "/Completion/src/CompletionMemberType.java",
>+ "public class CompletionMemberType {\n"+
>+ "	public class Y {\n"+
>+ "		public void foo(){\n"+
>+ "			Y var = new Y\n"+
>+ "		}\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "new Y";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+		"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
>+}
>+public void testCompletionMemberType2() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionMemberType2.java",
>+ "public class CompletionMemberType2 {\n"+
>+ "	public class MemberException extends Exception {\n"+
>+ "	}\n"+
>+ "	void foo() {\n"+
>+ "		throw new \n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "new ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
> 		assertResults(
>-				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>-				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>-				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
>-				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"",
>+			requestor.getResults());
> 	} else {
> 		assertResults(
>-				"CompletionKeywordTrue6[TYPE_REF]{CompletionKeywordTrue6, test, Ltest.CompletionKeywordTrue6;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>-				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
>-				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
>-				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"CompletionMemberType2[TYPE_REF]{CompletionMemberType2, test, Ltest.CompletionMemberType2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+			"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	}
> }
>-public void testCompletionKeywordFalse3() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse3.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "fal";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>+public void testCompletionMemberType3() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionArrayClone.java",
>+ "public class CompletionMemberType3 {\n"+
>+ "	public class MemberException extends Exception {\n"+
>+ "	}\n"+
>+ "	void foo() {\n"+
>+ "		throw new MemberE\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "new MemberE";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-		assertEquals(
>-			"",
>-			requestor.getResults());
>+	assertResults(
>+		"CompletionMemberType3.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
>+		requestor.getResults());
> }
>-public void testCompletionKeywordFalse4() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordFalse4.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "fal";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"element:false completion:false relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-			requestor.getResults());
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=95008
>-public void testCompletionKeywordFalse5() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/Test.java",
>-		"package test;"+
>-		"public class Test {\n" + 
>-		" boolean test = ;\n" + 
>-		"}\n");
>+public void testCompletionMessageSendIsParent1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent1.java");
> 
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "boolean test = ";
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	assertResults(
>-			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"test[FIELD_REF]{test, Ltest.Test;, Z, test, null, " + (R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>-			"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
>-			"false[KEYWORD]{false, null, null, false, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}\n" +
>-			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordNull3() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull3.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "nul";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"",
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordNull4() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordNull4.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "nul";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"element:null completion:null relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordInstanceof4() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof4.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "ins";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"element:instanceof completion:instanceof relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordInstanceof5() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof5.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "ins";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"",
>-			requestor.getResults());
>-}
>-public void testCompletionKeywordInstanceof6() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src2", "", "CompletionKeywordInstanceof6.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "ins";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"",
>-			requestor.getResults());
>-}
>-public void testCompletionMemberType2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionMemberType2.java",
>- "public class CompletionMemberType2 {\n"+
>- "	public class MemberException extends Exception {\n"+
>- "	}\n"+
>- "	void foo() {\n"+
>- "		throw new \n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "new ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-			"",
>-			requestor.getResults());
>-	} else {
>-		assertResults(
>-			"CompletionMemberType2[TYPE_REF]{CompletionMemberType2, test, Ltest.CompletionMemberType2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>-			"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-	}
>-}
>-public void testCompletionMemberType3() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionArrayClone.java",
>- "public class CompletionMemberType3 {\n"+
>- "	public class MemberException extends Exception {\n"+
>- "	}\n"+
>- "	void foo() {\n"+
>- "		throw new MemberE\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "new MemberE";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertResults(
>-		"CompletionMemberType3.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-public void testCompletionAfterCase1() throws JavaModelException {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterCase1.java");
>-
>-		String str = cu.getSource();
>-		String completeBehind = "zz";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-
>-		assertEquals(
>-			"element:zzz completion:zzz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-}
>-public void testCompletionAfterCase2() throws JavaModelException {
>+public void testCompletionMessageSendIsParent2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterCase2.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent2.java");
> 
>-		String str = cu.getSource();
>-		String completeBehind = "zz";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-		assertEquals(
>-			"element:zzz completion:zzz relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionToplevelType1() throws JavaModelException {
>+public void testCompletionMessageSendIsParent3() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "p3", "CompletionToplevelType1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent3.java");
> 
>-		String str = cu.getSource();
>-		String completeBehind = "CompletionToplevelType1";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-		assertEquals(
>-			"element:CompletionToplevelType1 completion:CompletionToplevelType1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionCatchArgumentName2() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_ARGUMENT_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_ARGUMENT_PREFIXES,"arg"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"loc"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+public void testCompletionMessageSendIsParent4() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionCatchArgumentName2.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent4.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "Exception ";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	options.put(JavaCore.CODEASSIST_ARGUMENT_PREFIXES,argumentPrefixPreviousValue);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,localPrefixPreviousValue);
>-	JavaCore.setOptions(options);
>-
> 	assertEquals(
>-		"element:exception completion:exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-		"element:locException completion:locException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX+ R_NON_RESTRICTED),
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-public void testCompletionArrayAccess1() throws JavaModelException {
>+public void testCompletionMessageSendIsParent5() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArrayAccess1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent5.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zzz";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:zzz1 completion:zzz1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:zzz2 completion:zzz2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE +R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-public void testCompletionVariableName3() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"p1,p2"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"s1,s2"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+public void testCompletionMessageSendIsParent6() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMessageSendIsParent6.java");
> 
>-	try {
>-		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableName3.java");
>-	
>-		String str = cu.getSource();
>-		String completeBehind = "OneName ";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		cu.codeComplete(cursorLocation, requestor);
>-	
>-		assertEquals(
>-			"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:names1 completion:names1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:names2 completion:names2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:oneName completion:oneName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>-			"element:oneNames1 completion:oneNames1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:oneNames2 completion:oneNames2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p1Name completion:p1Name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p1Names1 completion:p1Names1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p1Names2 completion:p1Names2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p1OneName completion:p1OneName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p1OneNames1 completion:p1OneNames1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p1OneNames2 completion:p1OneNames2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p2Name completion:p2Name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p2Names1 completion:p2Names1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p2Names2 completion:p2Names2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p2OneName completion:p2OneName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p2OneNames1 completion:p2OneNames1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>-			"element:p2OneNames2 completion:p2OneNames2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX+ R_NON_RESTRICTED),
>-			requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>-	}
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionVariableName4() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionVariableName4.java",
>- "class FooBar {\n"+
>- "}\n"+
>- "public class CompletionVariableName4 {\n"+
>- "	void foo(){\n"+
>- "		FooBar the\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "the";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionMethodDeclaration() throws JavaModelException {
> 
>- assertResults(
>- 		"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "eq";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have two completions", 
>+		"element:eqFoo completion:public int eqFoo(int a, Object b) relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"\n" +
>+		"element:equals completion:public boolean equals(Object obj) relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionVariableName5() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionVariableName5.java",
>- "class FooBar {\n"+
>- "}\n"+
>- "public class CompletionVariableName5 {\n"+
>- "	void foo(){\n"+
>- "		FooBar thefo\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "thefo";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionMethodDeclaration10() throws JavaModelException {
> 
>- assertResults(
>- 		"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration10.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "clon";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have one completion", 
>+		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionVariableName6() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=80063
>+public void testCompletionMethodDeclaration11() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionVariableName6.java",
>- "class FooBar {\n"+
>- "}\n"+
>- "public class CompletionVariableName6 {\n"+
>- "	void foo(){\n"+
>- "		FooBar theba\n"+
>- "	}\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "theba";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+			"/Completion/src/test/CompletionMethodDeclaration11.java",
>+			"package test;\n" +
>+			"public class CompletionMethodDeclaration11 {\n" +
>+			" private void foo() {\n" +
>+			" }\n" +
>+			"}\n" +
>+			"class CompletionMethodDeclaration11_2 extends CompletionMethodDeclaration11 {\n" +
>+			" fo\n" +
>+			"}");
>+	
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.wc.getSource();
>+	String completeBehind = "fo";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>- 		"thebaFooBar[VARIABLE_DECLARATION]{thebaFooBar, null, LFooBar;, thebaFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>+	assertResults(
>+			"fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration11_2;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-public void testCompletionVariableName7() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionVariableName7.java",
>- "class FooBar {\n"+
>- "}\n"+
>- "public class CompletionVariableName7 {\n"+
>- "	void foo(){\n"+
>- "		FooBar fo\n"+
>- "	}\n"+
>+public void testCompletionMethodDeclaration12() throws JavaModelException {
>+ this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionMethodDeclaration12.java",
>+ "package test;\n" +
>+ "public class CompletionMethodDeclaration12 {\n" +
>+ " public void foo() {\n" +
>+ " }\n" +
>+ "}\n" +
>+ "class CompletionMethodDeclaration12_2 extends CompletionMethodDeclaration12{\n" +
>+ " public final void foo() {\n" +
>+ " }\n" +
>+ "}\n" +
>+ "class CompletionMethodDeclaration12_3 extends CompletionMethodDeclaration12_2 {\n" +
>+ " fo\n" +
> "}");
> 
> 
>@@ -9916,983 +9817,546 @@
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>-			"foBar[VARIABLE_DECLARATION]{foBar, null, LFooBar;, foBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"fooBar[VARIABLE_DECLARATION]{fooBar, null, LFooBar;, fooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+ "fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration12_3;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+ requestor.getResults());
> }
>-public void testCompletionVariableName8() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+public void testCompletionMethodDeclaration2() throws JavaModelException {
>+	ICompilationUnit superClass = null;
> 	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
>+	 "}");
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName8.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName8 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar the\n"+
>-	 "	}\n"+
>+	 "/Completion/src/CompletionMethodDeclaration2.java",
>+	 "public class CompletionMethodDeclaration2 extends CompletionSuperClass {\n" +
>+	 "	eq\n" +
> 	 "}");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "the";
>+	 String completeBehind = "eq";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	 assertResults(
>-				"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"theBarsuf[VARIABLE_DECLARATION]{theBarsuf, null, LFooBar;, theBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>-				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>+		assertResults(
>+			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
>+			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
> 	}
> }
>-public void testCompletionVariableName9() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+/**
>+ * Completion should not propose declarations of method already locally implemented
>+ */
>+public void testCompletionMethodDeclaration3() throws JavaModelException {
>+	ICompilationUnit superClass = null;
> 	try {
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName9.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName9 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar thefo\n"+
>-	 "	}\n"+
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
> 	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "thefo";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	 assertResults(
>-				"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"thefoBarsuf[VARIABLE_DECLARATION]{thefoBarsuf, null, LFooBar;, thefoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>-				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>-				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-public void testCompletionVariableName10() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>-	try {
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName10.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName10 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar fo\n"+
>-	 "	}\n"+
>+	 "/Completion/src/CompletionMethodDeclaration3.java",
>+	 "public class CompletionMethodDeclaration3 extends CompletionSuperClass {\n" +
>+	 "	eq\n" +
>+	 "	\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
> 	 "}");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "fo";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 String completeBehind = "eq";
>+	 int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	 assertResults(
>-				"foBar[VARIABLE_DECLARATION]{foBar, null, LFooBar;, foBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"foBarsuf[VARIABLE_DECLARATION]{foBarsuf, null, LFooBar;, foBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>-				"fooBar[VARIABLE_DECLARATION]{fooBar, null, LFooBar;, fooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>-				"fooBarsuf[VARIABLE_DECLARATION]{fooBarsuf, null, LFooBar;, fooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>+		assertResults(
>+			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration3;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
> 	}
> }
>-public void testCompletionVariableName11() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+public void testCompletionMethodDeclaration4() throws JavaModelException {
>+	ICompilationUnit superClass = null;
> 	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface.java",
>+	 "public interface CompletionSuperInterface{\n"+
>+	 "	public int eqFoo(int a,Object b);\n"+
>+	 "}");
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName11.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName11 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar pr\n"+
>-	 "	}\n"+
>+	 "/Completion/src/CompletionMethodDeclaration4.java",
>+	 "public abstract class CompletionMethodDeclaration4 implements CompletionSuperInterface {\n"+
>+	 "	eq\n"+
> 	 "}");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "pr";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 String completeBehind = "eq";
>+	 int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	 assertResults(
>-				"preBar[VARIABLE_DECLARATION]{preBar, null, LFooBar;, preBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preFooBar[VARIABLE_DECLARATION]{preFooBar, null, LFooBar;, preFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preBarsuf[VARIABLE_DECLARATION]{preBarsuf, null, LFooBar;, preBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX+ R_NON_RESTRICTED)+"}\n"+
>-				"preFooBarsuf[VARIABLE_DECLARATION]{preFooBarsuf, null, LFooBar;, preFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>+		assertResults(
>+			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration4;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
> 	}
> }
>-public void testCompletionVariableName12() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>-
>+public void testCompletionMethodDeclaration5() throws JavaModelException {
>+	ICompilationUnit superClass = null;
> 	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
>+	 "}");
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName12.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName12 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar prethe\n"+
>-	 "	}\n"+
>+	 "/Completion/src/CompletionMethodDeclaration5.java",
>+	 "public class CompletionMethodDeclaration5 {\n" +
>+	 "	public static void main(String[] args) {\n" +
>+	 "		new CompletionSuperClass() {\n" +
>+	 "	}\n" +
>+	 "\n" +
> 	 "}");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "prethe";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 String completeBehind = "new CompletionSuperClass() {";
>+	 int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	 assertResults(
>-				"preTheBar[VARIABLE_DECLARATION]{preTheBar, null, LFooBar;, preTheBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preTheFooBar[VARIABLE_DECLARATION]{preTheFooBar, null, LFooBar;, preTheFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preTheBarsuf[VARIABLE_DECLARATION]{preTheBarsuf, null, LFooBar;, preTheBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preTheFooBarsuf[VARIABLE_DECLARATION]{preTheFooBarsuf, null, LFooBar;, preTheFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>+	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+			assertResults(
>+				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
>+				requestor.getResults());
>+		} else {
>+			assertResults(
>+				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
>+				"CompletionMethodDeclaration5[TYPE_REF]{CompletionMethodDeclaration5, , LCompletionMethodDeclaration5;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
>+				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
> 				requestor.getResults());
>+		}
> 	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
> 	}
> }
>-public void testCompletionVariableName13() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+public void testCompletionMethodDeclaration6() throws JavaModelException {
> 
>-	try {
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName13.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName13 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar prefo\n"+
>-	 "	}\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "prefo";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	 assertResults(
>-				"preFoBar[VARIABLE_DECLARATION]{preFoBar, null, LFooBar;, preFoBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preFoBarsuf[VARIABLE_DECLARATION]{preFoBarsuf, null, LFooBar;, preFoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preFooBar[VARIABLE_DECLARATION]{preFooBar, null, LFooBar;, preFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>-				"preFooBarsuf[VARIABLE_DECLARATION]{preFooBarsuf, null, LFooBar;, preFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>-	}
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration6.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "clon";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have one completion", 
>+		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionVariableName14() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+public void testCompletionMethodDeclaration7() throws JavaModelException {
> 
>-	try {
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName14.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName14 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar prethefo\n"+
>-	 "	}\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "prethefo";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	 assertResults(
>-				"preThefoBar[VARIABLE_DECLARATION]{preThefoBar, null, LFooBar;, preThefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preThefoBarsuf[VARIABLE_DECLARATION]{preThefoBarsuf, null, LFooBar;, preThefoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>-				"preTheFooBar[VARIABLE_DECLARATION]{preTheFooBar, null, LFooBar;, preTheFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>-				"preTheFooBarsuf[VARIABLE_DECLARATION]{preTheFooBarsuf, null, LFooBar;, preTheFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128045
>-public void testCompletionVariableName15() throws JavaModelException {
>-	Hashtable options = JavaCore.getOptions();
>-	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>-	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>-	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>-	
>-	JavaCore.setOptions(options);
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration7.java");
> 
>-	try {
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionVariableName15.java",
>-	 "class FooBar {\n"+
>-	 "}\n"+
>-	 "public class CompletionVariableName15 {\n"+
>-	 "	void foo(){\n"+
>-	 "		FooBar pro\n"+
>-	 "	}\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "pro";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	 assertResults(
>-				"proBar[VARIABLE_DECLARATION]{proBar, null, LFooBar;, proBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"proFooBar[VARIABLE_DECLARATION]{proFooBar, null, LFooBar;, proFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"proBarsuf[VARIABLE_DECLARATION]{proBarsuf, null, LFooBar;, proBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-				"proFooBarsuf[VARIABLE_DECLARATION]{proFooBarsuf, null, LFooBar;, proFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
>-				requestor.getResults());
>-	} finally {
>-		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>-		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>-		JavaCore.setOptions(options);
>-	}
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName16() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		Object ;\n"+
>- "		foo = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	String str = cu.getSource();
>+	String completeBehind = "clon";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	assertEquals(
>+		"should have one completion", 
>+		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName17() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		Object foo1;\n"+
>- "		/*here*/Object ;\n"+
>- "		Object foo3;\n"+
>- "		foo1 = null;\n"+
>- "		foo2 = null;\n"+
>- "		foo3 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionMethodDeclaration8() throws JavaModelException {
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName18() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		Object ;\n"+
>- "		foo = Test.class;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration8.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName19() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		Object ;\n"+
>- "		object = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	String str = cu.getSource();
>+	String completeBehind = "clon";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	assertEquals(
>+		"should have one completion", 
>+		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName20() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		class X {\n"+
>- "		 Object foo1 = foo2;\n"+
>- "		 void bar() {\n"+
>- "		 foo1 = null;\n"+
>- "		 Object foo3 = foo4;\n"+
>- "		 foo3 = null;\n"+
>- "		 }\n"+
>- "		}\n"+
>- "		foo5 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionMethodDeclaration9() throws JavaModelException {
> 
>- assertResults(
>- 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName21() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		{\n"+
>- "		 /*here*/Object ;\n"+
>- "		 foo1 = null;\n"+
>- "		}\n"+
>- "		foo2 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodDeclaration9.java");
> 
>- assertResults(
>- 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	String str = cu.getSource();
>+	String completeBehind = "clon";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have one completion", 
>+		"element:CloneNotSupportedException completion:CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:clone completion:protected Object clone() throws CloneNotSupportedException relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName22() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		Object foo1;\n"+
>- "		/*here*/Object ;\n"+
>- "		{\n"+
>- "		 Object foo3;\n"+
>- "		 foo1 = null;\n"+
>- "		 foo2 = null;\n"+
>- "		 foo3 = null;\n"+
>- "		}\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionMethodThrowsClause() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodThrowsClause.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	String str = cu.getSource();
>+	String completeBehind = "Ex";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName23() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		foo1 = null;\n"+
>- "		#\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionMethodThrowsClause2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionMethodThrowsClause2.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	String str = cu.getSource();
>+	String completeBehind = "Ex";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName24() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		#\n"+
>- "		foo1 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionNonEmptyToken1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionNonEmptyToken1.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	int start = cursorLocation - 2;
>+	int end = start + 4;
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzyy completion:zzyy position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResultsWithPosition());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName25() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		#\n"+
>- "		foo1 = null;\n"+
>- "		#\n"+
>- "		foo2 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionNonStaticFieldRelevance() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionNonStaticFieldRelevance.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+	String str = cu.getSource();
>+	String completeBehind = "var.Ii";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+			"element:Ii0 completion:Ii0 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
>+			"element:ii1 completion:ii1 relevance:" + (R_DEFAULT + R_INTERESTING + R_NON_STATIC+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName26() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		#\n"+
>- "		foo1 = null;\n"+
>- "		#\n"+
>- "		foo2 = null;\n"+
>- "		#\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+/**
>+ * Attempt to do completion with a null requestor
>+ */
>+public void testCompletionNullRequestor() throws JavaModelException {
>+	try {
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindThisDotField.java");
>+		cu.codeComplete(5, (CompletionRequestor)null);
>+	} catch (IllegalArgumentException iae) {
>+		return;
>+	}
>+	assertTrue("Should not be able to do completion with a null requestor", false);
>+}
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=24565
>+*/
>+public void testCompletionObjectsMethodWithInterfaceReceiver() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionObjectsMethodWithInterfaceReceiver.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	String str = cu.getSource();
>+	String completeBehind = "hash";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:hashCode completion:hashCode() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName27() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		Object foo0 = null;\n"+
>- "		foo0 = null;\n"+
>- "		#\n"+
>- "		class X {\n"+
>- "		 Object foo1 = foo2;\n"+
>- "		 void bar() {\n"+
>- "		 foo1 = null;\n"+
>- "		 Object foo3 = foo4;\n"+
>- "		 foo3 = null;\n"+
>- "		 }\n"+
>- "		}\n"+
>- "		foo5 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+/**
>+ * Ensures that the code assist features works on class files with associated source.
>+ */
>+public void testCompletionOnClassFile() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	IClassFile cu = getClassFile("Completion", "zzz.jar", "jarpack1", "X.class");
>+	
>+	String str = cu.getSource();
>+	String completeBehind = "Obj";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+	assertEquals(
>+		"should have one class", 
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25890
>+*/
>+public void testCompletionOnStaticMember1() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionOnStaticMember1.java");
> 
>- assertResults(
>- 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName28() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		Object foo1 = null;\n"+
>- "		foo1.foo2 = null;\n"+
>- "		foo3.foo4 = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25890
>+*/
>+public void testCompletionOnStaticMember2() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionOnStaticMember2.java");
> 
>- assertResults(
>- 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"foo3[VARIABLE_DECLARATION]{foo3, null, Ljava.lang.Object;, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+		String str = cu.getSource();
>+		String completeBehind = "method";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:method1 completion:method1() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+			"element:method2 completion:method2() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName29() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void foo(){\n"+
>- "		/*here*/Object ;\n"+
>- "		class X {\n"+
>- "			void bar1() {\n"+
>- "				var1 = null;\n"+
>- "			}\n"+
>- "			void bar2() {\n"+
>- "				Object var2 = null;\n"+
>- "				var2 = null;\n"+
>- "			}\n"+
>- "			void bar3() {\n"+
>- "				Object var3 = null;\n"+
>- "				{\n"+
>- "					var3 = null;\n"+
>- "					Object var4 = null;\n"+
>- "				}\n"+
>- "				var4 = null;\n"+
>- "			}\n"+
>- "		}\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/*here*/Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+/**
>+ * Test that an out of bounds index causes an exception.
>+ */
>+public void testCompletionOutOfBounds() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionOutOfBounds.java");
>+	try {
>+		cu.codeComplete(cu.getSource().length() + 1, requestor);
>+	} catch (JavaModelException e) {
>+		return;
>+	}
>+	assertTrue("should have failed", false);
>+}
>+public void testCompletionPackageAndClass1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "z1.z2.qla0", "Qla3.java");
> 
>- assertResults(
>- 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>- 		"var1[VARIABLE_DECLARATION]{var1, null, Ljava.lang.Object;, var1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"var4[VARIABLE_DECLARATION]{var4, null, Ljava.lang.Object;, var4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+	String str = cu.getSource();
>+	String completeBehind = "z1.z2.ql";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+			"element:Qla1 completion:z1.z2.Qla1 relevance:" + (R_DEFAULT + R_INTERESTING + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:qla2 completion:z1.z2.qla2 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
>+			"element:z1.z2.qla0 completion:z1.z2.qla0 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName30() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	public Test(){\n"+
>- "		Object ;\n"+
>- "		foo = null;\n"+
>- "	}\n"+
>- "}");
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "Object ";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionPackageAndClass2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "z1.z2.qla0", "Wla.java");
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+	String str = cu.getSource();
>+	String completeBehind = "z1.z2.qla0.";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+			"element:Qla3 completion:Qla3 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
>+			"element:Qla4 completion:Qla4 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
>+			"element:Wla completion:Wla relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName31() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	{\n"+
>- "		Object ;\n"+
>- "		foo = null;\n"+
>+public void testCompletionPrefixFieldName1() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionPrefixFieldName1.java",
>+ "public class CompletionPrefixFieldName1 {\n"+
>+ "	int xBar;\n"+
>+ "	\n"+
>+ "	class classFoo {\n"+
>+ "		int xBar;\n"+
>+ "		\n"+
>+ "		public void foo(){\n"+
>+ "			xBa\n"+
>+ "		}\n"+
> "	}\n"+
> "}");
> 
>+ 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "Object ";
>+ String str = this.wc.getSource();
>+ String completeBehind = "xBa";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	assertResults(
>+		"xBar[FIELD_REF]{CompletionPrefixFieldName1.this.xBar, LCompletionPrefixFieldName1;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName1$classFoo;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>-public void testCompletionVariableName32() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void bar(Object ) {\n"+
>- "		foo = null;\n"+
>+public void testCompletionPrefixFieldName2() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionPrefixFieldName2.java",
>+ "public class CompletionPrefixFieldName2 {\n"+
>+ "	int xBar;\n"+
>+ "	\n"+
>+ "	class classFoo {\n"+
>+ "		int xBar;\n"+
>+ "		\n"+
>+ "		public void foo(){\n"+
>+ "			new CompletionPrefixFieldName2().xBa\n"+
>+ "		}\n"+
> "	}\n"+
> "}");
> 
>+ 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "Object ";
>+ String str = this.wc.getSource();
>+ String completeBehind = "xBa";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>-			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	assertResults(
>+		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName2;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162743
>-public void testCompletionVariableName33() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	void bar() {\n"+
>- "		/**/int v\n"+
>- "		variable = null;\n"+
>- "		variable = null;\n"+
>- "		variable = null;\n"+
>- "	}\n"+
>- "}");
>+public void testCompletionPrefixMethodName1() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionPrefixMethodName1.java",
>+ "public class CompletionPrefixMethodName1 {\n"+
>+ "	int xBar(){}\n"+
>+ "	\n"+
>+ "	class classFoo {\n"+
>+ "		int xBar(){}\n"+
>+ "		\n"+
>+ "		public void foo(){\n"+
>+ "			xBa\n"+
>+ "		}\n"+
>+ "	}\n"+
>+ "}");
>+ 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/**/int v";
>+ String str = this.wc.getSource();
>+ String completeBehind = "xBa";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>-			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"variable[VARIABLE_DECLARATION]{variable, null, I, variable, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>+	assertResults(
>+		"xBar[METHOD_REF]{CompletionPrefixMethodName1.this.xBar(), LCompletionPrefixMethodName1;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName1$classFoo;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162968
>-public void testCompletionVariableName34() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n"+
>- "public class Test {\n"+
>- "	int vDefined;\n"+
>- "	void bar() {\n"+
>- "		/**/int v\n"+
>- "		System.out.println(vUnknown);\n"+
>- "		System.out.println(vUnknown);\n"+
>+public void testCompletionPrefixMethodName2() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionPrefixMethodName2.java",
>+ "public class CompletionPrefixMethodName2 {\n"+
>+ "	int xBar(){}\n"+
>+ "	\n"+
>+ "	class classFoo {\n"+
>+ "		int xBar(){}\n"+
>+ "		\n"+
>+ "		public void foo(){\n"+
>+ "			new CompletionPrefixMethodName2().xBa\n"+
>+ "		}\n"+
> "	}\n"+
> "}");
> 
>+ 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.workingCopies[0].getSource();
>- String completeBehind = "/**/int v";
>+ String str = this.wc.getSource();
>+ String completeBehind = "xBa";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>- assertResults(
>-			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>-			"vUnknown[VARIABLE_DECLARATION]{vUnknown, null, I, vUnknown, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>-			requestor.getResults());
>-}
>-public void testCompletionNonEmptyToken1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionNonEmptyToken1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	int start = cursorLocation - 2;
>-	int end = start + 4;
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"element:zzyy completion:zzyy position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResultsWithPosition());
>-}
>-public void testCompletionEmptyToken1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionEmptyToken1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zz";
>-	// completion is just at start of 'zz'
>-	int cursorLocation = str.lastIndexOf(completeBehind);
>-	int start = cursorLocation;
>-	int end = start + 4;
>-	cu.codeComplete(cursorLocation, requestor);
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertEquals(
>-			"element:clone completion:clone() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:equals completion:equals() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:finalize() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:foo completion:foo() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:getClass completion:getClass() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:hashCode completion:hashCode() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:notify completion:notify() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:notifyAll completion:notifyAll() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:toString completion:toString() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:zzyy completion:zzyy position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResultsWithPosition());
>-	} else {
>-		assertEquals(
>-			"element:CompletionEmptyToken1 completion:CompletionEmptyToken1 position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:clone completion:clone() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:equals completion:equals() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:finalize completion:finalize() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:foo completion:foo() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:getClass completion:getClass() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:hashCode completion:hashCode() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:notify completion:notify() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:notifyAll completion:notifyAll() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:toString completion:toString() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:wait completion:wait() position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-			"element:zzyy completion:zzyy position:["+start+","+end+"] relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResultsWithPosition());
>-	}
>+	assertResults(
>+		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName2;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=100808
>-public void testCompletionEmptyToken2() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/testCompletionEmptyToken2/Test.java",
>- "package testCompletionEmptyToken2.");
>+public void testCompletionPrefixMethodName3() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionPrefixMethodName2.java",
>+ "public class CompletionPrefixMethodName3 {\n"+
>+ "	int xBar(int a, int b){}\n"+
>+ "	\n"+
>+ "	class classFoo {\n"+
>+ "		int xBar(int a, int b){}\n"+
>+ "		\n"+
>+ "		public void foo(){\n"+
>+ "			xBar(1,\n"+
>+ "		}\n"+
>+ "	}\n"+
>+ "}");
> 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true);
> 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "testCompletionEmptyToken2.";
>+ String completeBehind = "xBar(1,";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- int start = str.lastIndexOf(completeBehind);
>- int end = start + completeBehind.length();
>- 
>- assertResults(
>- "expectedTypesSignatures=null\n"+
>- "expectedTypesKeys=null",
>- requestor.getContext());
>- 
>-	assertResults(
>- "testCompletionEmptyToken2[PACKAGE_REF]{testCompletionEmptyToken2, testCompletionEmptyToken2, null, null, null, ["+start+", "+end+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>-}
>-public void testCompletionFindSecondaryType1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionFindSecondaryType1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "/**/Secondary";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"element:SecondaryType1 completion:SecondaryType1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:SecondaryType2 completion:SecondaryType2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-		requestor.getResults());
>-}
>-public void testCompletionLocalType1() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionLocalType1.java",
>-		"public class CompletionLocalType1 {\n" +
>-		"	void foo() {\n" +
>-		"		class ZZZZ {\n" +
>-		"			ZZZ\n" +
>-		"		}\n" +
>-		"	}\n" +
>-		"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "ZZZ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
> 	assertResults(
>-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, LZZZZ;, ()V, ZZZ, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
>-			"ZZZZ[TYPE_REF]{ZZZZ, , LZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>-}
>-public void testCompletionType1() throws JavaModelException {
>-	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionType1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "CT1";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>-
>-	assertEquals(
>-		"element:CT1 completion:CT1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>-		"element:CT1 completion:q2.CT1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+		"xBar[METHOD_REF]{CompletionPrefixMethodName3.this.xBar(1,, LCompletionPrefixMethodName3;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED)+"}\n"+
>+		"xBar[METHOD_REF]{, LCompletionPrefixMethodName3$classFoo;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
> 		requestor.getResults());
> }
> public void testCompletionQualifiedAllocationType1() throws JavaModelException {
>@@ -10913,143 +10377,318 @@
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>-		"CompletionQualifiedAllocationType1.YYY[TYPE_REF]{YYY, , LCompletionQualifiedAllocationType1$YYY;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+ assertResults(
>+		"CompletionQualifiedAllocationType1.YYY[TYPE_REF]{YYY, , LCompletionQualifiedAllocationType1$YYY;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
>+}
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=26677
>+*/
>+public void testCompletionQualifiedExpectedType() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/test/CompletionQualifiedExpectedType.java",
>+ "import pack1.PX;\n"+
>+ "\n"+
>+ "public class CompletionQualifiedExpectedType {\n"+
>+ "	void foo() {\n"+
>+ "		pack2.PX var = new \n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.wc.getSource();
>+ String completeBehind = "new ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>+ 	assertResults(
>+	 "PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
>+				requestor.getResults());
>+ } else {
>+	 assertResults(
>+	 "CompletionQualifiedExpectedType[TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+				"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
>+				requestor.getResults());
>+ }
>+}
>+/**
>+ * Complete the type "Repeated", "RepeatedOtherType from "Repeated".
>+ */
>+public void testCompletionRepeatedType() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionRepeatedType.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "/**/CompletionRepeated";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+	assertEquals(
>+		"should have two types",
>+		"element:CompletionRepeatedOtherType completion:CompletionRepeatedOtherType relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:CompletionRepeatedType completion:CompletionRepeatedType relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());	
>+}
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25591
>+*/
>+public void testCompletionReturnInInitializer() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionReturnInInitializer.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "eq";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:equals completion:equals() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-public void testCompletionClassLiteralAfterAnonymousType1() throws JavaModelException {
>+public void testCompletionReturnStatementIsParent1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionClassLiteralAfterAnonymousType1.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionReturnStatementIsParent1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "double.";
>+	String completeBehind = "zz";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:class completion:class relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
>+		"element:zz00 completion:zz00 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz00M completion:zz00M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz01 completion:zz01 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz01M completion:zz01M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz02 completion:zz02 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz02M completion:zz02M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz10 completion:zz10 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz10M completion:zz10M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz11 completion:zz11 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz11M completion:zz11M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz12 completion:zz12 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz12M completion:zz12M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz20 completion:zz20 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz20M completion:zz20M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz21 completion:zz21 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz21M completion:zz21M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz22 completion:zz22 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zz22M completion:zz22M() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzOb completion:zzOb relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzObM completion:zzObM() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-public void testCompletionArraysCloneMethod() throws JavaModelException {
>+public void testCompletionReturnStatementIsParent2() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionArraysCloneMethod.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionReturnStatementIsParent2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = ".cl";
>+	String completeBehind = "xx";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-		"element:clone completion:clone() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		"element:XX00 completion:XX00 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX01 completion:XX01 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX02 completion:XX02 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX10 completion:XX10 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX11 completion:XX11 relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX12 completion:XX12 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX20 completion:XX20 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX21 completion:XX21 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:XX22 completion:XX22 relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 		requestor.getResults());
> }
>-public void testCompletionAbstractMethod1() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAbstractMethod1.java",
>- "public class CompletionAbstractMethod1 {\n" +
>- "	abstract class A {\n" +
>- "		abstract void foo();\n" +
>- "	}\n" +
>- "	class B extends A {\n" +
>- "		void foo{} {}\n" +
>- "		void bar() {\n" +
>- "			super.fo\n" +
>- "		}\n" +
>- "	}\n" +
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "fo";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+/*
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=66908
>+ */
>+public void testCompletionSameClass() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionSameClass.java");
> 
>- assertResults(
>- "",
>- requestor.getResults());
>-}
>-public void testCompletionAbstractMethod2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAbstractMethod2.java",
>- "public class CompletionAbstractMethod2 {\n" +
>- "	abstract class A {\n" +
>- "		abstract void foo();\n" +
>- "	}\n" +
>- "	class B extends A {\n" +
>- "		void foo{} {}\n" +
>- "		void bar() {\n" +
>- "			this.fo\n" +
>- "		}\n" +
>- "	}\n" +
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "fo";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	String str = cu.getSource();
>+	String completeBehind = "(CompletionSameClas";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
> 
>- assertResults(
>- "foo[METHOD_REF]{foo(), LCompletionAbstractMethod2$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>+	assertEquals(
>+			"element:CompletionSameClass completion:CompletionSameClass relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>+			requestor.getResults());
> }
>-public void testCompletionAbstractMethod3() throws JavaModelException {
>+public void testCompletionSameSuperClass() throws JavaModelException {
> 	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAbstractMethod3.java",
>- "public class CompletionAbstractMethod3 {\n" +
>- "	abstract class A {\n" +
>- "		abstract void foo();\n" +
>- "	}\n" +
>- "	class B extends A {\n" +
>- "		void bar() {\n" +
>- "			this.fo\n" +
>+ "/Completion/src/CompletionSameSuperClass.java",
>+ "public class CompletionSameSuperClass extends A {\n" +
>+ "	class Inner extends A {\n" +
>+ "		void foo(int bar){\n" +
>+ "			bar\n" +
> "		}\n" +
>- "	}\n" +
>+ "	}	\n" +
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "fo";
>+ String completeBehind = "bar";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>- assertResults(
>- "foo[METHOD_REF]{foo(), LCompletionAbstractMethod3$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
>- requestor.getResults());
>+	assertResults(
>+		"bar[FIELD_REF]{CompletionSameSuperClass.this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
>+		"bar[FIELD_REF]{this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
>+		"bar[METHOD_REF]{CompletionSameSuperClass.this.bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
>+		"bar[LOCAL_VARIABLE_REF]{bar, null, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
>+		"bar[METHOD_REF]{bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+		requestor.getResults());
>+}
>+public void testCompletionStaticMethod1() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+	try {
>+		aType = getWorkingCopy(
>+	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>+	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	public static void foo(){}\n"+
>+	 "	public void foo0(){}\n"+
>+	 "}");
>+			
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionStaticMethod1.java",
>+	 "public class CompletionStaticMethod1 extends TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	void bar(){\n"+
>+	 "		new TypeWithAMethodAndAStaticMethod(){\n"+
>+	 "			class Inner1 extends TypeWithAMethodAndAStaticMethod {\n"+
>+	 "				void bar(){\n"+
>+	 "					foo\n"+
>+	 "				}\n"+
>+	 "			}\n"+
>+	 "		};\n"+
>+	 "	}\n"+
>+	 "	\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo0[METHOD_REF]{CompletionStaticMethod1.this.foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"foo0[METHOD_REF]{foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>+				"foo[METHOD_REF]{CompletionStaticMethod1.foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}\n" +
>+				"foo[METHOD_REF]{foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionStaticMethodDeclaration1() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+	try {
>+		aType = getWorkingCopy(
>+	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>+	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	public static void foo(){}\n"+
>+	 "	public void foo0(){}\n"+
>+	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionStaticMethodDeclaration1.java",
>+	 "public class CompletionStaticMethodDeclaration1 extends TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	foo\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionStaticMethodDeclaration2() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+	try {
>+		aType = getWorkingCopy(
>+	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>+	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	public static void foo(){}\n"+
>+	 "	public void foo0(){}\n"+
>+	 "}");
>+			
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionStaticMethodDeclaration2.java",
>+	 "public class CompletionStaticMethodDeclaration2 {\n" +
>+	 "	class Inner1 extends TypeWithAMethodAndAStaticMethod {\n" +
>+	 "		foo\n" +
>+	 "	}\n" +
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration2$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+	}
> }
>-public void testCompletionAbstractMethod4() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>- "/Completion/src/CompletionAbstractMethod4.java",
>- "public class CompletionAbstractMethod1 {\n" +
>- "	class A {\n" +
>- "		void foo(){}\n" +
>- "	}\n" +
>- "	abstract class B extends A {\n" +
>- "		abstract void foo();\n" +
>- "	}\n" +
>- "	class C extends B {\n" +
>- "		void foo{} {}\n" +
>- "		void bar() {\n" +
>- "			super.fo\n" +
>- "		}\n" +
>- "	}\n" +
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "fo";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>- assertResults(
>- "",
>- requestor.getResults());
>+public void testCompletionStaticMethodDeclaration3() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+	try {
>+		aType = getWorkingCopy(
>+	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>+	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	public static void foo(){}\n"+
>+	 "	public void foo0(){}\n"+
>+	 "}");
>+			
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionStaticMethodDeclaration3.java",
>+	 "public class CompletionStaticMethodDeclaration3 {\n" +
>+	 "	static class Inner1 extends TypeWithAMethodAndAStaticMethod {\n" +
>+	 "		foo\n" +
>+	 "	}\n" +
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration3$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+	}
> }
>-public void testCompletionStaticMethodDeclaration1() throws JavaModelException {
>+public void testCompletionStaticMethodDeclaration4() throws JavaModelException {
> 	ICompilationUnit aType = null;
> 	try {
> 		aType = getWorkingCopy(
>@@ -11058,11 +10697,15 @@
> 	 "	public static void foo(){}\n"+
> 	 "	public void foo0(){}\n"+
> 	 "}");
>-		
>+			
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethodDeclaration1.java",
>-	 "public class CompletionStaticMethodDeclaration1 extends TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	foo\n"+
>+	 "/Completion/src/CompletionStaticMethodDeclaration4.java",
>+	 "public class CompletionStaticMethodDeclaration4 {\n" +
>+	 "	void bar() {\n" +
>+	 "		class Local1 extends TypeWithAMethodAndAStaticMethod {\n" +
>+	 "			foo\n" +
>+	 "		}\n" +
>+	 "	}\n" +
> 	 "}");
> 	 
> 	 
>@@ -11073,7 +10716,7 @@
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
> 				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>@@ -11082,7 +10725,7 @@
> 		}
> 	}
> }
>-public void testCompletionStaticMethodDeclaration2() throws JavaModelException {
>+public void testCompletionStaticMethodDeclaration5() throws JavaModelException {
> 	ICompilationUnit aType = null;
> 	try {
> 		aType = getWorkingCopy(
>@@ -11093,1261 +10736,1839 @@
> 	 "}");
> 			
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethodDeclaration2.java",
>-	 "public class CompletionStaticMethodDeclaration2 {\n" +
>-	 "	class Inner1 extends TypeWithAMethodAndAStaticMethod {\n" +
>-	 "		foo\n" +
>+	 "/Completion/src/CompletionStaticMethodDeclaration5.java",
>+	 "public class CompletionStaticMethodDeclaration5 {\n"+
>+	 "	void bar() {\n"+
>+	 "		static class Local1 extends TypeWithAMethodAndAStaticMethod {\n"+
>+	 "			foo\n"+
>+	 "		}\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionStaticMethodDeclaration6() throws JavaModelException {
>+	ICompilationUnit aType = null;
>+	try {
>+		aType = getWorkingCopy(
>+	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>+	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>+	 "	public static void foo(){}\n"+
>+	 "	public void foo0(){}\n"+
>+	 "}");
>+			
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionStaticMethodDeclaration6.java",
>+	 "public class CompletionStaticMethodDeclaration6 {\n"+
>+	 "	void bar() {\n"+
>+	 "		new TypeWithAMethodAndAStaticMethod() {\n"+
>+	 "			foo\n"+
>+	 "		};\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "foo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		if(aType != null) {
>+			aType.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionSuperType() throws JavaModelException {
>+	ICompilationUnit superClass = null;
>+	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
>+	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperType.java",
>+	 "public class CompletionSuperType extends CompletionSuperClass.");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "CompletionSuperClass.";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+			"CompletionSuperClass.Inner[TYPE_REF]{Inner, , LCompletionSuperClass$Inner;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
>+	} finally {
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionSuperType2() throws JavaModelException {
>+	ICompilationUnit superClass = null;
>+	ICompilationUnit superClass2 = null;
>+	ICompilationUnit superInterface = null;
>+	ICompilationUnit superInterface2 = null;
>+	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
>+	 "}");
>+		
>+		superClass2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass2.java",
>+	 "public class CompletionSuperClass2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
>+	 "}");
>+		
>+		superInterface = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface.java",
>+	 "public interface CompletionSuperInterface{\n" +
>+	 "	public int eqFoo(int a,Object b);\n" +
>+	 "}");
>+		
>+		superInterface2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface2.java",
>+	 "public interface CompletionSuperInterface2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
>+	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperType2.java",
>+	 "public class CompletionSuperType2 extends CompletionSuper");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "CompletionSuper";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+			"CompletionSuperClass[TYPE_REF]{CompletionSuperClass, , LCompletionSuperClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+			"CompletionSuperClass2[TYPE_REF]{CompletionSuperClass2, , LCompletionSuperClass2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
>+	} finally {
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
>+		if(superClass2 != null) {
>+			superClass2.discardWorkingCopy();
>+		}
>+		if(superInterface != null) {
>+			superInterface.discardWorkingCopy();
>+		}
>+		if(superInterface2 != null) {
>+			superInterface2.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionSuperType3() throws JavaModelException {
>+	ICompilationUnit superClass = null;
>+	ICompilationUnit superClass2 = null;
>+	ICompilationUnit superInterface = null;
>+	ICompilationUnit superInterface2 = null;
>+	try {
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
> 	 "	}\n" +
> 	 "}");
>+		
>+		superClass2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass2.java",
>+	 "public class CompletionSuperClass2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
>+	 "}");
>+		
>+		superInterface = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface.java",
>+	 "public interface CompletionSuperInterface{\n" +
>+	 "	public int eqFoo(int a,Object b);\n" +
>+	 "}");
>+		
>+		superInterface2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface2.java",
>+	 "public interface CompletionSuperInterface2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
>+	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperType3.java",
>+	 "public class CompletionSuperType3 implements CompletionSuper");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>+	 String completeBehind = "CompletionSuper";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration2$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
>+			"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
>+		if(superClass2 != null) {
>+			superClass2.discardWorkingCopy();
>+		}
>+		if(superInterface != null) {
>+			superInterface.discardWorkingCopy();
>+		}
>+		if(superInterface2 != null) {
>+			superInterface2.discardWorkingCopy();
> 		}
> 	}
> }
>-public void testCompletionStaticMethodDeclaration3() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+public void testCompletionSuperType4() throws JavaModelException {
>+	ICompilationUnit superClass2 = null;
> 	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>-	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	public static void foo(){}\n"+
>-	 "	public void foo0(){}\n"+
>+		superClass2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass2.java",
>+	 "public class CompletionSuperClass2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
> 	 "}");
>-			
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethodDeclaration3.java",
>-	 "public class CompletionStaticMethodDeclaration3 {\n" +
>-	 "	static class Inner1 extends TypeWithAMethodAndAStaticMethod {\n" +
>-	 "		foo\n" +
>-	 "	}\n" +
>-	 "}");
>+	 "/Completion/src/CompletionSuperType4.java",
>+	 "public class CompletionSuperType4 extends CompletionSuperClass2.Inner");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>+	 String completeBehind = "CompletionSuperClass2.Inner";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration3$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+ "}\n"+
>+			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>+		if(superClass2 != null) {
>+			superClass2.discardWorkingCopy();
> 		}
> 	}
> }
>-public void testCompletionStaticMethodDeclaration4() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+public void testCompletionSuperType5() throws JavaModelException {
>+	ICompilationUnit superInterface2 = null;
> 	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>-	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	public static void foo(){}\n"+
>-	 "	public void foo0(){}\n"+
>+		superInterface2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface2.java",
>+	 "public interface CompletionSuperInterface2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
> 	 "}");
>-			
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethodDeclaration4.java",
>-	 "public class CompletionStaticMethodDeclaration4 {\n" +
>-	 "	void bar() {\n" +
>-	 "		class Local1 extends TypeWithAMethodAndAStaticMethod {\n" +
>-	 "			foo\n" +
>-	 "		}\n" +
>-	 "	}\n" +
>-	 "}");
>+	 "/Completion/src/CompletionSuperType5.java",
>+	 "public class CompletionSuperType5 implements CompletionSuperInterface2.Inner");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>+	 String completeBehind = "CompletionSuperInterface2.Inner";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>+		if(superInterface2 != null) {
>+			superInterface2.discardWorkingCopy();
> 		}
> 	}
> }
>-public void testCompletionStaticMethodDeclaration5() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+public void testCompletionSuperType6() throws JavaModelException {
>+	ICompilationUnit superClass = null;
>+	ICompilationUnit superClass2 = null;
>+	ICompilationUnit superInterface = null;
>+	ICompilationUnit superInterface2 = null;
> 	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>-	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	public static void foo(){}\n"+
>-	 "	public void foo0(){}\n"+
>+		superClass = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass.java",
>+	 "public class CompletionSuperClass{\n" +
>+	 "	public class Inner {}\n" +
>+	 "	public int eqFoo(int a,Object b){\n" +
>+	 "		return 1;\n" +
>+	 "	}\n" +
> 	 "}");
>-			
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethodDeclaration5.java",
>-	 "public class CompletionStaticMethodDeclaration5 {\n"+
>-	 "	void bar() {\n"+
>-	 "		static class Local1 extends TypeWithAMethodAndAStaticMethod {\n"+
>-	 "			foo\n"+
>-	 "		}\n"+
>-	 "	}\n"+
>+		
>+		superClass2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass2.java",
>+	 "public class CompletionSuperClass2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
>+	 "}");
>+		
>+		superInterface = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface.java",
>+	 "public interface CompletionSuperInterface{\n" +
>+	 "	public int eqFoo(int a,Object b);\n" +
>+	 "}");
>+		
>+		superInterface2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface2.java",
>+	 "public interface CompletionSuperInterface2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
> 	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperType6.java",
>+	 "public interface CompletionSuperType6 extends CompletionSuper");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>+	 String completeBehind = "CompletionSuper";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>+				"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE + R_NON_RESTRICTED)+"}\n" +
>+				"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE+ R_NON_RESTRICTED)+"}",
> 				requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>+		if(superClass != null) {
>+			superClass.discardWorkingCopy();
>+		}
>+		if(superClass2 != null) {
>+			superClass2.discardWorkingCopy();
>+		}
>+		if(superInterface != null) {
>+			superInterface.discardWorkingCopy();
>+		}
>+		if(superInterface2 != null) {
>+			superInterface2.discardWorkingCopy();
> 		}
> 	}
> }
>-public void testCompletionStaticMethodDeclaration6() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+public void testCompletionSuperType7() throws JavaModelException {
>+	ICompilationUnit superClass2 = null;
> 	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>-	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	public static void foo(){}\n"+
>-	 "	public void foo0(){}\n"+
>+		superClass2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperClass2.java",
>+	 "public class CompletionSuperClass2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
> 	 "}");
>-			
>+		
> 		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethodDeclaration6.java",
>-	 "public class CompletionStaticMethodDeclaration6 {\n"+
>-	 "	void bar() {\n"+
>-	 "		new TypeWithAMethodAndAStaticMethod() {\n"+
>-	 "			foo\n"+
>-	 "		};\n"+
>-	 "	}\n"+
>-	 "}");
>+	 "/Completion/src/CompletionSuperType7.java",
>+	 "public interface CompletionSuperType7 extends CompletionSuperClass2.Inner");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>+	 String completeBehind = "CompletionSuperClass2.Inner";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>-		}
>-	}
>-}
>-public void testCompletionStaticMethod1() throws JavaModelException {
>-	ICompilationUnit aType = null;
>-	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/TypeWithAMethodAndAStaticMethod .java",
>-	 "public class TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	public static void foo(){}\n"+
>-	 "	public void foo0(){}\n"+
>-	 "}");
>-			
>-		this.wc = getWorkingCopy(
>-	 "/Completion/src/CompletionStaticMethod1.java",
>-	 "public class CompletionStaticMethod1 extends TypeWithAMethodAndAStaticMethod {\n"+
>-	 "	void bar(){\n"+
>-	 "		new TypeWithAMethodAndAStaticMethod(){\n"+
>-	 "			class Inner1 extends TypeWithAMethodAndAStaticMethod {\n"+
>-	 "				void bar(){\n"+
>-	 "					foo\n"+
>-	 "				}\n"+
>-	 "			}\n"+
>-	 "		};\n"+
>-	 "	}\n"+
>-	 "	\n"+
>+		if(superClass2 != null) {
>+			superClass2.discardWorkingCopy();
>+		}
>+	}
>+}
>+public void testCompletionSuperType8() throws JavaModelException {
>+	ICompilationUnit superInterface2 = null;
>+	try {
>+		superInterface2 = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperInterface2.java",
>+	 "public interface CompletionSuperInterface2 {\n" +
>+	 "	public class InnerClass {}\n" +
>+	 "	public interface InnerInterface {}\n" +
> 	 "}");
>+		
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionSuperType8.java",
>+	 "public interface CompletionSuperType8 extends CompletionSuperInterface2.Inner");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "foo";
>+	 String completeBehind = "CompletionSuperInterface2.Inner";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"foo0[METHOD_REF]{CompletionStaticMethod1.this.foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"foo0[METHOD_REF]{foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
>-				"foo[METHOD_REF]{CompletionStaticMethod1.foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}\n" +
>-				"foo[METHOD_REF]{foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>+			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
>+			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>+		if(superInterface2 != null) {
>+			superInterface2.discardWorkingCopy();
> 		}
> 	}
> }
>-public void testCompletionAfterSwitch() throws JavaModelException {
>+public void testCompletionThrowStatement() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionAfterSwitch.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionThrowStatement.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "bar";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "Ex";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:bar completion:bar() relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME+ R_NON_RESTRICTED),
>+		"element:Exception completion:Exception relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionToplevelType1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "p3", "CompletionToplevelType1.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "CompletionToplevelType1";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:CompletionToplevelType1 completion:CompletionToplevelType1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionAfterSupercall1() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionAfterSupercall1.java",
>-		"public class CompletionAfterSupercall1 extends CompletionAfterSupercall1_1 {\n" +
>-		"	public void foo(){\n" +
>-		"		super.foo\n" +
>-		"	}\n" +
>-		"}\n" +
>-		"abstract class CompletionAfterSupercall1_1 extends CompletionAfterSupercall1_2 implements CompletionAfterSupercall1_3 {\n" +
>-		"	\n" +
>-		"}\n" +
>-		"class CompletionAfterSupercall1_2 implements CompletionAfterSupercall1_3 {\n" +
>-		"	public void foo(){}\n" +
>-		"}\n" +
>-		"interface CompletionAfterSupercall1_3 {\n" +
>-		"	public void foo();\n" +
>-		"}");
>+public void testCompletionType1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionType1.java");
> 
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "super.foo";
>+	String str = cu.getSource();
>+	String completeBehind = "CT1";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertResults(
>-			"foo[METHOD_REF]{foo(), LCompletionAfterSupercall1_2;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
>+	assertEquals(
>+		"element:CT1 completion:CT1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
>+		"element:CT1 completion:q2.CT1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionUnaryOperator1() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnaryOperator1.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
> 			requestor.getResults());
> }
>-public void testCompletionPackageAndClass1() throws JavaModelException {
>+public void testCompletionUnaryOperator2() throws JavaModelException {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnaryOperator2.java");
>+
>+		String str = cu.getSource();
>+		String completeBehind = "var";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
>+
>+		assertEquals(
>+			"element:var1 completion:var1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+			"element:var2 completion:var2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
>+			"element:var3 completion:var3 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+}
>+/*
>+ * bug : http://dev.eclipse.org/bugs/show_bug.cgi?id=24440
>+ */
>+public void testCompletionUnresolvedEnclosingType() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "z1.z2.qla0", "Qla3.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedEnclosingType.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "z1.z2.ql";
>+	String completeBehind = "new ZZZ(";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertTrue(
>+		requestor.getResults().length() == 0);
>+}
>+public void testCompletionUnresolvedFieldType() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedFieldType.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "bar";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:Qla1 completion:z1.z2.Qla1 relevance:" + (R_DEFAULT + R_INTERESTING + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:qla2 completion:z1.z2.qla2 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
>-			"element:z1.z2.qla0 completion:z1.z2.qla0 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:barPlus completion:barPlus() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionPackageAndClass2() throws JavaModelException {
>+public void testCompletionUnresolvedParameterType() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "z1.z2.qla0", "Wla.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedParameterType.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "z1.z2.qla0.";
>+	String completeBehind = "bar";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:Qla3 completion:Qla3 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
>-			"element:Qla4 completion:Qla4 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
>-			"element:Wla completion:Wla relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:barPlus completion:barPlus() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionNonStaticFieldRelevance() throws JavaModelException {
>+public void testCompletionUnresolvedReturnType() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionNonStaticFieldRelevance.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionUnresolvedReturnType.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "var.Ii";
>+	String completeBehind = "bar";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:Ii0 completion:Ii0 relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
>-			"element:ii1 completion:ii1 relevance:" + (R_DEFAULT + R_INTERESTING + R_NON_STATIC+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:barPlus completion:barPlus() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionInsideStaticMethod() throws JavaModelException {
>+public void testCompletionVariableInitializerInInitializer1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionInsideStaticMethod.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "doT";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:doTheThing completion:doTheThing() relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionVariableInitializerInInitializer2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer2.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionVariableInitializerInInitializer3() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer3.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionVariableInitializerInInitializer4() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInInitializer4.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionVariableInitializerInMethod1() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod1.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionVariableInitializerInMethod2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod2.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "zz";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:zzObject completion:zzObject relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzboolean completion:zzboolean relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzdouble completion:zzdouble relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzint completion:zzint relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:zzlong completion:zzlong relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-/*
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=65737
>- */
>-public void testCompletion2InterfacesWithSameMethod() throws JavaModelException {
>+public void testCompletionVariableInitializerInMethod3() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "Completion2InterfacesWithSameMethod.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod3.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "var.meth";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:method completion:method() relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-/*
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=66570
>- */
>-public void testCompletionExactNameCaseInsensitive() throws JavaModelException {
>+public void testCompletionVariableInitializerInMethod4() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionExactNameCaseInsensitive.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableInitializerInMethod4.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "(compleTionexactnamecaseInsensitive";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "Objec";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:CompletionExactNameCaseInsensitive completion:CompletionExactNameCaseInsensitive relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
>-			"element:CompletionExactNameCaseInsensitivePlus completion:CompletionExactNameCaseInsensitivePlus relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:Object completion:Object relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
> /*
>- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=66908
>- */
>-public void testCompletionSameClass() throws JavaModelException {
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25811
>+*/
>+public void testCompletionVariableName1() throws JavaModelException {
> 	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionSameClass.java");
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableName1.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "(CompletionSameClas";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	String completeBehind = "TEST_FOO_MyClass ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
> 	assertEquals(
>-			"element:CompletionSameClass completion:CompletionSameClass relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
>-			requestor.getResults());
>+		"element:class1 completion:class1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:myClass completion:myClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
>-public void testCompletionBasicPackage1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicPackage1.java");
>+public void testCompletionVariableName10() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
> 
>-	String str = cu.getSource();
>-	String completeBehind = "java.lan";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	try {
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName10.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName10 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar fo\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "fo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	 assertResults(
>+				"foBar[VARIABLE_DECLARATION]{foBar, null, LFooBar;, foBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"foBarsuf[VARIABLE_DECLARATION]{foBarsuf, null, LFooBar;, foBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>+				"fooBar[VARIABLE_DECLARATION]{fooBar, null, LFooBar;, fooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>+				"fooBarsuf[VARIABLE_DECLARATION]{fooBarsuf, null, LFooBar;, fooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+public void testCompletionVariableName11() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
> 
>-	assertResults(
>-			"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+	try {
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName11.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName11 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar pr\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "pr";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	 assertResults(
>+				"preBar[VARIABLE_DECLARATION]{preBar, null, LFooBar;, preBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preFooBar[VARIABLE_DECLARATION]{preFooBar, null, LFooBar;, preFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preBarsuf[VARIABLE_DECLARATION]{preBarsuf, null, LFooBar;, preBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX+ R_NON_RESTRICTED)+"}\n"+
>+				"preFooBarsuf[VARIABLE_DECLARATION]{preFooBarsuf, null, LFooBar;, preFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
> }
>-public void testCompletionBasicType1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicType1.java");
>+public void testCompletionVariableName12() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
> 
>-	String str = cu.getSource();
>-	String completeBehind = "Objec";
>-	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+	try {
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName12.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName12 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar prethe\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "prethe";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	 assertResults(
>+				"preTheBar[VARIABLE_DECLARATION]{preTheBar, null, LFooBar;, preTheBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preTheFooBar[VARIABLE_DECLARATION]{preTheFooBar, null, LFooBar;, preTheFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preTheBarsuf[VARIABLE_DECLARATION]{preTheBarsuf, null, LFooBar;, preTheBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preTheFooBarsuf[VARIABLE_DECLARATION]{preTheFooBarsuf, null, LFooBar;, preTheFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+public void testCompletionVariableName13() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
> 
>-	assertResults(
>-			"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+	try {
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName13.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName13 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar prefo\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "prefo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	 assertResults(
>+				"preFoBar[VARIABLE_DECLARATION]{preFoBar, null, LFooBar;, preFoBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preFoBarsuf[VARIABLE_DECLARATION]{preFoBarsuf, null, LFooBar;, preFoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preFooBar[VARIABLE_DECLARATION]{preFooBar, null, LFooBar;, preFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>+				"preFooBarsuf[VARIABLE_DECLARATION]{preFooBarsuf, null, LFooBar;, preFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+public void testCompletionVariableName14() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
>+	try {
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName14.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName14 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar prethefo\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "prethefo";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	 assertResults(
>+				"preThefoBar[VARIABLE_DECLARATION]{preThefoBar, null, LFooBar;, preThefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preThefoBarsuf[VARIABLE_DECLARATION]{preThefoBarsuf, null, LFooBar;, preThefoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>+				"preTheFooBar[VARIABLE_DECLARATION]{preTheFooBar, null, LFooBar;, preTheFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>+				"preTheFooBarsuf[VARIABLE_DECLARATION]{preTheFooBarsuf, null, LFooBar;, preTheFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
> }
>-public void testCompletionBasicField1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicField1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zzvar";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=128045
>+public void testCompletionVariableName15() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
> 
>-	assertResults(
>-			"zzvarzz[FIELD_REF]{zzvarzz, LCompletionBasicField1;, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+	try {
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName15.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName15 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar pro\n"+
>+	 "	}\n"+
>+	 "}");
>+	 
>+	 
>+	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	 String str = this.wc.getSource();
>+	 String completeBehind = "pro";
>+	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	 assertResults(
>+				"proBar[VARIABLE_DECLARATION]{proBar, null, LFooBar;, proBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"proFooBar[VARIABLE_DECLARATION]{proFooBar, null, LFooBar;, proFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"proBarsuf[VARIABLE_DECLARATION]{proBarsuf, null, LFooBar;, proBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"proFooBarsuf[VARIABLE_DECLARATION]{proFooBarsuf, null, LFooBar;, proFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
> }
>-public void testCompletionBasicMethod1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicMethod1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zzfo";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName16() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		Object ;\n"+
>+ "		foo = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"zzfoo[METHOD_REF]{zzfoo(), LCompletionBasicMethod1;, ()V, zzfoo, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-public void testCompletionBasicLocalVariable1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicLocalVariable1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "zzvar";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName17() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		Object foo1;\n"+
>+ "		/*here*/Object ;\n"+
>+ "		Object foo3;\n"+
>+ "		foo1 = null;\n"+
>+ "		foo2 = null;\n"+
>+ "		foo3 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"zzvarzz[LOCAL_VARIABLE_REF]{zzvarzz, null, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-public void testCompletionBasicKeyword1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicKeyword1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "whil";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName18() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		Object ;\n"+
>+ "		foo = Test.class;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"while[KEYWORD]{while, null, null, while, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-public void testCompletionBasicVariableDeclaration1() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName19() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/CompletionBasicVariableDeclaration1.java",
>-		"public class CompletionBasicVariableDeclaration1 {\n"+
>-		"	public Object obj;\n"+
>-		"}\n");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "obj";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	assertResults(
>-		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>-		requestor.getResults());
>-}
>-public void testCompletionBasicMethodDeclaration1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicMethodDeclaration1.java");
>-
>-	String str = cu.getSource();
>-	String completeBehind = "equals";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	cu.codeComplete(cursorLocation, requestor);
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		Object ;\n"+
>+ "		object = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"equals[POTENTIAL_METHOD_DECLARATION]{equals, LCompletionBasicMethodDeclaration1;, ()V, equals, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-public void testCompletionBasicAnonymousDeclaration1() throws JavaModelException {
>-	CompletionResult result = complete(
>-			"/Completion/src3/test0000/CompletionBasicCompletionContext.java",
>-			"public class CompletionBasicAnonymousDeclaration1 {\n"+
>-			"	void foo() {\n"+
>-			"		new Object(\n"+
>-			"	}\n"+
>-			"}",
>-			"new Object(");
>-	
>-	assertResults(
>-			"expectedTypesSignatures=null\n" +
>-			"expectedTypesKeys=null",
>-			result.context);
>-	
>-	assertResults(
>-			"Object[ANONYMOUS_CLASS_DECLARATION]{, Ljava.lang.Object;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"Object[METHOD_REF<CONSTRUCTOR>]{, Ljava.lang.Object;, ()V, Object, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>-			result.proposals);
>-}
>-public void testCompletionBasicCompletionContext() throws JavaModelException {
>-	CompletionResult result = complete(
>-			"/Completion/src3/test0000/CompletionBasicCompletionContext.java",
>-			"package test0000;\n" +
>-			"public class CompletionBasicCompletionContext {\n" +
>-			" void bar(String o) {\n" +
>-			" String zzz = null; \n" + 
>-			" o = zzz\n" + 
>-			" }\n" +
>-			"}",
>-			"zzz");
>-	
>-	assertResults(
>-			"expectedTypesSignatures={Ljava.lang.String;}\n" +
>-			"expectedTypesKeys={Ljava/lang/String;}",
>-			result.context);
>-	
>-	assertResults(
>-			"zzz[LOCAL_VARIABLE_REF]{zzz, null, Ljava.lang.String;, zzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-			result.proposals);
>-}
>-public void testCompletionBasicPotentialMethodDeclaration1() throws JavaModelException {
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2();
>-	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionBasicPotentialMethodDeclaration1.java");
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25811
>+*/
>+public void testCompletionVariableName2() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableName2.java");
> 
> 	String str = cu.getSource();
>-	String completeBehind = "zzpot";
>+	String completeBehind = "Test_Bar_MyClass ";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	cu.codeComplete(cursorLocation, requestor);
> 
>-	assertResults(
>-			"zzpot[POTENTIAL_METHOD_DECLARATION]{zzpot, LCompletionBasicPotentialMethodDeclaration1;, ()V, zzpot, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
>+	assertEquals(
>+		"element:bar_MyClass completion:bar_MyClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:class1 completion:class1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:myClass completion:myClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
>+		"element:test_Bar_MyClass completion:test_Bar_MyClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName20() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		class X {\n"+
>+ "		 Object foo1 = foo2;\n"+
>+ "		 void bar() {\n"+
>+ "		 foo1 = null;\n"+
>+ "		 Object foo3 = foo4;\n"+
>+ "		 foo3 = null;\n"+
>+ "		 }\n"+
>+ "		}\n"+
>+ "		foo5 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+ 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=82740
>-public void testCompletionInsideGenericClass() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideGenericClass.java",
>-			"package test;\n" +
>-			"public class CompletionInsideGenericClass <CompletionInsideGenericClassParameter> {\n" +
>-			" CompletionInsideGenericClas\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "CompletionInsideGenericClas";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName21() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		{\n"+
>+ "		 /*here*/Object ;\n"+
>+ "		 foo1 = null;\n"+
>+ "		}\n"+
>+ "		foo2 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"CompletionInsideGenericClas[POTENTIAL_METHOD_DECLARATION]{CompletionInsideGenericClas, Ltest.CompletionInsideGenericClass;, ()V, CompletionInsideGenericClas, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionInsideGenericClass[TYPE_REF]{CompletionInsideGenericClass, test, Ltest.CompletionInsideGenericClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+ 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName22() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		Object foo1;\n"+
>+ "		/*here*/Object ;\n"+
>+ "		{\n"+
>+ "		 Object foo3;\n"+
>+ "		 foo1 = null;\n"+
>+ "		 foo2 = null;\n"+
>+ "		 foo3 = null;\n"+
>+ "		}\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends1() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends1.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends1 extends {\n" +
>-			" public class CompletionInsideExtends1Inner {}\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends1TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} else {
>-		assertResults(
>-				"CompletionInsideExtends1TopLevel[TYPE_REF]{CompletionInsideExtends1TopLevel, test, Ltest.CompletionInsideExtends1TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	}
>-	
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends2() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends2.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends2 extends CompletionInsideExtends {\n" +
>-			" public class CompletionInsideExtends2Inner {}\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends2TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends CompletionInsideExtends";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName23() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		foo1 = null;\n"+
>+ "		#\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"CompletionInsideExtends2TopLevel[TYPE_REF]{CompletionInsideExtends2TopLevel, test, Ltest.CompletionInsideExtends2TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends3() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends3.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends3 {\n" +
>-			" public class CompletionInsideExtends3Inner extends {\n" +
>-			" public class CompletionInsideExtends3InnerInner {\n" +
>-			" }\n" +
>-			" }\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends3TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName24() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		#\n"+
>+ "		foo1 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} else {
>-		assertResults(
>-				"CompletionInsideExtends3[TYPE_REF]{CompletionInsideExtends3, test, Ltest.CompletionInsideExtends3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionInsideExtends3TopLevel[TYPE_REF]{CompletionInsideExtends3TopLevel, test, Ltest.CompletionInsideExtends3TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	}
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends4() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends4.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends4 {\n" +
>-			" public class CompletionInsideExtends4Inner extends CompletionInsideExtends{\n" +
>-			" public class CompletionInsideExtends4InnerInner {\n" +
>-			" }\n" +
>-			" }\n" +
>-			"\n}" +
>-			"class CompletionInsideExtends4TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends CompletionInsideExtends";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName25() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		#\n"+
>+ "		foo1 = null;\n"+
>+ "		#\n"+
>+ "		foo2 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"CompletionInsideExtends4[TYPE_REF]{CompletionInsideExtends4, test, Ltest.CompletionInsideExtends4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionInsideExtends4TopLevel[TYPE_REF]{CompletionInsideExtends4TopLevel, test, Ltest.CompletionInsideExtends4TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends5() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends5.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends5 {\n" +
>-			" void foo() {\n" +
>-			" public class CompletionInsideExtends5Inner extends {\n" +
>-			" public class CompletionInsideExtends5InnerInner {\n" +
>-			" }\n" +
>-			" }\n" +
>-			" }\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends5TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName26() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		#\n"+
>+ "		foo1 = null;\n"+
>+ "		#\n"+
>+ "		foo2 = null;\n"+
>+ "		#\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} else {
>-		assertResults(
>-				"CompletionInsideExtends5[TYPE_REF]{CompletionInsideExtends5, test, Ltest.CompletionInsideExtends5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionInsideExtends5TopLevel[TYPE_REF]{CompletionInsideExtends5TopLevel, test, Ltest.CompletionInsideExtends5TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	}
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends6() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends6.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends6 {\n" +
>-			" void foo() {\n" +
>-			" public class CompletionInsideExtends6Inner extends CompletionInsideExtends {\n" +
>-			" public class CompletionInsideExtends6InnerInner {\n" +
>-			" }\n" +
>-			" }\n" +
>-			" }\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends6TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends CompletionInsideExtends";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName27() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		Object foo0 = null;\n"+
>+ "		foo0 = null;\n"+
>+ "		#\n"+
>+ "		class X {\n"+
>+ "		 Object foo1 = foo2;\n"+
>+ "		 void bar() {\n"+
>+ "		 foo1 = null;\n"+
>+ "		 Object foo3 = foo4;\n"+
>+ "		 foo3 = null;\n"+
>+ "		 }\n"+
>+ "		}\n"+
>+ "		foo5 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"CompletionInsideExtends6[TYPE_REF]{CompletionInsideExtends6, test, Ltest.CompletionInsideExtends6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionInsideExtends6TopLevel[TYPE_REF]{CompletionInsideExtends6TopLevel, test, Ltest.CompletionInsideExtends6TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+ 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends7() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends7.java",
>-			"package test;\n" +
>-			"public interface CompletionInsideExtends7 extends {\n" +
>-			" public interface CompletionInsideExtends7Inner {}\n" +
>-			"}\n" +
>-			"interface CompletionInsideExtends7TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName28() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		Object foo1 = null;\n"+
>+ "		foo1.foo2 = null;\n"+
>+ "		foo3.foo4 = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} else {
>-		assertResults(
>-				"CompletionInsideExtends7TopLevel[TYPE_REF]{CompletionInsideExtends7TopLevel, test, Ltest.CompletionInsideExtends7TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	}
>+ assertResults(
>+ 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"foo3[VARIABLE_DECLARATION]{foo3, null, Ljava.lang.Object;, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends8() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends8.java",
>-			"package test;\n" +
>-			"public interface CompletionInsideExtends8 extends CompletionInsideExtends {\n" +
>-			" public interface CompletionInsideExtends8Inner {}\n" +
>-			"}\n" +
>-			"interface CompletionInsideExtends8TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends CompletionInsideExtends";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName29() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void foo(){\n"+
>+ "		/*here*/Object ;\n"+
>+ "		class X {\n"+
>+ "			void bar1() {\n"+
>+ "				var1 = null;\n"+
>+ "			}\n"+
>+ "			void bar2() {\n"+
>+ "				Object var2 = null;\n"+
>+ "				var2 = null;\n"+
>+ "			}\n"+
>+ "			void bar3() {\n"+
>+ "				Object var3 = null;\n"+
>+ "				{\n"+
>+ "					var3 = null;\n"+
>+ "					Object var4 = null;\n"+
>+ "				}\n"+
>+ "				var4 = null;\n"+
>+ "			}\n"+
>+ "		}\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/*here*/Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"CompletionInsideExtends8TopLevel[TYPE_REF]{CompletionInsideExtends8TopLevel, test, Ltest.CompletionInsideExtends8TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+ 		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+ 		"var1[VARIABLE_DECLARATION]{var1, null, Ljava.lang.Object;, var1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"var4[VARIABLE_DECLARATION]{var4, null, Ljava.lang.Object;, var4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends9() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends9.java",
>-			"package test;\n" +
>-			"public interface CompletionInsideExtends9 {\n" +
>-			" public interface CompletionInsideExtends9Inner extends {\n" +
>-			" public interface CompletionInsideExtends9InnerInner {\n" +
>-			" }\n" +
>-			" }\n" +
>-			"}\n" +
>-			"interface CompletionInsideExtends9TopLevel {\n" +
>-			"}");
>-	
>+public void testCompletionVariableName3() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"p1,p2"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"s1,s2"); //$NON-NLS-1$
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	JavaCore.setOptions(options);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} else {
>-		assertResults(
>-				"CompletionInsideExtends9[TYPE_REF]{CompletionInsideExtends9, test, Ltest.CompletionInsideExtends9;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionInsideExtends9TopLevel[TYPE_REF]{CompletionInsideExtends9TopLevel, test, Ltest.CompletionInsideExtends9TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	}
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends10() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends10.java",
>-			"package test;\n" +
>-			"public interface CompletionInsideExtends10 {\n" +
>-			" public interface CompletionInsideExtends10Inner extends CompletionInsideExtends{\n" +
>-			" public interface CompletionInsideExtends10InnerInner {\n" +
>-			" }\n" +
>-			" }\n" +
>-			"}\n" +
>-			"interface CompletionInsideExtends10TopLevel {\n" +
>-			"}");
>+	try {
>+		CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+		ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableName3.java");
> 	
>+		String str = cu.getSource();
>+		String completeBehind = "OneName ";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		cu.codeComplete(cursorLocation, requestor);
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "extends CompletionInsideExtends";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+		assertEquals(
>+			"element:name completion:name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:names1 completion:names1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:names2 completion:names2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:oneName completion:oneName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
>+			"element:oneNames1 completion:oneNames1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:oneNames2 completion:oneNames2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p1Name completion:p1Name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p1Names1 completion:p1Names1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p1Names2 completion:p1Names2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p1OneName completion:p1OneName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p1OneNames1 completion:p1OneNames1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p1OneNames2 completion:p1OneNames2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p2Name completion:p2Name relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p2Names1 completion:p2Names1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p2Names2 completion:p2Names2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p2OneName completion:p2OneName relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p2OneNames1 completion:p2OneNames1 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
>+			"element:p2OneNames2 completion:p2OneNames2 relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX+ R_NON_RESTRICTED),
>+			requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName30() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	public Test(){\n"+
>+ "		Object ;\n"+
>+ "		foo = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"CompletionInsideExtends10.CompletionInsideExtends10Inner.CompletionInsideExtends10InnerInner[TYPE_REF]{test.CompletionInsideExtends10.CompletionInsideExtends10Inner.CompletionInsideExtends10InnerInner, test, Ltest.CompletionInsideExtends10$CompletionInsideExtends10Inner$CompletionInsideExtends10InnerInner;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionInsideExtends10[TYPE_REF]{CompletionInsideExtends10, test, Ltest.CompletionInsideExtends10;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionInsideExtends10TopLevel[TYPE_REF]{CompletionInsideExtends10TopLevel, test, Ltest.CompletionInsideExtends10TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends11() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends11.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends11 implements {\n" +
>-			" public class CompletionInsideExtends11Inner {\n" +
>-			" }\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends11TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "implements ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName31() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	{\n"+
>+ "		Object ;\n"+
>+ "		foo = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	} else {
>-		assertResults(
>-				"",
>-				requestor.getResults());
>-	}
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=78151
>-public void testCompletionInsideExtends12() throws JavaModelException {
>-	this.wc = getWorkingCopy(
>-			"/Completion/src/test/CompletionInsideExtends12.java",
>-			"package test;\n" +
>-			"public class CompletionInsideExtends12 implements CompletionInsideExtends {\n" +
>-			" public class CompletionInsideExtends12Inner {\n" +
>-			" }\n" +
>-			"}\n" +
>-			"class CompletionInsideExtends12TopLevel {\n" +
>-			"}");
>-	
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.wc.getSource();
>-	String completeBehind = "implements CompletionInsideExtends";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
>+public void testCompletionVariableName32() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void bar(Object ) {\n"+
>+ "		foo = null;\n"+
>+ "	}\n"+
>+ "}");
>+ 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "Object ";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>-			"",
>+ assertResults(
>+			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=84690
>-public void testCompletionArrayLength() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionArrayLength.java",
>- "package test;\n" +
>- "public class CompletionArrayLength {\n" +
>- " public void foo() {\n" +
>- " long[] var;\n" +
>- " var.leng\n" +
>- " }" +
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162743
>+public void testCompletionVariableName33() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	void bar() {\n"+
>+ "		/**/int v\n"+
>+ "		variable = null;\n"+
>+ "		variable = null;\n"+
>+ "		variable = null;\n"+
>+ "	}\n"+
> "}");
> 
>+ CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/**/int v";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"variable[VARIABLE_DECLARATION]{variable, null, I, variable, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162968
>+public void testCompletionVariableName34() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+ "/Completion/src/test/Test.java",
>+ "package test;\n"+
>+ "public class Test {\n"+
>+ "	int vDefined;\n"+
>+ "	void bar() {\n"+
>+ "		/**/int v\n"+
>+ "		System.out.println(vUnknown);\n"+
>+ "		System.out.println(vUnknown);\n"+
>+ "	}\n"+
>+ "}");
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "leng";
>+ String str = this.workingCopies[0].getSource();
>+ String completeBehind = "/**/int v";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+ this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>- "length[FIELD_REF]{length, [J, I, length, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>+			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"vUnknown[VARIABLE_DECLARATION]{vUnknown, null, I, vUnknown, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=84690
>-public void testCompletionArrayClone() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionArrayClone.java",
>- "package test;\n" +
>- "public class CompletionArrayClone {\n" +
>- " public void foo() {\n" +
>- " long[] var;\n" +
>- " var.clon\n" +
>- " }\n" +
>+public void testCompletionVariableName4() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionVariableName4.java",
>+ "class FooBar {\n"+
>+ "}\n"+
>+ "public class CompletionVariableName4 {\n"+
>+ "	void foo(){\n"+
>+ "		FooBar the\n"+
>+ "	}\n"+
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "clon";
>+ String completeBehind = "the";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> assertResults(
>- "clone[METHOD_REF]{clone(), [J, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>+ 		"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-public void testCompletionAllMemberTypes() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionAllMemberTypes.java",
>- "package test;\n" +
>- "public class CompletionAllMemberTypes {\n" +
>- " class Member1 {\n" +
>- " class Member2 {\n" +
>- " class Member3 {\n" +
>- " }\n" +
>- " }\n" +
>- " void foo(){\n" +
>- " Member\n" +
>- " }\n" +
>- " \n}" +
>+public void testCompletionVariableName5() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionVariableName5.java",
>+ "class FooBar {\n"+
>+ "}\n"+
>+ "public class CompletionVariableName5 {\n"+
>+ "	void foo(){\n"+
>+ "		FooBar thefo\n"+
>+ "	}\n"+
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "Member";
>+ String completeBehind = "thefo";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>- "CompletionAllMemberTypes.Member1.Member2.Member3[TYPE_REF]{test.CompletionAllMemberTypes.Member1.Member2.Member3, test, Ltest.CompletionAllMemberTypes$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>+ assertResults(
>+ 		"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-public void testCompletionAllMemberTypes2() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionAllMemberTypes2.java",
>- "package test;\n" +
>- "public class CompletionAllMemberTypes2 {\n" +
>- " class Member1 {\n" +
>- " class Member5 {\n" +
>- " class Member6 {\n" +
>- " }\n" +
>- " }\n" +
>- " class Member2 {\n" +
>- " class Member3 {\n" +
>- " class Member4 {\n" +
>- " }\n" +
>- " }\n" +
>- " void foo(){\n" +
>- " Member\n" +
>- " }\n" +
>- " }\n" +
>- " \n}" +
>+public void testCompletionVariableName6() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionVariableName6.java",
>+ "class FooBar {\n"+
>+ "}\n"+
>+ "public class CompletionVariableName6 {\n"+
>+ "	void foo(){\n"+
>+ "		FooBar theba\n"+
>+ "	}\n"+
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> String str = this.wc.getSource();
>- String completeBehind = "Member";
>+ String completeBehind = "theba";
> int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	assertResults(
>- "CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>+ assertResults(
>+ 		"thebaFooBar[VARIABLE_DECLARATION]{thebaFooBar, null, LFooBar;, thebaFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-public void testCompletionAllMemberTypes3() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/CompletionAllMemberTypes2.java",
>- "package test;\n" +
>- "public interface CompletionAllMemberTypes2 {\n" +
>- " interface Member1 {\n" +
>- " interface Member5 {\n" +
>- " interface Member6 {\n" +
>- " }\n" +
>- " }\n" +
>- " interface Member2 {\n" +
>- " interface Member3 {\n" +
>- " interface Member4 {\n" +
>- " }\n" +
>- " }\n" +
>- " Member\n" +
>- " }\n" +
>- " \n}" +
>+public void testCompletionVariableName7() throws JavaModelException {
>+	this.wc = getWorkingCopy(
>+ "/Completion/src/CompletionVariableName7.java",
>+ "class FooBar {\n"+
>+ "}\n"+
>+ "public class CompletionVariableName7 {\n"+
>+ "	void foo(){\n"+
>+ "		FooBar fo\n"+
>+ "	}\n"+
> "}");
> 
> 
> CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "Member";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	assertResults(
>- "Member[POTENTIAL_METHOD_DECLARATION]{Member, Ltest.CompletionAllMemberTypes2$Member1$Member2;, ()V, Member, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>-}
>-public void testCompletionAllMemberTypes4() throws JavaModelException {
>-	ICompilationUnit anInterface = null;
>-	try {
>-		anInterface = getWorkingCopy(
>-	 "/Completion/src/test/AnInterface.java",
>-	 "package test;\n" +
>-	 "public interface AnInterface {\n" +
>-	 " public interface Member1 {\n" +
>-	 " public interface Member5 {\n" +
>-	 " public interface Member6 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " public interface Member2 {\n" +
>-	 " public interface Member3 {\n" +
>-	 " interface Member4 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " Member\n" +
>-	 " }\n" +
>-	 " \n}" +
>-	 "}");
>-		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/CompletionAllMemberTypes2.java",
>-	 "package test;\n" +
>-	 "public class CompletionAllMemberTypes2 {\n" +
>-	 " class Member1 {\n" +
>-	 " class Member5 {\n" +
>-	 " class Member6 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " class Member2 implements AnInterface {\n" +
>-	 " class Member3 {\n" +
>-	 " class Member4 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " void foo(){\n" +
>-	 " Member\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " \n}" +
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "Member";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>- 	assertResults(
>-	 "AnInterface.Member1.Member2[TYPE_REF]{test.AnInterface.Member1.Member2, test, Ltest.AnInterface$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AnInterface.Member1.Member2.Member3[TYPE_REF]{test.AnInterface.Member1.Member2.Member3, test, Ltest.AnInterface$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AnInterface.Member1.Member2.Member3.Member4[TYPE_REF]{test.AnInterface.Member1.Member2.Member3.Member4, test, Ltest.AnInterface$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AnInterface.Member1.Member5[TYPE_REF]{test.AnInterface.Member1.Member5, test, Ltest.AnInterface$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AnInterface.Member1.Member5.Member6[TYPE_REF]{test.AnInterface.Member1.Member5.Member6, test, Ltest.AnInterface$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AnInterface.Member1[TYPE_REF]{Member1, test, Ltest.AnInterface$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-	 requestor.getResults());
>-	} finally {
>-		if(anInterface != null) {
>-			anInterface.discardWorkingCopy();
>-		}
>-	}
>-}
>-public void testCompletionAllMemberTypes5() throws JavaModelException {
>-	ICompilationUnit aType = null;
>-	Hashtable oldCurrentOptions = JavaCore.getOptions();
>-	try {
>-		Hashtable options = new Hashtable(oldCurrentOptions);
>-		options.put(JavaCore.CODEASSIST_VISIBILITY_CHECK, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		aType = getWorkingCopy(
>-	 "/Completion/src/test/AType.java",
>-	 "package test;\n" +
>-	 "public class AType {\n" +
>-	 " public class Member1 {\n" +
>-	 " private class Member2 {\n" +
>-	 " public class Member3 {\n" +
>-	 " public class Member4 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " \n}" +
>-	 "}");
>-		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/CompletionAllMemberTypes5.java",
>-	 "package test;\n" +
>-	 "public class CompletionAllMemberTypes5 {\n" +
>-	 " void foo(){\n" +
>-	 " Member\n" +
>-	 " }\n" +
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "Member";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>- 	// AType.Member1.Member2.Member3 and AType.Member1.Member2.Member3.Member4 should not be proposed because they are not visible.
>- 	// But visibility need modifiers of enclosing types to be computed. 
>- 	assertResults(
>-	 "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AType.Member1.Member2.Member3.Member4[TYPE_REF]{test.AType.Member1.Member2.Member3.Member4, test, Ltest.AType$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>-	 requestor.getResults());
>-	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>-		}
>-		JavaCore.setOptions(oldCurrentOptions);
>-	}
>+ String str = this.wc.getSource();
>+ String completeBehind = "fo";
>+ int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+ this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+ assertResults(
>+			"foBar[VARIABLE_DECLARATION]{foBar, null, LFooBar;, foBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+			"fooBar[VARIABLE_DECLARATION]{fooBar, null, LFooBar;, fooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-public void testCompletionAllMemberTypes6() throws JavaModelException {
>-	Hashtable oldCurrentOptions = JavaCore.getOptions();
>+
>+public void testCompletionVariableName8() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldCurrentOptions);
>-		options.put(JavaCore.CODEASSIST_VISIBILITY_CHECK, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/CompletionAllMemberTypes6.java",
>-	 "package test;\n" +
>-	 "class AType {\n" +
>-	 " public class Member1 {\n" +
>-	 " private class Member2 {\n" +
>-	 " public class Member3 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 "}\n" +
>-	 "public class CompletionAllMemberTypes6 {\n" +
>-	 " void foo(){\n" +
>-	 " Member\n" +
>-	 " }\n" +
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName8.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName8 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar the\n"+
>+	 "	}\n"+
> 	 "}");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "Member";
>+	 String completeBehind = "the";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>- 	assertResults(
>-	 "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>-	 requestor.getResults());
>+	 assertResults(
>+				"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"theBarsuf[VARIABLE_DECLARATION]{theBarsuf, null, LFooBar;, theBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>+				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldCurrentOptions);
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-public void testCompletionAllMemberTypes7() throws JavaModelException {
>-	Hashtable oldCurrentOptions = JavaCore.getOptions();
>+public void testCompletionVariableName9() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object argumentPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_PREFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,"pre"); //$NON-NLS-1$
>+	Object localPrefixPreviousValue = options.get(JavaCore.CODEASSIST_LOCAL_SUFFIXES);
>+	options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,"suf"); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldCurrentOptions);
>-		options.put(JavaCore.CODEASSIST_VISIBILITY_CHECK, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/AType.java",
>-	 "package test;\n" +
>-	 "class AType {\n" +
>-	 " public class Member1 {\n" +
>-	 " private class Member2 {\n" +
>-	 " public class Member3 {\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " }\n" +
>-	 " void foo(){\n" +
>-	 " Member\n" +
>-	 " }\n" +
>+		this.wc = getWorkingCopy(
>+	 "/Completion/src/CompletionVariableName9.java",
>+	 "class FooBar {\n"+
>+	 "}\n"+
>+	 "public class CompletionVariableName9 {\n"+
>+	 "	void foo(){\n"+
>+	 "		FooBar thefo\n"+
>+	 "	}\n"+
> 	 "}");
> 	 
> 	 
> 	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	 String str = this.wc.getSource();
>-	 String completeBehind = "Member";
>+	 String completeBehind = "thefo";
> 	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>- 	assertResults(
>-	 "AType.Member1.Member2[TYPE_REF]{test.AType.Member1.Member2, test, Ltest.AType$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"AType.Member1[TYPE_REF]{Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-	 requestor.getResults());
>+	 assertResults(
>+				"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
>+				"thefoBarsuf[VARIABLE_DECLARATION]{thefoBarsuf, null, LFooBar;, thefoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
>+				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
>+				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
>+				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldCurrentOptions);
>+		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
>+		options.put(JavaCore.CODEASSIST_LOCAL_SUFFIXES,localPrefixPreviousValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96213
>-public void testBug96213() throws JavaModelException {
>- this.wc = getWorkingCopy(
>- "/Completion/src/test/Test.java",
>- "package test;\n" +
>- "public class Test{\n"+
>- " Test toto(Object o) {\n"+
>- " return null;\n"+
>- " }\n"+
>- " void titi(int removed) {\n"+
>- " }\n"+
>- " void foo() {\n"+
>- " int removed = 0;\n"+
>- " toto(Test.this).titi(removed);\n"+
>- " }\n"+
>- "}");
>- 
>- 
>- CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>- String str = this.wc.getSource();
>- String completeBehind = "removed";
>- int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>- this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+public void testCompletionVariableNameOfArray1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/CompletionVariableNameOfArray1.java",
>+		"public class CompletionVariableNameOfArray1 {\n"+
>+		"	Object[] ob\n"+
>+		"}\n");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "ob";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	assertResults(
>+		"objects[VARIABLE_DECLARATION]{objects, null, [Ljava.lang.Object;, objects, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>+		requestor.getResults());
>+}
>+public void testCompletionVariableNameOfArray2() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/CompletionVariableNameOfArray2.java",
>+		"public class CompletionVariableNameOfArray2 {\n"+
>+		"	Class[] cl\n"+
>+		"}\n");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "cl";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	assertResults(
>+		"classes[VARIABLE_DECLARATION]{classes, null, [Ljava.lang.Class;, classes, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>+		requestor.getResults());
>+}
>+public void testCompletionVariableNameOfArray3() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/CompletionVariableNameOfArray3.java",
>+		"public class CompletionVariableNameOfArray3 {\n"+
>+		"	Object[][] ob\n"+
>+		"}\n");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "ob";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	assertResults(
>+		"objects[VARIABLE_DECLARATION]{objects, null, [[Ljava.lang.Object;, objects, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
>+		requestor.getResults());
>+}
>+public void testCompletionVariableNameOfArray4() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/CompletionVariableNameOfArray4.java",
>+		"public class CompletionVariableNameOfArray4 {\n"+
>+		"	Objectz[] ob\n"+
>+		"}\n");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "ob";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	assertResults(
>+		"",
>+		requestor.getResults());
>+}
>+public void testCompletionVariableNameUnresolvedType() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVariableNameUnresolvedType.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "ob";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have no completion",
>+		"",
>+		requestor.getResults());
>+}
>+public void testCompletionVisibilityCheckDisabled() throws JavaModelException {
>+	String visibilityCheckID = "org.eclipse.jdt.core.codeComplete.visibilityCheck";
>+	Hashtable options = JavaCore.getOptions();
>+	Object visibilityCheckPreviousValue = options.get(visibilityCheckID);
>+	options.put(visibilityCheckID,"disabled");
>+	JavaCore.setOptions(options);
>+	
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVisibilityCheck.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "x.p";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+	
>+	options.put(visibilityCheckID,visibilityCheckPreviousValue);
>+	JavaCore.setOptions(options);
>+	assertEquals(
>+		"should have three methods", 
>+		"element:privateFoo completion:privateFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>+		"element:protectedFoo completion:protectedFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>+		"element:publicFoo completion:publicFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionVisibilityCheckEnabled() throws JavaModelException {
>+	String visibilityCheckID = "org.eclipse.jdt.core.codeComplete.visibilityCheck";
>+	Hashtable options = JavaCore.getOptions();
>+	Object visibilityCheckPreviousValue = options.get(visibilityCheckID);
>+	options.put(visibilityCheckID,"enabled");
>+	JavaCore.setOptions(options);
>+	
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVisibilityCheck.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "x.p";
>+	int cursorLocation = str.indexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+	
>+	options.put(visibilityCheckID,visibilityCheckPreviousValue);
>+	JavaCore.setOptions(options);
>+	assertEquals(
>+		"should have two methods", 
>+		"element:protectedFoo completion:protectedFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
>+		"element:publicFoo completion:publicFoo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+/*
>+* http://dev.eclipse.org/bugs/show_bug.cgi?id=25815
>+*/
>+public void testCompletionVoidMethod() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionVoidMethod.java");
>+
>+	String str = cu.getSource();
>+	String completeBehind = "foo";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"element:foo completion:foo() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:foo1 completion:foo1() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:foo3 completion:foo3() relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
>+		requestor.getResults());
>+}
>+public void testCompletionWithBinaryFolder() throws JavaModelException {
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	ICompilationUnit cu= getCompilationUnit("Completion", "src", "", "CompletionWithBinaryFolder.java");
> 
>-	assertResults(
>- "removed[LOCAL_VARIABLE_REF]{removed, null, I, removed, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>- requestor.getResults());
>+	String str = cu.getSource();
>+	String completeBehind = "My";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	cu.codeComplete(cursorLocation, requestor);
>+
>+	assertEquals(
>+		"should have two completions",
>+		"element:MyClass completion:MyClass relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
>+		"element:mypackage completion:mypackage relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
>+		requestor.getResults());
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=95167
> public void testCompletionWithProblem1() throws JavaModelException {
>@@ -12393,997 +12614,1354 @@
> 		}
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
>-public void testCompletionExpectedTypeOnEmptyToken1() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck1() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>+		this.workingCopies = new ICompilationUnit[3];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" ZZZTy\n"+
>+			"}");
> 		
>-		aType = getWorkingCopy(
>-	 "/Completion/src/test/AType.java",
>-	 "package test;\n" +
>-	 "public class AType{\n"+
>-	 "}");
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			"}");
> 		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/Test.java",
>-	 "package test;\n" +
>-	 "public class Test{\n"+
>-	 " void foo() {\n"+
>-	 " AType a = new \n"+
>-	 " }\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "AType a = new ";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+		this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType2.java",
>+			"package deprecation;"+
>+			"/** @deprecated */\n"+
>+			"public class ZZZType2 {\n"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "ZZZTy";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"ZZZType2[TYPE_REF]{ZZZType2, deprecation, Ldeprecation.ZZZType2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck10() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
>+	try {
>+
>+		this.workingCopies = new ICompilationUnit[1];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" public void bar1(){}\n"+
>+			" /** @deprecated */\n"+
>+			" public void bar2(){}\n"+
>+			" void foo() {"+
>+			" bar\n"+
>+			" }"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "bar";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck11() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
>+	try {
>+
>+		this.workingCopies = new ICompilationUnit[1];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" public int bar1;\n"+
>+			" /** @deprecated */\n"+
>+			" public int bar2;\n"+
>+			" void foo() {"+
>+			" bar\n"+
>+			" }"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "bar";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck12() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
>+	try {
>+
>+		this.workingCopies = new ICompilationUnit[1];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" public int bar1;\n"+
>+			" /** @deprecated */\n"+
>+			" public int bar2;\n"+
>+			" void foo() {"+
>+			" bar\n"+
>+			" }"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "bar";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck13() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
>+	try {
>+
>+		this.workingCopies = new ICompilationUnit[1];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" class Inner1 {}\n"+
>+			" /** @deprecated */\n"+
>+			" class Inner2 {}\n"+
>+			" void foo() {"+
>+			" Inn\n"+
>+			" }"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "Inn";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	 assertResults(
>-	 "expectedTypesSignatures={Ltest.AType;}\n"+
>-	 "expectedTypesKeys={Ltest/AType;}",
>-	 requestor.getContext());
>-	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-			assertResults(
>-		 "AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-		 requestor.getResults());
>-	 } else {
>-	 	assertResults(
>-		 "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-		 requestor.getResults());
>-	 }
>+		assertResults(
>+				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>-		}
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
>-public void testCompletionExpectedTypeOnEmptyToken3() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck14() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/test/AType.java",
>-	 "package test;\n" +
>-	 "public class AType{\n"+
>-	 "}");
>-		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/Test.java",
>-	 "package test;\n" +
>-	 "public class Test{\n"+
>-	 " void foo() {\n"+
>-	 " AType a = \n"+
>-	 " }\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 requestor.setIgnored(CompletionProposal.METHOD_REF, true);
>-	 requestor.setIgnored(CompletionProposal.FIELD_REF, true);
>-	 requestor.setIgnored(CompletionProposal.LOCAL_VARIABLE_REF, true);
>-	 
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "AType a = ";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" class Inner1 {}\n"+
>+			" /** @deprecated */\n"+
>+			" class Inner2 {}\n"+
>+			" void foo() {"+
>+			" Inn\n"+
>+			" }"+
>+			"}");
> 	
>-	 assertResults(
>-	 "expectedTypesSignatures={Ltest.AType;}\n"+
>-	 "expectedTypesKeys={Ltest/AType;}",
>-	 requestor.getContext());
>-	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-			assertResults(
>-		 "",
>-		 requestor.getResults());
>-	 } else {
>-	 	assertResults(
>-		 "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-		 requestor.getResults());
>-	 }
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "Inn";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>-		}
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95505
>-public void testCompletionExpectedTypeOnEmptyToken4() throws JavaModelException {
>-	ICompilationUnit aType = null;
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck15() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		aType = getWorkingCopy(
>-	 "/Completion/src/test/AInterface.java",
>-	 "package test;\n" +
>-	 "public interface AInterface{\n"+
>-	 "}");
>+
>+		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" void foo() {"+
>+			" ZZZType1.foo\n"+
>+			" }"+
>+			"}");
> 		
>-	 this.wc = getWorkingCopy(
>-	 "/Completion/src/test/Test.java",
>-	 "package test;\n" +
>-	 "public class Test{\n"+
>-	 " void foo() {\n"+
>-	 " AInterface a = new \n"+
>-	 " }\n"+
>-	 "}");
>-	 
>-	 
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "AInterface a = new ";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"/** @deprecated */\n"+
>+			"public class ZZZType1 {\n"+
>+			" public static int foo1;\n"+
>+			" public static int foo2;\n"+
>+			"}");
> 	
>-	 assertResults(
>-	 "expectedTypesSignatures={Ltest.AInterface;}\n"+
>-	 "expectedTypesKeys={Ltest/AInterface;}",
>-	 requestor.getContext());
>-	 
>-	 if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
>-			assertResults(
>-		 "AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-		 requestor.getResults());
>-	 } else {
>-	 	assertResults(
>-		 "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-					"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-		 requestor.getResults());
>-	 }
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "ZZZType1.foo";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"",
>+				requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>-		}
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99811
>-public void testBug99811() throws JavaModelException {
>-	ICompilationUnit aType = null;
>- try {
>- 	this.wc = getWorkingCopy(
>-	 "/Completion/src/test/A.java",
>-	 "public abstract class A implements I {}");
>- 	
>-	 aType = getWorkingCopy(
>-	 "/Completion/src/test/I.java",
>-	 "public interface I {\n"+
>-	 " public class M extends A {}\n"+
>-	 "}");
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck16() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
> 	
>-	 CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	 String str = this.wc.getSource();
>-	 String completeBehind = "A";
>-	 int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	 this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
>+	JavaCore.setOptions(options);
>+
>+	try {
>+
>+		this.workingCopies = new ICompilationUnit[1];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"/** @deprecated */\n"+
>+			"public class ZZZType1 {\n"+
>+			"}"+
>+			"public class Test {\n"+
>+			" void foo() {"+
>+			" ZZZTy\n"+
>+			" }"+
>+			"}");
> 	
>-		assertResults("", requestor.getResults());
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "ZZZTy";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
> 	} finally {
>-		if(aType != null) {
>-			aType.discardWorkingCopy();
>-		}
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-public void testCompletionImportedType1() throws JavaModelException {
>- this.workingCopies = new ICompilationUnit[2];
>- this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/imported/ZZZZ.java",
>-		"package test.imported;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-		
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/test/CompletionImportedType1.java",
>-			"package test;"+
>-			"public class CompletionImportedType1 {"+
>-			" ZZZ\n"+
>-			"}");
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127628
>+public void testDeprecationCheck17() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
> 
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[1].getSource();
>-	String completeBehind = "ZZZ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[1].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	try {
> 
>-	assertResults(
>-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType1;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported.ZZZZ, test.imported, Ltest.imported.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>-}
>-public void testCompletionImportedType2() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[4];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/imported1/ZZZZ.java",
>-		"package test.imported1;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/imported2/ZZZZ.java",
>-		"package test.imported2;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-	this.workingCopies[2] = getWorkingCopy(
>-		"/Completion/src/test/imported3/ZZZZ.java",
>-		"package test.imported3;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>+		this.workingCopies = new ICompilationUnit[1];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" Bug127628Ty\n"+
>+			"}");
> 	
>-	this.workingCopies[3] = getWorkingCopy(
>-		"/Completion/src/test/CompletionImportedType2.java",
>-		"package test;"+
>-		"import test.imported1.*;"+
>-		"import test.imported2.*;"+
>-		"import test.imported3.*;"+
>-		"public class CompletionImportedType2 {"+
>-		" ZZZ\n"+
>-		"}");
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "Bug127628Ty";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[3].getSource();
>-	String completeBehind = "ZZZ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	assertResults(
>-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType2;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+		assertResults(
>+				"Bug127628Ty[POTENTIAL_METHOD_DECLARATION]{Bug127628Ty, Ldeprecation.Test;, ()V, Bug127628Ty, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"Bug127628Type1.Bug127628TypeInner1[TYPE_REF]{deprecation.Bug127628Type1.Bug127628TypeInner1, deprecation, Ldeprecation.Bug127628Type1$Bug127628TypeInner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"Bug127628Type2.Bug127628TypeInner2[TYPE_REF]{deprecation.Bug127628Type2.Bug127628TypeInner2, deprecation, Ldeprecation.Bug127628Type2$Bug127628TypeInner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"Bug127628Type1[TYPE_REF]{Bug127628Type1, deprecation, Ldeprecation.Bug127628Type1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
> }
>-public void testCompletionImportedType3() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[4];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/imported1/ZZZZ.java",
>-		"package test.imported1;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/imported2/ZZZZ.java",
>-		"package test.imported2;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-	this.workingCopies[2] = getWorkingCopy(
>-		"/Completion/src/test/imported3/ZZZZ.java",
>-		"package test.imported3;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck2() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
> 	
>-	this.workingCopies[3] = getWorkingCopy(
>-		"/Completion/src/test/CompletionImportedType3.java",
>-		"package test;"+
>-		"import test.imported2.*;"+
>-		"public class CompletionImportedType3 {"+
>-		" ZZZ\n"+
>+	JavaCore.setOptions(options);
>+
>+	try {
>+		this.workingCopies = new ICompilationUnit[3];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" ZZZTy\n"+
>+			"}");
>+		
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			"}");
>+		
>+		this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType2.java",
>+			"package deprecation;"+
>+			"/** @deprecated */\n"+
>+			"public class ZZZType2 {\n"+
> 			"}");
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[3].getSource();
>-	String completeBehind = "ZZZ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	assertResults(
>-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType3;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "ZZZTy";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>+				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
> }
>-public void testCompletionImportedType4() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[3];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/imported1/ZZZZ.java",
>-		"package test.imported1;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/imported2/ZZZZ.java",
>-		"package test.imported2;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-		
>-	this.workingCopies[2] = getWorkingCopy(
>-		"/Completion/src/test/CompletionImportedType4.java",
>-		"package test;"+
>-		"import test.imported1.*;"+
>-		"public class CompletionImportedType4 {"+
>-		" ZZZ\n"+
>-		"}");
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck3() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[2].getSource();
>-	String completeBehind = "ZZZ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	JavaCore.setOptions(options);
> 
>-	assertResults(
>-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType4;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>-}
>-public void testCompletionImportedType5() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[3];
>-	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/imported1/ZZZZ.java",
>-		"package test.imported1;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>-	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/imported2/ZZZZ.java",
>-		"package test.imported2;"+
>-		"public class ZZZZ {\n"+
>-		" \n"+
>-		"}");
>+	try {
>+	
>+		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" void foo() {"+
>+			" ZZZType1.fo\n"+
>+			" }"+
>+			"}");
> 		
>-	this.workingCopies[2] = getWorkingCopy(
>-		"/Completion/src/test/CompletionImportedType5.java",
>-		"package test;"+
>-		"import test.imported2.*;"+
>-		"public class CompletionImportedType5 {"+
>-		" ZZZ\n"+
>-		"}");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[2].getSource();
>-	String completeBehind = "ZZZ";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	assertResults(
>-			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType5;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-			requestor.getResults());
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			" public static void foo1(){}\n"+
>+			" /** @deprecated */\n"+
>+			" public static void foo2(){}\n"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "ZZZType1.fo";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+				"foo2[METHOD_REF]{foo2(), Ldeprecation.ZZZType1;, ()V, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseType1() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck4() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[3];
>+
>+		this.workingCopies = new ICompilationUnit[2];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
> 			"public class Test {\n"+
>-			" FF\n"+
>-			"}");
>-	
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/camelcase/FoFoFo.java",
>-			"package camelcase;"+
>-			"public class FoFoFo {\n"+
>+			" void foo() {"+
>+			" ZZZType1.fo\n"+
>+			" }"+
> 			"}");
> 		
>-		this.workingCopies[2] = getWorkingCopy(
>-			"/Completion/src/camelcase/FFFTest.java",
>-			"package camelcase;"+
>-			"public class FFFTest {\n"+
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			" public static void foo1(){}\n"+
>+			" /** @deprecated */\n"+
>+			" public static void foo2(){}\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "FF";
>+		String completeBehind = "ZZZType1.fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseType2() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck5() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[3];
>+
>+		this.workingCopies = new ICompilationUnit[2];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
> 			"public class Test {\n"+
>-			" camelcase.FF\n"+
>-			"}");
>-	
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/camelcase/FoFoFo.java",
>-			"package camelcase;"+
>-			"public class FoFoFo {\n"+
>+			" ZZZType1.Inn\n"+
> 			"}");
> 		
>-		this.workingCopies[2] = getWorkingCopy(
>-			"/Completion/src/camelcase/FFFTest.java",
>-			"package camelcase;"+
>-			"public class FFFTest {\n"+
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			" public class Inner1 {}\n"+
>+			" /** @deprecated */\n"+
>+			" public class Inner2 {}\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "FF";
>+		String completeBehind = "ZZZType1.Inn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+				"ZZZType1.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.ZZZType1$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseType3() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck6() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-			
>-		this.workingCopies = new ICompilationUnit[1];
>+
>+		this.workingCopies = new ICompilationUnit[2];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
> 			"public class Test {\n"+
>-			" /**/FF\n"+
>-			"}\n"+
>-			"class FoFoFo {\n"+
>-			"}\n"+
>-			"class FFFTest {\n"+
>+			" ZZZType1.Inn\n"+
>+			"}");
>+		
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			" public class Inner1 {}\n"+
>+			" /** @deprecated */\n"+
>+			" public class Inner2 {}\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "/**/FF";
>+		String completeBehind = "ZZZType1.Inn";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseType4() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck7() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[3];
>+
>+		this.workingCopies = new ICompilationUnit[2];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
> 			"public class Test {\n"+
>-			" FF\n"+
>+			" void foo() {"+
>+			" ZZZType1.fo\n"+
>+			" }"+
> 			"}");
>-	
>+		
> 		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/camelcase/Member1.java",
>-			"package camelcase;"+
>-			"public class Member1 {\n"+
>-			" public class FoFoFo {\n"+
>-			" }\n"+
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			" public static int foo1;\n"+
>+			" /** @deprecated */\n"+
>+			" public static int foo2;\n"+
>+			"}");
>+	
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "ZZZType1.fo";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+		assertResults(
>+				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+				"foo2[FIELD_REF]{foo2, Ldeprecation.ZZZType1;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+				requestor.getResults());
>+	} finally {
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
>+	}
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck8() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.ENABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
>+	try {
>+
>+		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
>+			"public class Test {\n"+
>+			" void foo() {"+
>+			" ZZZType1.fo\n"+
>+			" }"+
> 			"}");
> 		
>-		this.workingCopies[2] = getWorkingCopy(
>-			"/Completion/src/camelcase/Member2.java",
>-			"package camelcase;"+
>-			"public class Member2 {\n"+
>-			" public class FFFTest {\n"+
>-			" }\n"+
>+		this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/deprecation/ZZZType1.java",
>+			"package deprecation;"+
>+			"public class ZZZType1 {\n"+
>+			" public static int foo1;\n"+
>+			" /** @deprecated */\n"+
>+			" public static int foo2;\n"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "FF";
>+		String completeBehind = "ZZZType1.fo";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"Member1.FoFoFo[TYPE_REF]{camelcase.Member1.FoFoFo, camelcase, Lcamelcase.Member1$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
>-				"Member2.FFFTest[TYPE_REF]{camelcase.Member2.FFFTest, camelcase, Lcamelcase.Member2$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseType5() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=127296
>+public void testDeprecationCheck9() throws JavaModelException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object optionValue = options.get(JavaCore.CODEASSIST_DEPRECATION_CHECK);
>+	options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, JavaCore.DISABLED); //$NON-NLS-1$
>+	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>+
> 		this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>+			"/Completion/src/deprecation/Test.java",
>+			"package deprecation;"+
> 			"public class Test {\n"+
>-			" public class FoFoFo {\n"+
>-			" public class FFFTest {\n"+
>-			" FF\n"+
>-			" }\n"+
>-			" }\n"+
>+			" public void bar1(){}\n"+
>+			" /** @deprecated */\n"+
>+			" public void bar2(){}\n"+
>+			" void foo() {"+
>+			" bar\n"+
>+			" }"+
> 			"}");
> 	
> 		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "FF";
>+		String completeBehind = "bar";
> 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 	
> 		assertResults(
>-				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test$FoFoFo$FFFTest;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"Test.FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.Test$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"Test.FoFoFo.FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.Test$FoFoFo$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>+				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
> 	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
>+		JavaCore.setOptions(options);
> 	}
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseMethod1() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>-	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-	this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>-			"public class Test {\n"+
>-			" void oneTwoThree(){}\n"+
>-			" void oTTMethod(){}\n"+
>-			" void foo() {\n"+
>-			" oTT\n"+
>-			" }\n"+
>-			"}");
>-	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "oTT";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"oneTwoThree[METHOD_REF]{oneTwoThree(), Lcamelcase.Test;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"oTTMethod[METHOD_REF]{oTTMethod(), Lcamelcase.Test;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		JavaCore.setOptions(oldOptions);
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>+public void testDuplicateLocals1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		"	void foo() {\n" + 
>+		"		int x = 0;\n" + 
>+		"		TestString x = null;\n" + 
>+		"		x.bar;\n" + 
>+		"	}\n" + 
>+		"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/TestString.java",
>+		"package test;"+
>+		"public class TestString {\n" + 
>+		"	public void bar() {\n" + 
>+		"	}\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>+public void testDuplicateLocals2() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" public static void main(String[] args) {\n" + 
>+		" int x = 2;\n" + 
>+		" try {\n" + 
>+		" \n" + 
>+		" } catch(TestException x) {\n" + 
>+		" x.bar\n" + 
>+		" } catch(Exception e) {\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/TestException.java",
>+		"package test;"+
>+		"public class TestException extends Exception {\n" + 
>+		"	public void bar() {\n" + 
>+		"	}\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"bar[METHOD_REF]{bar(), Ltest.TestException;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>+public void testDuplicateLocals3() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" public static void main(String[] args) {\n" + 
>+		" int x = x = 0;\n" + 
>+		" if (true) {\n" + 
>+		" TestString x = x.bar\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/TestString.java",
>+		"package test;"+
>+		"public class TestString {\n" + 
>+		"	public void bar() {\n" + 
>+		"	}\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>+public void testDuplicateLocals4() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" public static void main(String[] args) {\n" + 
>+		" for (int i = 0; i < 10; i++) {\n" + 
>+		" for (TestString i = null; i.bar < 5;) {\n" + 
>+		" // do something\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/TestString.java",
>+		"package test;"+
>+		"public class TestString {\n" + 
>+		"	public void bar() {\n" + 
>+		"	}\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
>+public void testDuplicateLocals5() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" public static void main(String[] args) {\n" + 
>+		" for (int i = 0; i < 10; i++) {\n" + 
>+		" for (TestString i = null; ;) {\n" + 
>+		" i.bar // do something\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/TestString.java",
>+		"package test;"+
>+		"public class TestString {\n" + 
>+		"	public void bar() {\n" + 
>+		"	}\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
>+public void testDuplicateLocalsType1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" void foo() {\n" + 
>+		" class Local {\n" + 
>+		" void foo() {}\n" + 
>+		" }\n" + 
>+		" {\n" + 
>+		" class Local {\n" + 
>+		" Local(int i) {\n" + 
>+		" this.init(i);\n" + 
>+		" }\n" + 
>+		"				 void init(int i) {}\n" +
>+		" public void bar() {}\n" + 
>+		" }\n" + 
>+		" Local l = new Local(0);\n" + 
>+		" l.bar\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "bar";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"bar[METHOD_REF]{bar(), LLocal;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
>+public void testDuplicateLocalsType2() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" void foo() {\n" + 
>+		" class Local {\n" + 
>+		" void foo() {\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		" {\n" + 
>+		" class Local {\n" + 
>+		" Local(int i) {\n" + 
>+		" this.init(i);\n" + 
>+		" this.bar();\n" + 
>+		" }\n" + 
>+		"				 				void init(int i) {}\n" +
>+		" 		void bar() {\n" + 
>+		" 		}\n" + 
>+		" }\n" + 
>+		" Local l = new Local(0);\n" + 
>+		" }\n" + 
>+		" Local l = new Local();\n" + 
>+		" l.foo\n" + 
>+		" }\n" + 
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "foo";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"foo[METHOD_REF]{foo(), LLocal;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=139937
>+public void testEvaluationContextCompletion() throws JavaModelException {
>+	class EvaluationContextCompletionRequestor extends CompletionRequestor {
>+		public boolean acceptContext;
>+		public void accept(CompletionProposal proposal) {
>+			// Do nothing
>+		}
>+		public void acceptContext(CompletionContext context) {
>+			this.acceptContext = context != null;
>+		}
> 	}
>+	String start = "";
>+	IJavaProject javaProject = getJavaProject("Completion");
>+	IEvaluationContext context = javaProject.newEvaluationContext();
>+ EvaluationContextCompletionRequestor rc = new EvaluationContextCompletionRequestor();
>+	context.codeComplete(start, start.length(), rc);
>+	
>+	assertTrue("acceptContext() method isn't call", rc.acceptContext);
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseField1() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>-	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
>+public void testEvaluationContextCompletion2() throws JavaModelException {
>+	class EvaluationContextCompletionRequestor extends CompletionRequestor {
>+		public boolean acceptContext;
>+		public boolean beginReporting;
>+		public boolean endReporting;
> 		
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>-			"public class Test {\n"+
>-			" int oneTwoThree;\n"+
>-			" int oTTField;\n"+
>-			" void foo() {\n"+
>-			" oTT\n"+
>-			" }\n"+
>-			"}");
>-	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "oTT";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-		assertResults(
>-				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.Test;, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"oTTField[FIELD_REF]{oTTField, Lcamelcase.Test;, I, oTTField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		public void accept(CompletionProposal proposal) {
>+			// Do nothing
>+		}
>+		public void acceptContext(CompletionContext context) {
>+			this.acceptContext = context != null;
>+		}
>+		
>+		public void beginReporting() {
>+			this.beginReporting = true;
>+			super.beginReporting();
>+		}
>+		
>+		public void endReporting() {
>+			this.endReporting = true;
>+			super.endReporting();
>+		}
> 	}
>+	String start = "";
>+	IJavaProject javaProject = getJavaProject("Completion");
>+	IEvaluationContext context = javaProject.newEvaluationContext();
>+ EvaluationContextCompletionRequestor rc = new EvaluationContextCompletionRequestor();
>+	context.codeComplete(start, start.length(), rc);
>+	
>+	assertTrue("acceptContext() method isn't call", rc.acceptContext);
>+	assertTrue("beginReporting() method isn't call", rc.beginReporting);
>+	assertTrue("endReporting() method isn't call", rc.endReporting);
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseLocalVariable1() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>-	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[1];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>-			"public class Test {\n"+
>-			" void foo() {\n"+
>-			" int oneTwoThree;\n"+
>-			" int oTTLocal;\n"+
>-			" oTT\n"+
>-			" }\n"+
>-			"}");
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
>+public void testEvaluationContextCompletion3() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/TestEvaluationContextCompletion3.java",
>+		"package test;"+
>+		"public class TestEvaluationContextCompletion3 {\n"+
>+		"}");
> 	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "oTT";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	String start = "TestEvaluationContextCompletion3";
>+	IJavaProject javaProject = getJavaProject("Completion");
>+	IEvaluationContext context = javaProject.newEvaluationContext();
> 	
>-		assertResults(
>-				"oneTwoThree[LOCAL_VARIABLE_REF]{oneTwoThree, null, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"oTTLocal[LOCAL_VARIABLE_REF]{oTTLocal, null, I, oTTLocal, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		JavaCore.setOptions(oldOptions);
>-	}
>-}
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
>-public void testCamelCaseMethodDeclaration1() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>-	try {
>-		Hashtable options = new Hashtable(oldOptions);
>-		options.put(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[2];
>-		this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src/camelcase/Test.java",
>-			"package camelcase;"+
>-			"public class Test extends SuperClass {\n"+
>-			" oTT\n"+
>-			"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src/camelcase/SuperClass.java",
>-			"package camelcase;"+
>-			"public class SuperClass {\n"+
>-			" public void oneTwoThree(){}\n"+
>-			" public void oTTMethod(){}\n"+
>-			"}");
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
>+	context.codeComplete(start, start.length(), requestor, this.wcOwner);
> 	
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "oTT";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	int startOffset = 0;
>+	int endOffset = start.length();
> 	
>-		assertResults(
>-				"oTT[POTENTIAL_METHOD_DECLARATION]{oTT, Lcamelcase.Test;, ()V, oTT, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
>-				"oneTwoThree[METHOD_DECLARATION]{public void oneTwoThree(), Lcamelcase.SuperClass;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
>-				"oTTMethod[METHOD_DECLARATION]{public void oTTMethod(), Lcamelcase.SuperClass;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>-				requestor.getResults());
>-	} finally {
>-		JavaCore.setOptions(oldOptions);
>-	}
>+	assertResults(
>+			"completion offset="+endOffset+"\n"+
>+			"completion range=["+startOffset+", "+(endOffset-1)+"]\n"+
>+			"completion token=\"TestEvaluationContextCompletion3\"\n"+
>+			"completion token kind=TOKEN_KIND_NAME\n"+
>+			"expectedTypesSignatures=null\n"+
>+			"expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+	assertResults(
>+			"TestEvaluationContextCompletion3[TYPE_REF]{test.TestEvaluationContextCompletion3, test, Ltest.TestEvaluationContextCompletion3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testLabel1() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
>+public void testEvaluationContextCompletion4() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/label/Test.java",
>-		"package label;"+
>-		"public class Test {\n"+
>-		" void foo() {\n"+
>-		" label1 : for(;;) foo();\n"+
>-		" label2 : for(;;)\n"+
>-		" label3 : for(;;) {\n"+
>-		" label4 : for(;;) {\n"+
>-		" break lab\n"+
>-		" }\n"+
>-		" }\n"+
>-		" }\n"+
>+		"/Completion/src/test/TestEvaluationContextCompletion4.java",
>+		"package test;"+
>+		"public class TestEvaluationContextCompletion4 {\n"+
> 		"}");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "lab";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>+	
>+	String start = "TestEvaluationContextCompletion4";
>+	IJavaProject javaProject = getJavaProject("Completion");
>+	IEvaluationContext context = javaProject.newEvaluationContext();
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
>+	requestor.setIgnored(CompletionProposal.TYPE_REF, true);
>+	context.codeComplete(start, start.length(), requestor, this.wcOwner);
>+	
>+	int startOffset = 0;
>+	int endOffset = start.length();
>+	
> 	assertResults(
>-			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"completion offset="+endOffset+"\n"+
>+			"completion range=["+startOffset+", "+(endOffset-1)+"]\n"+
>+			"completion token=\"TestEvaluationContextCompletion4\"\n"+
>+			"completion token kind=TOKEN_KIND_NAME\n"+
>+			"expectedTypesSignatures=null\n"+
>+			"expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+	assertResults(
>+			"",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testLabel2() throws JavaModelException {
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=141518
>+public void testEvaluationContextCompletion5() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/label/Test.java",
>-		"package label;"+
>-		"public class Test {\n"+
>-		" void foo() {\n"+
>-		" #\n"+
>-		" label1 : for(;;) foo();\n"+
>-		" label2 : for(;;)\n"+
>-		" label3 : for(;;) {\n"+
>-		" label4 : for(;;) {\n"+
>-		" break lab\n"+
>-		" }\n"+
>-		" }\n"+
>-		" }\n"+
>+		"/Completion/src/test/TestEvaluationContextCompletion5.java",
>+		"package test;"+
>+		"public class TestEvaluationContextCompletion5 {\n"+
> 		"}");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "lab";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>+	
>+	String start = "someVariable.to";
>+	IJavaProject javaProject = getJavaProject("Completion");
>+	IEvaluationContext context = javaProject.newEvaluationContext();
>+	
>+	context.newVariable( "Object", "someVariable", null );
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, false, false);
>+	context.codeComplete(start, start.length(), requestor, this.wcOwner);
>+	
>+	int startOffset = start.length() - 2;
>+	int endOffset = startOffset + 2 ;
>+	
> 	assertResults(
>-			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"completion offset="+endOffset+"\n"+
>+			"completion range=["+startOffset+", "+(endOffset-1)+"]\n"+
>+			"completion token=\"to\"\n"+
>+			"completion token kind=TOKEN_KIND_NAME\n"+
>+			"expectedTypesSignatures=null\n"+
>+			"expectedTypesKeys=null",
>+ requestor.getContext());
>+ 
>+	assertResults(
>+			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testLabel3() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports001() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/label/Test.java",
>-		"package label;"+
>-		"public class Test {\n"+
>-		" void foo() {\n"+
>-		" label1 : for(;;) foo();\n"+
>-		" label2 : for(;;)\n"+
>-		" label3 : for(;;) {\n"+
>-		" label4 : for(;;) {\n"+
>-		" break lab\n"+
>-		" }\n"+
>-		"}");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo;\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "lab";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>+	
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class");
>+	int end2 = start2 + "".length();
> 	assertResults(
>-			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"foo[FIELD_REF]{ZZZ.foo, Ltest.p.ZZZ;, I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testLabel4() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports002() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/label/Test.java",
>-		"package label;"+
>-		"public class Test {\n"+
>-		" void foo() {\n"+
>-		" #\n"+
>-		" label1 : for(;;) foo();\n"+
>-		" label2 : for(;;)\n"+
>-		" label3 : for(;;) {\n"+
>-		" label4 : for(;;) {\n"+
>-		" break lab\n"+
>-		" }\n"+
>-		"}");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo(){}\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "lab";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class");
>+	int end2 = start2 + "".length();
> 	assertResults(
>-			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testLabel5() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports003() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/label/Test.java",
>-		"package label;"+
>-		"public class Test {\n" + 
>-		" void foo() {\n" + 
>-		" #\n" + 
>- 		" label1 : for(;;) {\n" + 
>- 		" class X {\n" + 
>- 		" void foo() {\n" + 
>- 		" label2 : for(;;) foo();\n" + 
>- 		" }\n" + 
>- 		" }\n" + 
>- 		" continue lab\n" + 
>- 		" }\n" + 
>-		" }\n" + 
>-		"}\n");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo;\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
>+	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "lab";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"label1[LABEL_REF]{label1, null, null, label1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"",
> 			requestor.getResults());
> }
>-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testLabel6() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports004() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/label/Test.java",
>-		"package label;"+
>-		"public class Test {\n" + 
>-		" void foo() {\n" + 
>-		" #\n" + 
>- 		" label1 : for(;;) {\n" + 
>- 		" class X {\n" + 
>- 		" void foo() {\n" + 
>- 		" label2 : for(;;) {\n" + 
>- 		" continue lab\n" + 
>- 		" }\n" + 
>- 		" }\n" + 
>- 		" }\n" + 
>- 		" }\n" + 
>-		" }\n" + 
>-		"}\n");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo(){}\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
>+	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "lab";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
>+			"",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>-public void testStaticMembers1() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[3];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports005() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/Test.java",
>-		"package test;"+
>-		"public class Test {\n" + 
>-		" void foo() {\n" + 
>- 		" StaticMembers.\n" + 
>-		" }\n" + 
>-		"}\n");
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
> 	
> 	this.workingCopies[1] = getWorkingCopy(
>-		"/Completion/src/test/StaticMembers.java",
>-		"package test;"+
>-		"public class StaticMembers extends SuperStaticMembers {\n" + 
>-		" public static int staticField;\n" + 
>- 		" public static int staticMethod() {}\n" + 
>-		" public class Clazz {}\n" + 
>-		" public static class StaticClazz {}\n" + 
>-		"}\n");
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo;\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
> 	
>-	this.workingCopies[2] = getWorkingCopy(
>-			"/Completion/src/test/SuperStaticMembers.java",
>-			"package test;"+
>-			"public class SuperStaticMembers {\n" + 
>-			" public static int superStaticField;\n" + 
>-	 		" public static int supeStaticMethod() {}\n" + 
>-			" public class SuperClazz {}\n" + 
>-			" public static class SuperStaticClazz {}\n" + 
>-			"}\n");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "StaticMembers.";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class");
>+	int end2 = start2 + "".length();
> 	assertResults(
>-			"supeStaticMethod[METHOD_REF]{supeStaticMethod(), Ltest.SuperStaticMembers;, ()I, supeStaticMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"superStaticField[FIELD_REF]{superStaticField, Ltest.SuperStaticMembers;, I, superStaticField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>-			"StaticMembers.Clazz[TYPE_REF]{Clazz, test, Ltest.StaticMembers$Clazz;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-			"StaticMembers.StaticClazz[TYPE_REF]{StaticClazz, test, Ltest.StaticMembers$StaticClazz;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-			"staticField[FIELD_REF]{staticField, Ltest.StaticMembers;, I, staticField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-			"staticMethod[METHOD_REF]{staticMethod(), Ltest.StaticMembers;, ()I, staticMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>-			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+			"foo[FIELD_REF]{ZZZ.foo, Ltest.p.ZZZ;, I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
>-public void testBug164311() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports006() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/Test.java",
>-		"package test;"+
>-		"public class Test {\n" + 
>-		" public int zzzzzz;\n" + 
>-		" public void method1() {\n" + 
>-		" label : if (0> (10));\n" + 
>-		" zzz\n" + 
>-		" }\n" + 
>-		"}\n");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo(){}\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>+	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "zzz";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class");
>+	int end2 = start2 + "".length();
> 	assertResults(
>-			"zzzzzz[FIELD_REF]{zzzzzz, Ltest.Test;, I, zzzzzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=167750
>-public void testBug164311_2() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[1];
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports007() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
>-		"/Completion/src/test/Test.java",
>-		"package test;\n"+
>-		"public class X {\n"+
>-		" public void zork() { \n"+
>-		" } \n"+
>-		" public void foo() { \n"+
>-		" this.foo(new Object(){\n"+
>-		" public void bar() {\n"+
>-		" if (zzz>(Integer)vvv.foo(i)) {\n"+
>-		" return;\n"+
>-		" }\n"+
>-		" if (true) {\n"+
>-		" return;\n"+
>-		" }\n"+
>-		" zor\n"+
>-		" } \n"+ 
>-		" });\n"+
>-		" }\n"+
>-		"}\n");
>-
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"import test.p.ZZZ.*;\n" +
>+			"public class Test {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo(){}\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "zor";
>+	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class");
>+	int end2 = start2 + "".length();
> 	assertResults(
>-			"zork[METHOD_REF]{zork(), Ltest.X;, ()V, zork, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports001() throws JavaModelException {
>+public void testFavoriteImports009() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>+			"import test.p.ZZZ.*;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
>@@ -13394,34 +13972,35 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo;\n" +
>+			" public static int foo(){}\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>+
> 	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
> 	int start1 = str.lastIndexOf("foo") + "".length();
> 	int end1 = start1 + "foo".length();
> 	int start2 = str.lastIndexOf("public class");
> 	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[FIELD_REF]{ZZZ.foo, Ltest.p.ZZZ;, I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
> 			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports002() throws JavaModelException {
>+public void testFavoriteImports011() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>+			"import test.p.ZZZ.foo;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
>@@ -13455,11 +14034,12 @@
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports003() throws JavaModelException {
>+public void testFavoriteImports013() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>+			"import test.p.ZZZ.foo;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
>@@ -13470,30 +14050,77 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo;\n" +
>+			" public static int foo(){}\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class");
>+	int end2 = start2 + "".length();
> 	assertResults(
>-			"",
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports004() throws JavaModelException {
>+public void testFavoriteImports016() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src3/test/Test.java",
>+			"package test;\n" +
>+			"public class Test {\n" +
>+			" public class foo {\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
>+			" }\n" +
>+			" }\n" +
>+			"}");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src3/test/p/ZZZ.java",
>+			"package test.p;\n" +
>+			"public class ZZZ {\n" +
>+			" public static int foo(){}\n" +
>+			"}");
>+	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "foo";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	
>+	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
>+	int start2 = str.lastIndexOf("public class Test");
>+	int end2 = start2 + "".length();
>+	assertResults(
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>+			"Test.foo[TYPE_REF]{foo, test, Ltest.Test$foo;, null, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			requestor.getResults());
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports017() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
> 			"public class Test {\n" +
>-			" public void method() {\n" +
>+			" public void foo() {\n" +
> 			" foo\n" +
> 			" }\n" +
> 			"}");
>@@ -13507,24 +14134,27 @@
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>+	int start1 = str.lastIndexOf("foo") + "".length();
>+	int end1 = start1 + "foo".length();
> 	assertResults(
>-			"",
>+			"foo[METHOD_REF]{foo(), Ltest.Test;, ()V, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports005() throws JavaModelException {
>+public void testFavoriteImports018() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
> 			"public class Test {\n" +
>+			" public int foo;\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
> 			" }\n" +
>@@ -13534,12 +14164,12 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo;\n" +
>+			" public static int foo(){}\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
>@@ -13549,21 +14179,23 @@
> 	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
> 	int start1 = str.lastIndexOf("foo") + "".length();
> 	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class");
>+	int start2 = str.lastIndexOf("public class Test");
> 	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[FIELD_REF]{ZZZ.foo, Ltest.p.ZZZ;, I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>+			"foo[FIELD_REF]{foo, Ltest.Test;, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports006() throws JavaModelException {
>+public void testFavoriteImports019() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
>+			" int foo = 0;\n" +
> 			" foo\n" +
> 			" }\n" +
> 			"}");
>@@ -13577,7 +14209,7 @@
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
>@@ -13587,20 +14219,20 @@
> 	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
> 	int start1 = str.lastIndexOf("foo") + "".length();
> 	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class");
>+	int start2 = str.lastIndexOf("public class Test");
> 	int end2 = start2 + "".length();
> 	assertResults(
> 			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>+			"foo[LOCAL_VARIABLE_REF]{foo, null, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports007() throws JavaModelException {
>+public void testFavoriteImports020() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>-			"import test.p.ZZZ.*;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
>@@ -13612,6 +14244,7 @@
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
> 			" public static int foo(){}\n" +
>+			" public static int foo(int i){}\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>@@ -13626,23 +14259,24 @@
> 	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
> 	int start1 = str.lastIndexOf("foo") + "".length();
> 	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class");
>+	int start2 = str.lastIndexOf("public class Test");
> 	int end2 = start2 + "".length();
> 	assertResults(
> 			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, (I)I, foo, (i), ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
> 			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports009() throws JavaModelException {
>+public void testFavoriteImports022() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>-			"import test.p.ZZZ.*;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
>-			" foo\n" +
>+			" foo();\n" +
> 			" }\n" +
> 			"}");
> 	
>@@ -13655,30 +14289,24 @@
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
> 	
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "foo(";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class");
>-	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+			"",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports011() throws JavaModelException {
>+public void testFavoriteImports023() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>-			"import test.p.ZZZ.foo;\n" +
>+			"/** */\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
>@@ -13689,7 +14317,7 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>+			" public static int foo;\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>@@ -13704,20 +14332,19 @@
> 	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
> 	int start1 = str.lastIndexOf("foo") + "".length();
> 	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class");
>+	int start2 = str.lastIndexOf("/** */");
> 	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+			"foo[FIELD_REF]{ZZZ.foo, Ltest.p.ZZZ;, I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
> 			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports013() throws JavaModelException {
>+public void testFavoriteImports024() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>-			"import test.p.ZZZ.foo;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
>@@ -13728,39 +14355,31 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>+			" public int foo;\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class");
>-	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+			"",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports016() throws JavaModelException {
>+public void testFavoriteImports025() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
> 			"public class Test {\n" +
>-			" public class foo {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>+			" public void method() {\n" +
>+			" foo\n" +
> 			" }\n" +
> 			"}");
> 	
>@@ -13768,37 +14387,30 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>+			" public int foo;\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-	
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class Test");
>-	int end2 = start2 + "".length();
>+
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>-			"Test.foo[TYPE_REF]{foo, test, Ltest.Test$foo;, null, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			"",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports017() throws JavaModelException {
>+public void testFavoriteImports026() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
> 			"public class Test {\n" +
>-			" public void foo() {\n" +
>+			" public void method() {\n" +
> 			" foo\n" +
> 			" }\n" +
> 			"}");
>@@ -13807,7 +14419,7 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>+			" public int foo(){return 0;};\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>@@ -13819,20 +14431,17 @@
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
> 	assertResults(
>-			"foo[METHOD_REF]{foo(), Ltest.Test;, ()V, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			"",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports018() throws JavaModelException {
>+public void testFavoriteImports027() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
> 			"public class Test {\n" +
>-			" public int foo;\n" +
> 			" public void method() {\n" +
> 			" foo\n" +
> 			" }\n" +
>@@ -13842,38 +14451,31 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>+			" public int foo(){return 0;};\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class Test");
>-	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>-			"foo[FIELD_REF]{foo, Ltest.Test;, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			"",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports019() throws JavaModelException {
>+public void testFavoriteImports028() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[2];
> 	this.workingCopies[0] = getWorkingCopy(
> 			"/Completion/src3/test/Test.java",
> 			"package test;\n" +
>+			"import test.p.ZZZ;\n" +
> 			"public class Test {\n" +
> 			" public void method() {\n" +
>-			" int foo = 0;\n" +
> 			" foo\n" +
> 			" }\n" +
> 			"}");
>@@ -13882,398 +14484,411 @@
> 			"/Completion/src3/test/p/ZZZ.java",
> 			"package test.p;\n" +
> 			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>+			" public static int foo(){return 0;};\n" +
> 			"}");
> 	
> 	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
> 	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
> 	
> 	String str = this.workingCopies[0].getSource();
> 	String completeBehind = "foo";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
> 	int start1 = str.lastIndexOf("foo") + "".length();
> 	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class Test");
>-	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>-			"foo[LOCAL_VARIABLE_REF]{foo, null, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
>+			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports020() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>-	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>+public void testFavoriteImports030() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>-			" public static int foo(int i){}\n" +
>-			"}");
>+	try {
>+		Hashtable options = new Hashtable(this.oldOptions);
>+		options.put(JavaCore.CODEASSIST_SUGGEST_STATIC_IMPORTS, JavaCore.DISABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies[0] = getWorkingCopy(
>+				"/Completion/src3/test/Test.java",
>+				"package test;\n" +
>+				"public class Test {\n" +
>+				" public void method() {\n" +
>+				" foo\n" +
>+				" }\n" +
>+				"}");
>+		
>+		this.workingCopies[1] = getWorkingCopy(
>+				"/Completion/src3/test/p/ZZZ.java",
>+				"package test.p;\n" +
>+				"public class ZZZ {\n" +
>+				" public static int foo(){}\n" +
>+				"}");
>+		
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+		requestor.allowAllRequiredProposals();
>+		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+		
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "foo";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		
>+		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+		int start1 = str.lastIndexOf("foo") + "".length();
>+		int end1 = start1 + "foo".length();
>+		int start2 = str.lastIndexOf("public class");
>+		int end2 = start2 + "".length();
>+		assertResults(
>+				"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+				" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+				requestor.getResults());
>+	} finally {
>+		JavaCore.setOptions(oldOptions);
>+	}
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>+public void testFavoriteImports031() throws JavaModelException {
>+	this.oldOptions = JavaCore.getOptions();
> 	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+	try {
>+		Hashtable options = new Hashtable(this.oldOptions);
>+		options.put(JavaCore.CODEASSIST_SUGGEST_STATIC_IMPORTS, JavaCore.ENABLED);
>+		JavaCore.setOptions(options);
>+		
>+		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies[0] = getWorkingCopy(
>+				"/Completion/src3/test/Test.java",
>+				"package test;\n" +
>+				"public class Test {\n" +
>+				" public void method() {\n" +
>+				" foo\n" +
>+				" }\n" +
>+				"}");
>+		
>+		this.workingCopies[1] = getWorkingCopy(
>+				"/Completion/src3/test/p/ZZZ.java",
>+				"package test.p;\n" +
>+				"public class ZZZ {\n" +
>+				" public static int foo(){}\n" +
>+				"}");
>+		
>+		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>+		requestor.allowAllRequiredProposals();
>+		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+		
>+		String str = this.workingCopies[0].getSource();
>+		String completeBehind = "foo";
>+		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		
>+		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>+		int start1 = str.lastIndexOf("foo") + "".length();
>+		int end1 = start1 + "foo".length();
>+		int start2 = str.lastIndexOf("public class");
>+		int end2 = start2 + "".length();
>+		assertResults(
>+				"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>+				" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+				requestor.getResults());
>+	} finally {
>+		JavaCore.setOptions(oldOptions);
>+	}
>+}
>+public void testInconsistentHierarchy1() throws CoreException, IOException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/p/Test.java",
>+		"package p;"+
>+		"public class Test extends Unknown {\n" + 
>+		" void foo() {\n" + 
>+		" this.has\n" + 
>+		" }\n" + 
>+		"}\n");
> 	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "this.has";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("public class Test");
>-	int end2 = start2 + "".length();
>+	
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, (I)I, foo, (i), ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>-			requestor.getResults());
>+		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
>+		requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports022() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testLabel1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo();\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public static int foo(){}\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>-	
>+		"/Completion/src/label/Test.java",
>+		"package label;"+
>+		"public class Test {\n"+
>+		" void foo() {\n"+
>+		" label1 : for(;;) foo();\n"+
>+		" label2 : for(;;)\n"+
>+		" label3 : for(;;) {\n"+
>+		" label4 : for(;;) {\n"+
>+		" break lab\n"+
>+		" }\n"+
>+		" }\n"+
>+		" }\n"+
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo(";
>+	String completeBehind = "lab";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"",
>+			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports023() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testLabel2() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"/** */\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public static int foo;\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>-	
>+		"/Completion/src/label/Test.java",
>+		"package label;"+
>+		"public class Test {\n"+
>+		" void foo() {\n"+
>+		" #\n"+
>+		" label1 : for(;;) foo();\n"+
>+		" label2 : for(;;)\n"+
>+		" label3 : for(;;) {\n"+
>+		" label4 : for(;;) {\n"+
>+		" break lab\n"+
>+		" }\n"+
>+		" }\n"+
>+		" }\n"+
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "lab";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
>-	int start2 = str.lastIndexOf("/** */");
>-	int end2 = start2 + "".length();
> 	assertResults(
>-			"foo[FIELD_REF]{ZZZ.foo, Ltest.p.ZZZ;, I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-			" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports024() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testLabel3() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public int foo;\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>-	
>+		"/Completion/src/label/Test.java",
>+		"package label;"+
>+		"public class Test {\n"+
>+		" void foo() {\n"+
>+		" label1 : for(;;) foo();\n"+
>+		" label2 : for(;;)\n"+
>+		" label3 : for(;;) {\n"+
>+		" label4 : for(;;) {\n"+
>+		" break lab\n"+
>+		" }\n"+
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "lab";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"",
>+			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports025() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testLabel4() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public int foo;\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>-	
>+		"/Completion/src/label/Test.java",
>+		"package label;"+
>+		"public class Test {\n"+
>+		" void foo() {\n"+
>+		" #\n"+
>+		" label1 : for(;;) foo();\n"+
>+		" label2 : for(;;)\n"+
>+		" label3 : for(;;) {\n"+
>+		" label4 : for(;;) {\n"+
>+		" break lab\n"+
>+		" }\n"+
>+		"}");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "lab";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"",
>+			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports026() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testLabel5() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public int foo(){return 0;};\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>-	
>-	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		"/Completion/src/label/Test.java",
>+		"package label;"+
>+		"public class Test {\n" + 
>+		" void foo() {\n" + 
>+		" #\n" + 
>+ 		" label1 : for(;;) {\n" + 
>+ 		" class X {\n" + 
>+ 		" void foo() {\n" + 
>+ 		" label2 : for(;;) foo();\n" + 
>+ 		" }\n" + 
>+ 		" }\n" + 
>+ 		" continue lab\n" + 
>+ 		" }\n" + 
>+		" }\n" + 
>+		"}\n");
> 
>-	assertResults(
>-			"",
>-			requestor.getResults());
>-}
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports027() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>-	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public int foo(){return 0;};\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>-	
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "lab";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
> 	assertResults(
>-			"",
>+			"label1[LABEL_REF]{label1, null, null, label1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports028() throws JavaModelException {
>-	this.workingCopies = new ICompilationUnit[2];
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testLabel6() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
> 	this.workingCopies[0] = getWorkingCopy(
>-			"/Completion/src3/test/Test.java",
>-			"package test;\n" +
>-			"import test.p.ZZZ;\n" +
>-			"public class Test {\n" +
>-			" public void method() {\n" +
>-			" foo\n" +
>-			" }\n" +
>-			"}");
>-	
>-	this.workingCopies[1] = getWorkingCopy(
>-			"/Completion/src3/test/p/ZZZ.java",
>-			"package test.p;\n" +
>-			"public class ZZZ {\n" +
>-			" public static int foo(){return 0;};\n" +
>-			"}");
>-	
>-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-	requestor.allowAllRequiredProposals();
>-	requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.foo"});
>-	
>+		"/Completion/src/label/Test.java",
>+		"package label;"+
>+		"public class Test {\n" + 
>+		" void foo() {\n" + 
>+		" #\n" + 
>+ 		" label1 : for(;;) {\n" + 
>+ 		" class X {\n" + 
>+ 		" void foo() {\n" + 
>+ 		" label2 : for(;;) {\n" + 
>+ 		" continue lab\n" + 
>+ 		" }\n" + 
>+ 		" }\n" + 
>+ 		" }\n" + 
>+ 		" }\n" + 
>+		" }\n" + 
>+		"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
> 	String str = this.workingCopies[0].getSource();
>-	String completeBehind = "foo";
>+	String completeBehind = "lab";
> 	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
> 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
> 
>-	int start1 = str.lastIndexOf("foo") + "".length();
>-	int end1 = start1 + "foo".length();
> 	assertResults(
>-			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
>+			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports030() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+public void testParameterNames1() throws CoreException, IOException {
>+	Hashtable options = JavaCore.getOptions();
>+	Object timeout = options.get(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC);
>+	options.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC,"2000"); //$NON-NLS-1$
> 	
>+	JavaCore.setOptions(options);
>+
> 	try {
>-		Hashtable options = new Hashtable(this.oldOptions);
>-		options.put(JavaCore.CODEASSIST_SUGGEST_STATIC_IMPORTS, JavaCore.DISABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[2];
>+		this.workingCopies = new ICompilationUnit[1];
> 		this.workingCopies[0] = getWorkingCopy(
>-				"/Completion/src3/test/Test.java",
>-				"package test;\n" +
>-				"public class Test {\n" +
>-				" public void method() {\n" +
>-				" foo\n" +
>-				" }\n" +
>-				"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-				"/Completion/src3/test/p/ZZZ.java",
>-				"package test.p;\n" +
>-				"public class ZZZ {\n" +
>-				" public static int foo(){}\n" +
>-				"}");
>-		
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-		requestor.allowAllRequiredProposals();
>-		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>+			"/Completion/src/p/Test.java",
>+			"package p;"+
>+			"public class Test {\n" + 
>+			" void foo(doctest.X x) {\n" + 
>+			" x.fo\n" + 
>+			" }\n" + 
>+			"}\n");
> 		
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "foo";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		addLibrary(
>+				"Completion", 
>+				"tmpDoc.jar",
>+				null,
>+				"tmpDocDoc.zip",
>+				false);
> 		
>-		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-		int start1 = str.lastIndexOf("foo") + "".length();
>-		int end1 = start1 + "foo".length();
>-		int start2 = str.lastIndexOf("public class");
>-		int end2 = start2 + "".length();
>-		assertResults(
>-				"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-				" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>+		CompletionTestsRequestor2 requestor;
>+		try {
>+			requestor = new CompletionTestsRequestor2(true);
>+			String str = this.workingCopies[0].getSource();
>+			String completeBehind = "x.fo";
>+			int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+			this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+			
>+			assertResults(
>+				"foo[METHOD_REF]{foo(), Ldoctest.X;, (Ljava.lang.Object;)V, foo, (param), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
> 				requestor.getResults());
>+		} finally {
>+			removeLibrary("Completion", "tmpDoc.jar");
>+		}
> 	} finally {
>-		JavaCore.setOptions(oldOptions);
>+		options.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, timeout);
>+		JavaCore.setOptions(options);
> 	}
> }
>-//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
>-public void testFavoriteImports031() throws JavaModelException {
>-	this.oldOptions = JavaCore.getOptions();
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
>+public void testStaticMembers1() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[3];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		" void foo() {\n" + 
>+ 		" StaticMembers.\n" + 
>+		" }\n" + 
>+		"}\n");
> 	
>-	try {
>-		Hashtable options = new Hashtable(this.oldOptions);
>-		options.put(JavaCore.CODEASSIST_SUGGEST_STATIC_IMPORTS, JavaCore.ENABLED);
>-		JavaCore.setOptions(options);
>-		
>-		this.workingCopies = new ICompilationUnit[2];
>-		this.workingCopies[0] = getWorkingCopy(
>-				"/Completion/src3/test/Test.java",
>-				"package test;\n" +
>-				"public class Test {\n" +
>-				" public void method() {\n" +
>-				" foo\n" +
>-				" }\n" +
>-				"}");
>-		
>-		this.workingCopies[1] = getWorkingCopy(
>-				"/Completion/src3/test/p/ZZZ.java",
>-				"package test.p;\n" +
>-				"public class ZZZ {\n" +
>-				" public static int foo(){}\n" +
>-				"}");
>-		
>-		CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, false, true);
>-		requestor.allowAllRequiredProposals();
>-		requestor.setFavoriteReferences(new String[]{"test.p.ZZZ.*"});
>-		
>-		String str = this.workingCopies[0].getSource();
>-		String completeBehind = "foo";
>-		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>-		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>-		
>-		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
>-		int start1 = str.lastIndexOf("foo") + "".length();
>-		int end1 = start1 + "foo".length();
>-		int start2 = str.lastIndexOf("public class");
>-		int end2 = start2 + "".length();
>-		assertResults(
>-				"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
>-				" ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}",
>-				requestor.getResults());
>-	} finally {
>-		JavaCore.setOptions(oldOptions);
>-	}
>+	this.workingCopies[1] = getWorkingCopy(
>+		"/Completion/src/test/StaticMembers.java",
>+		"package test;"+
>+		"public class StaticMembers extends SuperStaticMembers {\n" + 
>+		" public static int staticField;\n" + 
>+ 		" public static int staticMethod() {}\n" + 
>+		" public class Clazz {}\n" + 
>+		" public static class StaticClazz {}\n" + 
>+		"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/SuperStaticMembers.java",
>+			"package test;"+
>+			"public class SuperStaticMembers {\n" + 
>+			" public static int superStaticField;\n" + 
>+	 		" public static int supeStaticMethod() {}\n" + 
>+			" public class SuperClazz {}\n" + 
>+			" public static class SuperStaticClazz {}\n" + 
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "StaticMembers.";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"supeStaticMethod[METHOD_REF]{supeStaticMethod(), Ltest.SuperStaticMembers;, ()I, supeStaticMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"superStaticField[FIELD_REF]{superStaticField, Ltest.SuperStaticMembers;, I, superStaticField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
>+			"StaticMembers.Clazz[TYPE_REF]{Clazz, test, Ltest.StaticMembers$Clazz;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+			"StaticMembers.StaticClazz[TYPE_REF]{StaticClazz, test, Ltest.StaticMembers$StaticClazz;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+			"staticField[FIELD_REF]{staticField, Ltest.StaticMembers;, I, staticField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+			"staticMethod[METHOD_REF]{staticMethod(), Ltest.StaticMembers;, ()I, staticMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
>+			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
> }
> }
>Index: src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java,v
>retrieving revision 1.80
>diff -u -r1.80 CompletionTests_1_5.java
>--- src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java	12 Jan 2007 17:58:59 -0000	1.80
>+++ src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java	19 Jan 2007 16:36:52 -0000
>@@ -9393,6 +9393,50 @@
> 			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
> 			requestor.getResults());
> }
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0300() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[3];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/Test.java",
>+		"package test;"+
>+		"public class Test {\n" + 
>+		"	public void throwing() throws IZZAException, Top<Object>.IZZException {}\n" +
>+		"	public void foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZAException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n");
>+	
>+	this.workingCopies[1] = getWorkingCopy(
>+			"/Completion/src/test/IZZAException.java",
>+			"package test;"+
>+			"public class IZZAException extends Exception {\n" + 
>+			"}\n");
>+	
>+	this.workingCopies[2] = getWorkingCopy(
>+			"/Completion/src/test/IZZException.java",
>+			"package test;"+
>+			"public class Top<T> {\n" + 
>+			" public class IZZException extends Exception {\n" + 
>+			" }\n" + 
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+
>+	assertResults(
>+			"Top<java.lang.Object>.IZZException[TYPE_REF]{test.Top.IZZException, test, Ltest.Top<Ljava.lang.Object;>.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
>+			requestor.getResults());
>+}
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=153130
> public void testEC001() throws JavaModelException {
> 	this.workingCopies = new ICompilationUnit[1];
>Index: src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java,v
>retrieving revision 1.19
>diff -u -r1.19 JavadocBugsCompletionModelTest.java
>--- src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java	19 Jan 2007 14:08:32 -0000	1.19
>+++ src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java	19 Jan 2007 16:36:53 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2007 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
>@@ -58,11 +58,11 @@
> 	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@throws ", 0); // empty token
> 	if (CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
> 		assertSortedResults(
>-			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREET+"}"
>+			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREETE+"}"
> 		);
> 	} else {
> 		assertSortedResults(
>-			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREET+"}\n" + 
>+			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREETE+"}\n" + 
> 			"BasicTestBugs[TYPE_REF]{BasicTestBugs, javadoc.bugs, Ljavadoc.bugs.BasicTestBugs;, null, null, "+this.positions+R_DICUNR+"}"
> 		);
> 	}
>Index: src/org/eclipse/jdt/core/tests/model/AbstractJavadocCompletionModelTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavadocCompletionModelTest.java,v
>retrieving revision 1.10
>diff -u -r1.10 AbstractJavadocCompletionModelTest.java
>--- src/org/eclipse/jdt/core/tests/model/AbstractJavadocCompletionModelTest.java	20 Dec 2006 16:11:55 -0000	1.10
>+++ src/org/eclipse/jdt/core/tests/model/AbstractJavadocCompletionModelTest.java	19 Jan 2007 16:36:46 -0000
>@@ -63,6 +63,8 @@
> 	protected static final int R_DICNREET = R_DICNR+R_EXACT_EXPECTED_TYPE;
> 	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED +R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE = 51 */
> 	protected static final int R_DICUNREET = R_DICUNR+R_EXACT_EXPECTED_TYPE;
>+	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED +R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE+R_EXCEPTION = 71 */
>+	protected static final int R_DICUNREETE = R_DICUNR+R_EXACT_EXPECTED_TYPE+R_EXCEPTION;
> 
> 	// Exact Expected Exception relevance values
> 	/** R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED +R_EXCEPTION+R_EXACT_EXPECTED_TYPE = 68 */
>#P org.eclipse.jdt.core
>Index: codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java,v
>retrieving revision 1.314
>diff -u -r1.314 CompletionEngine.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java	12 Jan 2007 17:58:49 -0000	1.314
>+++ codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java	19 Jan 2007 16:37:14 -0000
>@@ -220,6 +220,7 @@
> 	private final static char[] ON_DEMAND = ".*".toCharArray(); //$NON-NLS-1$
> 	private final static char[] IMPORT_END = ";\n".toCharArray(); //$NON-NLS-1$
> 	
>+	private final static int NONE = 0;
> 	private final static int SUPERTYPE = 1;
> 	private final static int SUBTYPE = 2;
> 	
>@@ -235,6 +236,7 @@
> 	Binding[] uninterestingBindings = new Binding[1];
> 	int forbbidenBindingsPtr = -1;
> 	Binding[] forbbidenBindings = new Binding[1];
>+	int forbbidenBindingsFilter;
> 	
> 	ImportBinding[] favoriteReferenceBindings;
> 	
>@@ -829,7 +831,7 @@
> 			this.completionToken = type.token;
> 			setSourceRange(type.sourceStart, type.sourceEnd);
> 			
>-			findTypesAndPackages(this.completionToken, scope);
>+			findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 			if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
> 				findKeywordsForMember(this.completionToken, field.modifiers);
> 			}
>@@ -851,7 +853,7 @@
> 			SingleTypeReference type = (CompletionOnSingleTypeReference) method.returnType;
> 			this.completionToken = type.token;
> 			setSourceRange(type.sourceStart, type.sourceEnd);
>-			findTypesAndPackages(this.completionToken, scope.parent);
>+			findTypesAndPackages(this.completionToken, scope.parent, new ObjectVector());
> 			if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
> 				findKeywordsForMember(this.completionToken, method.modifiers);
> 			}
>@@ -880,7 +882,7 @@
> 					this.findEnumConstant(this.completionToken, (SwitchStatement) astNodeParent);
> 				}
> 			} else if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
>-				findTypesAndPackages(this.completionToken, scope);
>+				findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 			} else {
> 				findVariablesAndMethods(
> 					this.completionToken,
>@@ -890,7 +892,7 @@
> 					insideTypeAnnotation,
> 					singleNameReference.isInsideAnnotationAttribute);
> 				// can be the start of a qualified type name
>-				findTypesAndPackages(this.completionToken, scope);
>+				findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 				if (!this.requestor.isIgnored(CompletionProposal.KEYWORD)) {
> 					if (this.completionToken != null && this.completionToken.length != 0) {
> 						findKeywords(this.completionToken, singleNameReference.possibleKeywords, false, false);
>@@ -929,7 +931,16 @@
> 					
> 					findParameterizedType((TypeReference)astNodeParent, scope);
> 				} else { 
>-					findTypesAndPackages(this.completionToken, scope);
>+					ObjectVector typesFound = new ObjectVector();
>+					if (this.assistNodeIsException && astNodeParent instanceof TryStatement) {
>+						findExceptionFromTryStatement(
>+								this.completionToken,
>+								null,
>+								scope.enclosingSourceType(),
>+								(BlockScope)scope,
>+								typesFound);
>+					}
>+					findTypesAndPackages(this.completionToken, scope, typesFound);
> 				}
> 			} else if (!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
> 				findMemberTypes(
>@@ -1112,6 +1123,18 @@
> 			if (qualifiedBinding instanceof ReferenceBinding && !(qualifiedBinding instanceof TypeVariableBinding)) {
> 				if (!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
> 					setSourceRange((int) (completionPosition >>> 32), (int) completionPosition);
>+					
>+					ObjectVector typesFound = new ObjectVector();
>+					
>+					if (this.assistNodeIsException && astNodeParent instanceof TryStatement) {
>+						findExceptionFromTryStatement(
>+								this.completionToken,
>+								(ReferenceBinding)qualifiedBinding,
>+								scope.enclosingSourceType(),
>+								(BlockScope)scope,
>+								typesFound);
>+					}
>+					
> 					findMemberTypes(
> 						this.completionToken,
> 						(ReferenceBinding) qualifiedBinding,
>@@ -1119,7 +1142,7 @@
> 						scope.enclosingSourceType(),
> 						false,
> 						false,
>-						new ObjectVector());
>+						typesFound);
> 				}
> 			} else if (qualifiedBinding instanceof PackageBinding) {
> 
>@@ -1335,6 +1358,17 @@
> 				this.completionToken = ref.completionIdentifier;
> 				long completionPosition = ref.sourcePositions[ref.tokens.length];
> 				setSourceRange((int) (completionPosition >>> 32), (int) completionPosition);
>+				
>+				ObjectVector typesFound = new ObjectVector();
>+				if (this.assistNodeIsException && astNodeParent instanceof TryStatement) {
>+					findExceptionFromTryStatement(
>+							this.completionToken,
>+							(ReferenceBinding)qualifiedBinding,
>+							scope.enclosingSourceType(),
>+							(BlockScope)scope,
>+							typesFound);
>+				}
>+				
> 				findMemberTypes(
> 					this.completionToken,
> 					(ReferenceBinding) qualifiedBinding,
>@@ -1342,7 +1376,7 @@
> 					scope.enclosingSourceType(),
> 					false,
> 					false,
>-					new ObjectVector());
>+					typesFound);
> 			}
> 		} else if (astNode instanceof CompletionOnMarkerAnnotationName) {
> 			CompletionOnMarkerAnnotationName annot = (CompletionOnMarkerAnnotationName) astNode;
>@@ -1353,7 +1387,7 @@
> 				this.completionToken = type.token;
> 				setSourceRange(type.sourceStart, type.sourceEnd);
> 				
>-				findTypesAndPackages(this.completionToken, scope);
>+				findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 			} else if (annot.type instanceof CompletionOnQualifiedTypeReference) {
> 				this.insideQualifiedReference = true;
> 				
>@@ -1392,7 +1426,7 @@
> 				}
> 				if (this.assistNodeCanBeSingleMemberAnnotation) {
> 					if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
>-						findTypesAndPackages(this.completionToken, scope);
>+						findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 					} else {
> 						findVariablesAndMethods(
> 							this.completionToken,
>@@ -1402,7 +1436,7 @@
> 							insideTypeAnnotation,
> 							true);
> 						// can be the start of a qualified type name
>-						findTypesAndPackages(this.completionToken, scope);
>+						findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 					}
> 				}
> 			}
>@@ -1463,7 +1497,7 @@
> 				this.completionToken = typeRef.token;
> 				this.javadocTagPosition = typeRef.tagSourceStart;
> 				setSourceRange(typeRef.sourceStart, typeRef.sourceEnd);
>-				findTypesAndPackages(this.completionToken, scope);
>+				findTypesAndPackages(this.completionToken, scope, new ObjectVector());
> 
> 			} else if (astNode instanceof CompletionOnJavadocQualifiedTypeReference) {
> 
>@@ -1646,7 +1680,7 @@
> 		}
> 		return true;
> 	}
>-	
>+
> 	public void complete(IType type, char[] snippet, int position, char[][] localVariableTypeNames, char[][] localVariableNames, int[] localVariableModifiers, boolean isStatic){	
> 		if(this.requestor != null){
> 			this.requestor.beginReporting();
>@@ -2244,6 +2278,196 @@
> 			}
> 		}
> 	}
>+	
>+	private void findExceptionFromTryStatement(
>+			char[] typeName,
>+			ReferenceBinding exceptionType,
>+			ReferenceBinding receiverType,
>+			SourceTypeBinding invocationType, 
>+			BlockScope scope, 
>+			ObjectVector typesFound,
>+			boolean searchSuperClasses) {
>+		
>+		if (isForbidden(exceptionType)) {
>+			this.knownTypes.put(CharOperation.concat(exceptionType.qualifiedPackageName(), exceptionType.qualifiedSourceName(), '.'), this);
>+			return;
>+		}
>+		
>+		if (searchSuperClasses) {
>+			ReferenceBinding javaLangThrowable = scope.getJavaLangThrowable();
>+			if (exceptionType != javaLangThrowable) {
>+				ReferenceBinding superClass = exceptionType.superclass();
>+				while(superClass != null && superClass != javaLangThrowable) {
>+					findExceptionFromTryStatement(typeName, superClass, receiverType, invocationType, scope, typesFound, false);
>+					superClass = superClass.superclass();
>+				}
>+			}
>+		}
>+		
>+		if (typeName.length > exceptionType.sourceName.length)
>+			return;
>+
>+		if (!CharOperation.prefixEquals(typeName, exceptionType.sourceName, false/* ignore case */)
>+				&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(typeName, exceptionType.sourceName)))
>+			return;
>+
>+		if (this.options.checkDeprecation &&
>+				exceptionType.isViewedAsDeprecated() &&
>+				!scope.isDefinedInSameUnit(exceptionType))
>+			return;
>+		
>+		if (this.options.checkVisibility) {
>+			if (invocationType != null && !exceptionType.canBeSeenBy(receiverType, invocationType)) {
>+				return;
>+			} else if(invocationType == null && !exceptionType.canBeSeenBy(this.unitScope.fPackage)) {
>+				return;
>+			}
>+		}
>+
>+		for (int j = typesFound.size; --j >= 0;) {
>+			ReferenceBinding otherType = (ReferenceBinding) typesFound.elementAt(j);
>+
>+			if (exceptionType == otherType)
>+				return;
>+
>+			if (CharOperation.equals(exceptionType.sourceName, otherType.sourceName, true)) {
>+
>+				if (exceptionType.enclosingType().isSuperclassOf(otherType.enclosingType()))
>+					return;
>+
>+				if (otherType.enclosingType().isInterface())
>+					if (exceptionType.enclosingType()
>+						.implementsInterface(otherType.enclosingType(), true))
>+						return;
>+
>+				if (exceptionType.enclosingType().isInterface())
>+					if (otherType.enclosingType()
>+						.implementsInterface(exceptionType.enclosingType(), true))
>+						return;
>+			}
>+		}
>+
>+		typesFound.add(exceptionType);
>+		
>+		char[] completionName = exceptionType.sourceName();
>+		
>+		boolean isQualified = false;
>+		
>+		if(!this.insideQualifiedReference) {
>+			isQualified = true;
>+			
>+			char[] memberPackageName = exceptionType.qualifiedPackageName();
>+			char[] memberTypeName = exceptionType.sourceName();
>+			char[] memberEnclosingTypeNames = null;
>+			
>+			ReferenceBinding enclosingType = exceptionType.enclosingType();
>+			if (enclosingType != null) {
>+				memberEnclosingTypeNames = exceptionType.enclosingType().qualifiedSourceName();
>+			}
>+			
>+			Scope currentScope = scope;
>+			done : while (currentScope != null) { // done when a COMPILATION_UNIT_SCOPE is found
>+
>+				switch (currentScope.kind) {
>+
>+					case Scope.METHOD_SCOPE :
>+					case Scope.BLOCK_SCOPE :
>+						BlockScope blockScope = (BlockScope) currentScope;
>+
>+						for (int j = 0, length = blockScope.subscopeCount; j < length; j++) {
>+
>+							if (blockScope.subscopes[j] instanceof ClassScope) {
>+								SourceTypeBinding localType =
>+									((ClassScope) blockScope.subscopes[j]).referenceContext.binding;
>+								
>+								if (localType == exceptionType) {
>+									isQualified = false;
>+									break done;
>+								}
>+							}
>+						}
>+						break;
>+
>+					case Scope.CLASS_SCOPE :
>+						SourceTypeBinding type = ((ClassScope)currentScope).referenceContext.binding;
>+						ReferenceBinding[] memberTypes = type.memberTypes();
>+						if (memberTypes != null) {
>+							for (int j = 0; j < memberTypes.length; j++) {
>+								if (memberTypes[j] == exceptionType) {
>+									isQualified = false;
>+									break done;
>+								}
>+							}
>+						}
>+						
>+						
>+						break;
>+
>+					case Scope.COMPILATION_UNIT_SCOPE :
>+						SourceTypeBinding[] types = ((CompilationUnitScope)currentScope).topLevelTypes;
>+						if (types != null) {
>+							for (int j = 0; j < types.length; j++) {
>+								if (types[j] == exceptionType) {
>+									isQualified = false;
>+									break done;
>+								}
>+							}
>+						}
>+						break done;
>+				}
>+				currentScope = currentScope.parent;
>+			}
>+			
>+			if (isQualified && mustQualifyType(memberPackageName, memberTypeName, memberEnclosingTypeNames, exceptionType.modifiers)) {
>+				if (memberPackageName == null || memberPackageName.length == 0)
>+					if (this.unitScope != null && this.unitScope.fPackage.compoundName != CharOperation.NO_CHAR_CHAR)
>+						return; // ignore types from the default package from outside it
>+			} else {
>+				isQualified = false;
>+			}
>+			
>+			if (isQualified) {
>+				completionName =
>+					CharOperation.concat(
>+							memberPackageName,
>+							CharOperation.concat(
>+									memberEnclosingTypeNames,
>+									memberTypeName,
>+									'.'),
>+							'.');
>+			}
>+		}
>+		
>+		int relevance = computeBaseRelevance();
>+		relevance += computeRelevanceForInterestingProposal();
>+		relevance += computeRelevanceForCaseMatching(typeName, exceptionType.sourceName);
>+		relevance += computeRelevanceForExpectingType(exceptionType);
>+		relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
>+		if(!insideQualifiedReference) {
>+			relevance += computeRelevanceForQualification(isQualified);
>+		}
>+		relevance += computeRelevanceForClass();
>+		relevance += computeRelevanceForException();
>+			
>+		this.noProposal = false;
>+		if(!this.requestor.isIgnored(CompletionProposal.TYPE_REF)) {
>+			createTypeProposal(exceptionType, exceptionType.qualifiedSourceName(), IAccessRule.K_ACCESSIBLE, completionName, relevance);
>+		}
>+	}
>+	
>+	private void findExceptionFromTryStatement(
>+			char[] typeName,
>+			ReferenceBinding receiverType,
>+			SourceTypeBinding invocationType, 
>+			BlockScope scope, 
>+			ObjectVector typesFound) {
>+		
>+		for (int i = 0; i <= this.expectedTypesPtr; i++) {
>+			ReferenceBinding exceptionType = (ReferenceBinding)this.expectedTypes[i];
>+			
>+			findExceptionFromTryStatement(typeName, exceptionType, receiverType, invocationType, scope, typesFound, true);
>+		}
>+	}
> 	private void findExplicitConstructors(
> 		char[] name,
> 		ReferenceBinding currentType,
>@@ -5185,6 +5409,12 @@
> 		}
> 		return 0;
> 	}
>+	private int computeRelevanceForException(){
>+		if (this.assistNodeIsException) {
>+			return R_EXCEPTION;
>+		}
>+		return 0;
>+	}
> 	private int computeRelevanceForException(char[] proposalName){
> 		
> 		if((this.assistNodeIsException || (this.assistNodeInJavadoc & CompletionOnJavadoc.EXCEPTION) != 0 )&&
>@@ -5925,6 +6155,13 @@
> 										&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(typeName, localType.sourceName)))
> 									continue next;
> 								
>+								for (int j = typesFound.size; --j >= 0;) {
>+									ReferenceBinding otherType = (ReferenceBinding) typesFound.elementAt(j);
>+
>+									if (localType == otherType)
>+										continue next;
>+								}
>+								
> 								if(this.assistNodeIsClass) {
> 									if(!localType.isClass()) continue next;
> 								} else if(this.assistNodeIsInterface) {
>@@ -6070,8 +6307,7 @@
> 			scope = scope.parent;
> 		}
> 	}
>-	
>-	private void findTypesAndPackages(char[] token, Scope scope) {
>+	private void findTypesAndPackages(char[] token, Scope scope, ObjectVector typesFound) {
> 
> 		if (token == null)
> 			return;
>@@ -6089,8 +6325,6 @@
> 		
> 		boolean proposeAllMemberTypes = !this.assistNodeIsConstructor;
> 		
>-		ObjectVector typesFound = new ObjectVector();
>-		
> 		if (!skip && proposeType && scope.enclosingSourceType() != null) {
> 			findNestedTypes(token, scope.enclosingSourceType(), scope, proposeAllMemberTypes, typesFound);
> 			if(!assistNodeIsConstructor) {
>@@ -6212,6 +6446,13 @@
> 							}
> 						}
> 						
>+						for (int j = 0; j < typesFound.size(); j++) {
>+							ReferenceBinding typeFound = (ReferenceBinding)typesFound.elementAt(j);
>+							if (typeFound == refBinding) {
>+								continue next;
>+							}
>+						}
>+						
> 						boolean inSameUnit = this.unitScope.isDefinedInSameUnit(refBinding);
> 						
> 						// top level types of the current unit are already proposed.
>@@ -6248,6 +6489,7 @@
> 							
> 							if(refBinding.isClass()) {
> 								relevance += computeRelevanceForClass();
>+								relevance += computeRelevanceForException(typeName);
> 							} else if(refBinding.isEnum()) {
> 								relevance += computeRelevanceForEnum();
> 							} else if(refBinding.isInterface()) {
>@@ -7483,6 +7725,26 @@
> 					}
> 				}
> 			}
>+		} else if (parent instanceof TryStatement) {
>+			boolean isException = false;
>+			if (node instanceof CompletionOnSingleTypeReference) {
>+				isException = ((CompletionOnSingleTypeReference)node).isException();
>+			} else if (node instanceof CompletionOnQualifiedTypeReference) {
>+				isException = ((CompletionOnQualifiedTypeReference)node).isException();
>+			} else if (node instanceof CompletionOnParameterizedQualifiedTypeReference) {
>+				isException = ((CompletionOnParameterizedQualifiedTypeReference)node).isException();
>+			}
>+			if (isException) {
>+				ThrownExceptionFinder thrownExceptionFinder = new ThrownExceptionFinder();
>+				ReferenceBinding[] bindings = thrownExceptionFinder.find((TryStatement) parent, (BlockScope)scope);
>+				if (bindings != null && bindings.length > 0) {
>+					for (int i = 0; i < bindings.length; i++) {
>+						addExpectedType(bindings[i], scope);
>+					}
>+					this.expectedTypesFilter = SUPERTYPE;
>+				}
>+			}
>+			
> 		// Expected types for javadoc
> 		} else if (parent instanceof Javadoc) {
> 			if (scope.kind == Scope.METHOD_SCOPE) {
>@@ -7654,6 +7916,7 @@
> 	}
> 
> 	private Scope computeForbiddenBindings(ASTNode astNode, ASTNode astNodeParent, Scope scope) {
>+		this.forbbidenBindingsFilter = NONE;
> 		if(scope instanceof ClassScope) {
> 			TypeDeclaration typeDeclaration = ((ClassScope)scope).referenceContext;
> 			if(typeDeclaration.superclass == astNode) {
>@@ -7668,6 +7931,29 @@
> 					return scope.parent;
> 				}
> 			}
>+		} else {
>+			if (astNodeParent != null && astNodeParent instanceof TryStatement) {
>+				boolean isException = false;
>+				if (astNode instanceof CompletionOnSingleTypeReference) {
>+					isException = ((CompletionOnSingleTypeReference)astNode).isException();
>+				} else if (astNode instanceof CompletionOnQualifiedTypeReference) {
>+					isException = ((CompletionOnQualifiedTypeReference)astNode).isException();
>+				} else if (astNode instanceof CompletionOnParameterizedQualifiedTypeReference) {
>+					isException = ((CompletionOnParameterizedQualifiedTypeReference)astNode).isException();
>+				}
>+				if (isException) {
>+					Argument[] catchArguments = ((TryStatement) astNodeParent).catchArguments;
>+					int length = catchArguments == null ? 0 : catchArguments.length;
>+					for (int i = 0; i < length; i++) {
>+						TypeBinding caughtException = catchArguments[i].type.resolvedType;
>+						if (caughtException != null) {
>+							this.addForbiddenBindings(caughtException);
>+							this.knownTypes.put(CharOperation.concat(caughtException.qualifiedPackageName(), caughtException.qualifiedSourceName(), '.'), this);
>+						}
>+					}
>+					this.forbbidenBindingsFilter = SUBTYPE;
>+				}
>+			}
> 		}
> //		else if(scope instanceof MethodScope) {
> //			MethodScope methodScope = (MethodScope) scope;
>@@ -7745,6 +8031,13 @@
> 			if(this.forbbidenBindings[i] == binding) {
> 				return true;
> 			}
>+			if((this.forbbidenBindingsFilter & SUBTYPE) != 0) {
>+				if (binding instanceof TypeBinding && 
>+						this.forbbidenBindings[i] instanceof TypeBinding &&
>+						((TypeBinding)binding).isCompatibleWith((TypeBinding)this.forbbidenBindings[i])) {
>+					return true;
>+				}
>+			}
> 		}
> 		return false;
> 	}
>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java,v
>retrieving revision 1.168
>diff -u -r1.168 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	24 Nov 2006 01:32:05 -0000	1.168
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	19 Jan 2007 16:37:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2007 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
>@@ -74,6 +74,7 @@
> 	
> 	public final static char[] FAKE_TYPE_NAME = new char[]{' '};
> 	public final static char[] FAKE_METHOD_NAME = new char[]{' '};
>+	public final static char[] FAKE_ARGUMENT_NAME = new char[]{' '};
> 	public final static char[] VALUE = new char[]{'v', 'a', 'l', 'u', 'e'};
> 	
> 	/* public fields */
>@@ -235,6 +236,23 @@
> 				currentElement.add(fakeType, 0);
> 				return;
> 		}
>+		
>+		if ((topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_BETWEEN_CATCH_AND_RIGHT_PAREN)) {
>+			if (this.assistNode instanceof CompletionOnSingleTypeReference &&
>+					((CompletionOnSingleTypeReference)this.assistNode).isException()) {
>+				buildMoreTryStatementCompletionContext((TypeReference)this.assistNode);
>+				return;
>+			} else if (this.assistNode instanceof CompletionOnQualifiedTypeReference &&
>+					((CompletionOnQualifiedTypeReference)this.assistNode).isException()) {
>+				buildMoreTryStatementCompletionContext((TypeReference)this.assistNode);
>+				return;
>+			} else if (this.assistNode instanceof CompletionOnParameterizedQualifiedTypeReference &&
>+					((CompletionOnParameterizedQualifiedTypeReference)this.assistNode).isException()) {
>+				buildMoreTryStatementCompletionContext((TypeReference)this.assistNode);
>+				return;
>+			}
>+		}
>+		
> 		// add the completion node to the method declaration or constructor declaration
> 		if (orphan instanceof Statement) {
> 			/* check for completion at the beginning of method body
>@@ -905,6 +923,56 @@
> 		}
> 	}
> }
>+private void buildMoreTryStatementCompletionContext(TypeReference exceptionRef) {
>+	if (this.astLengthPtr > -1 &&
>+			this.astPtr > 1 &&
>+			this.astStack[this.astPtr] instanceof Block &&
>+			this.astStack[this.astPtr - 1] instanceof Argument) {
>+		TryStatement tryStatement = new TryStatement();
>+	
>+		int newAstPtr = this.astPtr;
>+		
>+		int length = this.astLengthStack[this.astLengthPtr];
>+		Block[] bks = (tryStatement.catchBlocks = new Block[length + 1]);
>+		Argument[] args = (tryStatement.catchArguments = new Argument[length + 1]);
>+		if (length != 0) {
>+			while (length-- > 0) {
>+				bks[length] = (Block) this.astStack[newAstPtr--];
>+				bks[length].statements = null; // statements of catch block won't be used
>+				args[length] = (Argument) this.astStack[newAstPtr--];
>+			}
>+		}
>+		
>+		bks[bks.length - 1] = new Block(0);
>+		args[args.length - 1] = new Argument(FAKE_ARGUMENT_NAME,0,exceptionRef,0);
>+		
>+		tryStatement.tryBlock = (Block) this.astStack[newAstPtr--];
>+		
>+		assistNodeParent = tryStatement;
>+		
>+		currentElement.add(tryStatement, 0);
>+	} else if (this.astLengthPtr > -1 &&
>+			this.astPtr > -1 &&
>+			this.astStack[this.astPtr] instanceof Block) {
>+		TryStatement tryStatement = new TryStatement();
>+		
>+		int newAstPtr = this.astPtr;
>+		
>+		Block[] bks = (tryStatement.catchBlocks = new Block[1]);
>+		Argument[] args = (tryStatement.catchArguments = new Argument[1]);
>+		
>+		bks[0] = new Block(0);
>+		args[0] = new Argument(FAKE_ARGUMENT_NAME,0,exceptionRef,0);
>+		
>+		tryStatement.tryBlock = (Block) this.astStack[newAstPtr--];
>+		
>+		assistNodeParent = tryStatement;
>+		
>+		currentElement.add(tryStatement, 0);
>+	}else {
>+		currentElement = currentElement.add(exceptionRef, 0);
>+	}
>+}
> public int bodyEnd(AbstractMethodDeclaration method){
> 	return cursorLocation;
> }
>Index: codeassist/org/eclipse/jdt/internal/codeassist/ThrownExceptionFinder.java
>===================================================================
>RCS file: codeassist/org/eclipse/jdt/internal/codeassist/ThrownExceptionFinder.java
>diff -N codeassist/org/eclipse/jdt/internal/codeassist/ThrownExceptionFinder.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ codeassist/org/eclipse/jdt/internal/codeassist/ThrownExceptionFinder.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,130 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.codeassist;
>+
>+import java.util.Stack;
>+
>+import org.eclipse.jdt.internal.compiler.ASTVisitor;
>+import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
>+import org.eclipse.jdt.internal.compiler.ast.Argument;
>+import org.eclipse.jdt.internal.compiler.ast.Block;
>+import org.eclipse.jdt.internal.compiler.ast.MessageSend;
>+import org.eclipse.jdt.internal.compiler.ast.ThrowStatement;
>+import org.eclipse.jdt.internal.compiler.ast.TryStatement;
>+import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
>+import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
>+import org.eclipse.jdt.internal.compiler.lookup.ClassScope;
>+import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope;
>+import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
>+import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
>+import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
>+import org.eclipse.jdt.internal.compiler.util.SimpleSet;
>+
>+public class ThrownExceptionFinder extends ASTVisitor {
>+
>+	private SimpleSet thrownExceptions;
>+	private Stack exceptionsStack;
>+	
>+	public ReferenceBinding[] find(TryStatement tryStatement, BlockScope scope) {
>+		this.thrownExceptions = new SimpleSet();
>+		this.exceptionsStack = new Stack();
>+		tryStatement.traverse(this, scope);
>+		removeCaughtExceptions(tryStatement);
>+		
>+		ReferenceBinding[] result = new ReferenceBinding[this.thrownExceptions.elementSize];
>+		this.thrownExceptions.asArray(result);
>+		return result;
>+	}
>+
>+	private void acceptException(ReferenceBinding binding) {
>+		if (binding != null && binding.isValidBinding()) {
>+			this.thrownExceptions.add(binding);
>+		}
>+	}
>+	
>+	public void endVisit(MessageSend messageSend, BlockScope scope) {
>+		if (messageSend.binding != null) {
>+			this.endVisitMethodInvocation(messageSend.binding);
>+		}
>+		super.endVisit(messageSend, scope);
>+	}
>+	
>+	public void endVisit(AllocationExpression allocationExpression, BlockScope scope) {
>+		if (allocationExpression.binding != null) {
>+			this.endVisitMethodInvocation(allocationExpression.binding);
>+		}
>+		super.endVisit(allocationExpression, scope);
>+	}
>+	
>+	public void endVisit(ThrowStatement throwStatement, BlockScope scope) {
>+		this.acceptException((ReferenceBinding)throwStatement.exception.resolvedType);
>+		super.endVisit(throwStatement, scope);
>+	}
>+	
>+	
>+	private void endVisitMethodInvocation(MethodBinding methodBinding) {
>+		ReferenceBinding[] thrownExceptionBindings = methodBinding.thrownExceptions;
>+		int length = thrownExceptionBindings == null ? 0 : thrownExceptionBindings.length;
>+		for (int i = 0; i < length; i++) {
>+			this.acceptException(thrownExceptionBindings[i]);
>+		}
>+	}
>+	
>+	public boolean visit(TypeDeclaration typeDeclaration, CompilationUnitScope scope) {
>+		return this.visitType(typeDeclaration);
>+	}
>+	
>+	public boolean visit(TypeDeclaration memberTypeDeclaration, ClassScope scope) {
>+		return this.visitType(memberTypeDeclaration);
>+	}
>+	
>+	public boolean visit(TypeDeclaration localTypeDeclaration, BlockScope scope) {
>+		return this.visitType(localTypeDeclaration);
>+	}
>+	
>+	private boolean visitType(TypeDeclaration typeDeclaration) {
>+		return false;
>+	}
>+
>+	public boolean visit(TryStatement tryStatement, BlockScope scope) {
>+		this.exceptionsStack.push(this.thrownExceptions);
>+		SimpleSet exceptionSet = new SimpleSet();
>+		this.thrownExceptions = exceptionSet;
>+		tryStatement.tryBlock.traverse(this, scope);
>+		
>+		this.removeCaughtExceptions(tryStatement);
>+
>+		this.thrownExceptions = (SimpleSet)this.exceptionsStack.pop();
>+		
>+		Object[] values = exceptionSet.values;
>+		for (int i = 0; i < values.length; i++) {
>+			if (values[i] != null) {
>+				this.thrownExceptions.add(values[i]);
>+			}
>+		}
>+		
>+		Block[] catchBlocks = tryStatement.catchBlocks;
>+		for (int i = 0; i < catchBlocks.length; i++) {
>+			catchBlocks[i].traverse(this, scope);
>+		}
>+		return false;
>+	}
>+	
>+	private void removeCaughtExceptions(TryStatement tryStatement) {
>+		Argument[] catchArguments = tryStatement.catchArguments;
>+		for (int i = 0; i < catchArguments.length; i++) {
>+			TypeBinding exception = catchArguments[i].type.resolvedType;
>+			if (exception != null && exception.isValidBinding()) {
>+				this.thrownExceptions.remove(exception);
>+			}
>+		}
>+	}
>+}
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest2.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest2.java,v
>retrieving revision 1.40
>diff -u -r1.40 CompletionParserTest2.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest2.java	21 Apr 2006 12:48:11 -0000	1.40
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest2.java	19 Jan 2007 16:37:20 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2007 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
>@@ -9332,4 +9332,363 @@
> 			expectedReplacedSource,
> 			"full ast");
> }
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0167() {
>+
>+	String str = 
>+		"public class X {\n" +
>+		"	public boolean foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IllegalAccessException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n"; 
>+
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf("IZZ") + completeBehind.length() - 1;
>+	String expectedCompletionNodeToString = "<NONE>";
>+	String expectedParentNodeToString = "<NONE>";
>+	String completionIdentifier = "<NONE>";
>+	String expectedReplacedSource = "<NONE>";
>+	String expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkDietParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+	"diet ast");
>+	
>+	expectedCompletionNodeToString = "<CompleteOnException:IZZ>";
>+	expectedParentNodeToString =
>+		"try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		"catch (IllegalAccessException e) {\n" + 
>+		" }\n" + 
>+		"catch (<CompleteOnException:IZZ> ) {\n" + 
>+		" }";
>+	completionIdentifier = "IZZ";
>+	expectedReplacedSource = "IZZ";
>+	expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		" catch (IllegalAccessException e) {\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:IZZ> ) {\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkMethodParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+			"full ast");
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0168() {
>+
>+	String str = 
>+		"public class X {\n" +
>+		"	public boolean foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IllegalAccessException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ\n" +
>+		" }" +
>+		"}\n"; 
>+
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf("IZZ") + completeBehind.length() - 1;
>+	String expectedCompletionNodeToString = "<NONE>";
>+	String expectedParentNodeToString = "<NONE>";
>+	String completionIdentifier = "<NONE>";
>+	String expectedReplacedSource = "<NONE>";
>+	String expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkDietParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+	"diet ast");
>+	
>+	expectedCompletionNodeToString = "<CompleteOnException:IZZ>";
>+	expectedParentNodeToString =
>+		"try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		"catch (IllegalAccessException e) {\n" + 
>+		" }\n" + 
>+		"catch (<CompleteOnException:IZZ> ) {\n" + 
>+		" }";
>+	completionIdentifier = "IZZ";
>+	expectedReplacedSource = "IZZ";
>+	expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		" catch (IllegalAccessException e) {\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:IZZ> ) {\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkMethodParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+			"full ast");
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0169() {
>+
>+	String str = 
>+		"public class X {\n" +
>+		"	public boolean foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IllegalAccessException e) {\n" +
>+		" bar()\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n"; 
>+
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf("IZZ") + completeBehind.length() - 1;
>+	String expectedCompletionNodeToString = "<NONE>";
>+	String expectedParentNodeToString = "<NONE>";
>+	String completionIdentifier = "<NONE>";
>+	String expectedReplacedSource = "<NONE>";
>+	String expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkDietParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+	"diet ast");
>+	
>+	expectedCompletionNodeToString = "<CompleteOnException:IZZ>";
>+	expectedParentNodeToString = "<NONE>";
>+	completionIdentifier = "IZZ";
>+	expectedReplacedSource = "IZZ";
>+	expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" <CompleteOnException:IZZ>;\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkMethodParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+			"full ast");
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0170() {
>+
>+	String str = 
>+		"public class X {\n" +
>+		"	public boolean foo() {\n" +
>+		" #\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IllegalAccessException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n"; 
>+
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf("IZZ") + completeBehind.length() - 1;
>+	String expectedCompletionNodeToString = "<NONE>";
>+	String expectedParentNodeToString = "<NONE>";
>+	String completionIdentifier = "<NONE>";
>+	String expectedReplacedSource = "<NONE>";
>+	String expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkDietParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+	"diet ast");
>+	
>+	expectedCompletionNodeToString = "<CompleteOnException:IZZ>";
>+	expectedParentNodeToString = "<NONE>";
>+	completionIdentifier = "IZZ";
>+	expectedReplacedSource = "IZZ";
>+	expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" <CompleteOnException:IZZ>;\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkMethodParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+			"full ast");
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0171() {
>+
>+	String str = 
>+		"public class X {\n" +
>+		"	public boolean foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n"; 
>+
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf("IZZ") + completeBehind.length() - 1;
>+	String expectedCompletionNodeToString = "<NONE>";
>+	String expectedParentNodeToString = "<NONE>";
>+	String completionIdentifier = "<NONE>";
>+	String expectedReplacedSource = "<NONE>";
>+	String expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkDietParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+	"diet ast");
>+	
>+	expectedCompletionNodeToString = "<CompleteOnException:IZZ>";
>+	expectedParentNodeToString =
>+		"try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		"catch (<CompleteOnException:IZZ> ) {\n" + 
>+		" }"
>+;
>+	completionIdentifier = "IZZ";
>+	expectedReplacedSource = "IZZ";
>+	expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:IZZ> ) {\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkMethodParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+			"full ast");
>+}
> }
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/GenericsCompletionParserTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/GenericsCompletionParserTest.java,v
>retrieving revision 1.26
>diff -u -r1.26 GenericsCompletionParserTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/GenericsCompletionParserTest.java	12 Oct 2006 14:01:13 -0000	1.26
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/GenericsCompletionParserTest.java	19 Jan 2007 16:37:21 -0000
>@@ -1742,7 +1742,12 @@
> 	"diet ast");
> 	
> 	expectedCompletionNodeToString = "<CompleteOnException:Y<Z>.>";
>-	expectedParentNodeToString = "<NONE>";
>+	expectedParentNodeToString =
>+		"try \n" + 
>+		" {\n" + 
>+		" }\n" + 
>+		"catch (<CompleteOnException:Y<Z>.> ) {\n" + 
>+		" }";
> 	completionIdentifier = "";
> 	expectedReplacedSource = "Y<Z>.";
> 	expectedUnitDisplayString =
>@@ -1750,7 +1755,11 @@
> 		" public X() {\n" + 
> 		" }\n" + 
> 		" void foo() {\n" + 
>-		" <CompleteOnException:Y<Z>.>;\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:Y<Z>.> ) {\n" + 
>+		" }\n" + 
> 		" }\n" + 
> 		"}\n";
> 
>@@ -1799,7 +1808,12 @@
> 	"diet ast");
> 	
> 	expectedCompletionNodeToString = "<CompleteOnException:Y<Z>.>";
>-	expectedParentNodeToString = "<NONE>";
>+	expectedParentNodeToString = 
>+		"try \n" + 
>+		" {\n" + 
>+		" }\n" + 
>+		"catch (<CompleteOnException:Y<Z>.> ) {\n" + 
>+		" }";
> 	completionIdentifier = "";
> 	expectedReplacedSource = "Y<Z>.";
> 	expectedUnitDisplayString =
>@@ -1807,7 +1821,11 @@
> 		" public X() {\n" + 
> 		" }\n" + 
> 		" void foo() {\n" + 
>-		" <CompleteOnException:Y<Z>.>;\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:Y<Z>.> ) {\n" + 
>+		" }\n" + 
> 		" }\n" + 
> 		"}\n";
> 
>@@ -9422,4 +9440,83 @@
> 			expectedReplacedSource,
> 	"diet ast");
> }
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
>+public void test0213() {
>+
>+	String str = 
>+		"public class X {\n" +
>+		"	public boolean foo() {\n" +
>+		" try {\n" +
>+		" throwing();\n" +
>+		" }\n" +
>+		" catch (IllegalAccessException e) {\n" +
>+		" bar();\n" +
>+		" }\n" +
>+		" catch (Top<Object>.IZZ) {\n" +
>+		" }\n" +
>+		" }" +
>+		"}\n"; 
>+
>+	String completeBehind = "IZZ";
>+	int cursorLocation = str.lastIndexOf("IZZ") + completeBehind.length() - 1;
>+	String expectedCompletionNodeToString = "<NONE>";
>+	String expectedParentNodeToString = "<NONE>";
>+	String completionIdentifier = "<NONE>";
>+	String expectedReplacedSource = "<NONE>";
>+	String expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkDietParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+	"diet ast");
>+	
>+	expectedCompletionNodeToString = "<CompleteOnException:Top<Object>.IZZ>";
>+	expectedParentNodeToString =
>+		"try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		"catch (IllegalAccessException e) {\n" + 
>+		" }\n" + 
>+		"catch (<CompleteOnException:Top<Object>.IZZ> ) {\n" + 
>+		" }";
>+	completionIdentifier = "IZZ";
>+	expectedReplacedSource = "Top<Object>.IZZ";
>+	expectedUnitDisplayString =
>+		"public class X {\n" + 
>+		" public X() {\n" + 
>+		" }\n" + 
>+		" public boolean foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" throwing();\n" + 
>+		" }\n" + 
>+		" catch (IllegalAccessException e) {\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:Top<Object>.IZZ> ) {\n" + 
>+		" }\n" + 
>+		" }\n" + 
>+		"}\n";
>+
>+	checkMethodParse(
>+			str.toCharArray(),
>+			cursorLocation,
>+			expectedCompletionNodeToString,
>+			expectedParentNodeToString,
>+			expectedUnitDisplayString,
>+			completionIdentifier,
>+			expectedReplacedSource,
>+			"full ast");
>+}
> }
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java,v
>retrieving revision 1.27
>diff -u -r1.27 CompletionParserTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java	29 Mar 2006 03:50:23 -0000	1.27
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/CompletionParserTest.java	19 Jan 2007 16:37:18 -0000
>@@ -1587,7 +1587,12 @@
> 		" public EA() {\n" + 
> 		" }\n" + 
> 		" void foo() {\n" + 
>-		" <CompleteOnException:E>;\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" throw new Error();\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:E> ) {\n" + 
>+		" }\n" + 
> 		" }\n" + 
> 		"}\n";
> 
>Index: src/org/eclipse/jdt/core/tests/compiler/parser/ReferenceTypeCompletionTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/ReferenceTypeCompletionTest.java,v
>retrieving revision 1.12
>diff -u -r1.12 ReferenceTypeCompletionTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/parser/ReferenceTypeCompletionTest.java	29 Mar 2006 03:50:23 -0000	1.12
>+++ src/org/eclipse/jdt/core/tests/compiler/parser/ReferenceTypeCompletionTest.java	19 Jan 2007 16:37:21 -0000
>@@ -153,8 +153,13 @@
> 		"class Bar {\n" + 
> 		" Bar() {\n" + 
> 		" }\n" + 
>-		" void foo() {\n" +
>-		" <CompleteOnException:X>;\n" + 
>+		" void foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" fred();\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:X> ) {\n" + 
>+		" }\n" + 
> 		" }\n" + 
> 		"}\n",
> 		// expectedCompletionIdentifier:
>@@ -187,8 +192,13 @@
> 		"class Bar {\n" + 
> 		" Bar() {\n" + 
> 		" }\n" + 
>-		" void foo() {\n" +
>-		" <CompleteOnException:X>;\n" + 
>+		" void foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" fred();\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:X> ) {\n" + 
>+		" }\n" + 
> 		" }\n" + 
> 		"}\n",
> 		// expectedCompletionIdentifier:
>@@ -221,8 +231,13 @@
> 		"class Bar {\n" + 
> 		" Bar() {\n" + 
> 		" }\n" + 
>-		" void foo() {\n" +
>-		" <CompleteOnException:x.y.X>;\n" + 
>+		" void foo() {\n" + 
>+		" try \n" + 
>+		" {\n" + 
>+		" fred();\n" + 
>+		" }\n" + 
>+		" catch (<CompleteOnException:x.y.X> ) {\n" + 
>+		" }\n" + 
> 		" }\n" + 
> 		"}\n",
> 		// expectedCompletionIdentifier:

Actions: View | Diff

Attachments on bug 157584: 57154