Attachment 129035 Details for Bug 203060 – Revised patch

[patch] Revised patch

patch.txt (text/plain), 8.24 KB, created by Srikanth Sankaran

on 2009-03-17 02:47:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Srikanth Sankaran

Created: 2009-03-17 02:47:19 EDT

Size: 8.24 KB

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.196
>diff -u -r1.196 CompletionTests.java
>--- src/org/eclipse/jdt/core/tests/model/CompletionTests.java	5 Mar 2009 13:49:11 -0000	1.196
>+++ src/org/eclipse/jdt/core/tests/model/CompletionTests.java	17 Mar 2009 06:28:35 -0000
>@@ -12,6 +12,7 @@
> 
> import java.io.IOException;
> import java.util.Hashtable;
>+import java.util.Map;
> 
> import junit.framework.Test;
> 
>@@ -30,6 +31,7 @@
> import org.eclipse.jdt.core.Signature;
> import org.eclipse.jdt.core.eval.IEvaluationContext;
> import org.eclipse.jdt.internal.codeassist.CompletionEngine;
>+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.core.eval.EvaluationContextWrapper;
> 
> public class CompletionTests extends AbstractJavaModelCompletionTests {
>@@ -19480,4 +19482,149 @@
> 			requestor.getResults());
> }
> 
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=203060: assert keyword should not be proposed when
>+// compliance level is set to 1.3
>+public void test203060a() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/KeywordAssert.java",
>+		"package test;" +
>+		"public class CompletionKeywordAssert1 {\n" +
>+		"	void foo() {\n" +
>+		"		as\n" +
>+		"	}\n" +
>+		"}\n");
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "as";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	
>+	// Save current compliance settings
>+	Map options = COMPLETION_PROJECT.getOptions(true);
>+	Object savedOptionCompliance = options.get(CompilerOptions.OPTION_Compliance);
>+	
>+	try {
>+		// Verify that at 1.3 assert is not proposed.
>+		options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_3);
>+		COMPLETION_PROJECT.setOptions(options);
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		assertEquals("", requestor.getResults());
>+	} finally {
>+		// Restore compliance settings.
>+		options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
>+		COMPLETION_PROJECT.setOptions(options);	
>+	}
>+}
>+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=203060: Verify that assert keyword gets proposed when
>+//compliance level is set to 1.4
>+public void test203060b() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/KeywordAssert.java",
>+		"package test;" +
>+		"public class CompletionKeywordAssert1 {\n" +
>+		"	void foo() {\n" +
>+		"		as\n" +
>+		"	}\n" +
>+		"}\n");
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "as";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	
>+	// Save current compliance settings
>+	Map options = COMPLETION_PROJECT.getOptions(true);
>+	Object savedOptionCompliance = options.get(CompilerOptions.OPTION_Compliance);
>+	
>+	try {
>+		options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_4);
>+		COMPLETION_PROJECT.setOptions(options);
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		assertEquals(
>+				"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+				requestor.getResults());
>+	} finally {
>+		// Restore compliance settings.
>+		options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
>+		COMPLETION_PROJECT.setOptions(options);	
>+	}
>+}
>+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=203060: assert keyword should not be proposed when
>+//compliance level is set to 1.3 (variation)
>+public void test203060c() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+		"/Completion/src/test/KeywordAssert.java",
>+		"package test;" +
>+		"public class KeywordAssert {\n" +
>+		"			void foo() {\n" +
>+		"		switch(0) {\n" +
>+		"			case 1 :\n" +
>+		"				ass\n" +
>+		"		}\n" +
>+		"	}\n" +
>+		"}\n");
>+		
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "as";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	
>+	// Save current compliance settings
>+	Map options = COMPLETION_PROJECT.getOptions(true);
>+	Object savedOptionCompliance = options.get(CompilerOptions.OPTION_Compliance);
>+	
>+	try {
>+		// Verify that at 1.3 assert is not proposed.
>+		options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_3);
>+		COMPLETION_PROJECT.setOptions(options);
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		assertEquals("", requestor.getResults());
>+	} finally {
>+		// Restore compliance settings.
>+		options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
>+		COMPLETION_PROJECT.setOptions(options);	
>+	}
>+}
>+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=203060: Verify that assert keyword gets proposed when
>+//compliance level is set to 1.4 (variation)
>+public void test203060d() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/KeywordAssert.java",
>+			"package test;" +
>+			"public class KeywordAssert {\n" +
>+			"			void foo() {\n" +
>+			"		switch(0) {\n" +
>+			"			case 1 :\n" +
>+			"				ass\n" +
>+			"		}\n" +
>+			"	}\n" +
>+			"}\n");
>+			
>+	CompletionTestsRequestor requestor = new CompletionTestsRequestor();
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "as";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	
>+	// Save current compliance settings
>+	Map options = COMPLETION_PROJECT.getOptions(true);
>+	Object savedOptionCompliance = options.get(CompilerOptions.OPTION_Compliance);
>+	
>+	try {
>+		options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_4);
>+		COMPLETION_PROJECT.setOptions(options);
>+		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+		assertEquals(
>+				"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
>+				requestor.getResults());
>+	} finally {
>+		// Restore compliance settings.
>+		options.put(CompilerOptions.OPTION_Compliance, savedOptionCompliance);
>+		COMPLETION_PROJECT.setOptions(options);	
>+	}
>+}
> }
>#P org.eclipse.jdt.core
>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.202
>diff -u -r1.202 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	4 Mar 2009 11:57:21 -0000	1.202
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	17 Mar 2009 06:28:41 -0000
>@@ -4018,8 +4018,9 @@
> 				if(this.canBeExplicitConstructor == YES) {
> 					canBeExplicitConstructorCall = true;
> 				}
>-
>-				keywords[count++]= Keywords.ASSERT;
>+				if (this.options.complianceLevel >= ClassFileConstants.JDK1_4) {
>+					keywords[count++]= Keywords.ASSERT;
>+				}
> 				keywords[count++]= Keywords.DO;
> 				keywords[count++]= Keywords.FOR;
> 				keywords[count++]= Keywords.IF;
>@@ -4061,8 +4062,9 @@
> 					}
> 					keywords[count++]= Keywords.BREAK;
> 					keywords[count++]= Keywords.CASE;
>-
>-					keywords[count++]= Keywords.ASSERT;
>+					if (this.options.complianceLevel >= ClassFileConstants.JDK1_4) {
>+						keywords[count++]= Keywords.ASSERT;
>+					}
> 					keywords[count++]= Keywords.DO;
> 					keywords[count++]= Keywords.FOR;
> 					keywords[count++]= Keywords.IF;

Flags:

david_audel: review+

Actions: View | Diff

Attachments on bug 203060: 128899 | 129035