Attachment 208319 Details for Bug 365992 – test & fix

[patch] test & fix

Bug_365992.patch (text/plain), 11.78 KB, created by Stephan Herrmann

on 2011-12-13 11:05:09 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2011-12-13 11:05:09 EST

Size: 11.78 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AnnotationDependencyTests.java b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AnnotationDependencyTests.java
>index 38f0a99..5897a07 100644
>--- a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AnnotationDependencyTests.java
>+++ b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AnnotationDependencyTests.java
>@@ -11,10 +11,20 @@
>  *******************************************************************************/
> package org.eclipse.jdt.core.tests.builder;
> 
>+import java.io.File;
>+import java.io.IOException;
>+
> import junit.framework.Test;
> 
> import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.runtime.FileLocator;
> import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.jdt.core.IClasspathEntry;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.compiler.CategorizedProblem;
> import org.eclipse.jdt.core.tests.util.Util;
> 
>@@ -127,6 +137,20 @@
> 		env.addClass(this.srcRoot, "p1", "AnnoClass", annoCode);
> 	}
> 	
>+	void setupProjectForNullAnnotations() throws IOException, JavaModelException {
>+		// add the org.eclipse.jdt.annotation library (bin/ folder or jar) to the project:
>+		File bundleFile = FileLocator.getBundleFile(Platform.getBundle("org.eclipse.jdt.annotation"));
>+		String annotationsLib = bundleFile.isDirectory() ? bundleFile.getPath()+"/bin" : bundleFile.getPath();
>+		IJavaProject javaProject = env.getJavaProject(this.projectPath);
>+		IClasspathEntry[] rawClasspath = javaProject.getRawClasspath();
>+		int len = rawClasspath.length;
>+		System.arraycopy(rawClasspath, 0, rawClasspath = new IClasspathEntry[len+1], 0, len);
>+		rawClasspath[len] = JavaCore.newLibraryEntry(new Path(annotationsLib), null, null);
>+		javaProject.setRawClasspath(rawClasspath, null);
>+
>+		javaProject.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+	}
>+
> 	/**
> 	 * This test makes sure that changing an annotation on type A causes type B
> 	 * to be recompiled, if B references A.  See http://bugs.eclipse.org/149768
>@@ -1371,4 +1395,115 @@
> 		// verify that B was recompiled
> 		expectingUniqueCompiledClasses(new String[] { "p1.A", "p1.B" });
> 	}
>+
>+	// Bug 365992 - [builder] [null] Change of nullness for a parameter doesn't trigger a build for the files that call the method
>+	public void testParameterAnnotationDependency01() throws JavaModelException, IOException {
>+		// prepare the project:
>+		setupProjectForNullAnnotations();
>+
>+		String test1Code = "package p1;\n"	+
>+			"public class Test1 {\n" +
>+			"    public void foo() {\n" +
>+			"        new Test2().bar(null);\n" +
>+			"    }\n" +
>+			"}";
>+		String test2Code = "package p1;\n" +
>+			"public class Test2 {\n" +
>+			"    public void bar(String str) {}\n" +
>+			"}";
>+
>+		IPath test1Path = env.addClass( this.srcRoot, "p1", "Test1", test1Code );
>+		env.addClass( this.srcRoot, "p1", "Test2", test2Code );
>+
>+		fullBuild( this.projectPath );
>+		expectingNoProblems();
>+
>+		// edit Test2 to add @NonNull annotation (changes number of annotations)
>+		String test2CodeB = "package p1;\n" +
>+			"import org.eclipse.jdt.annotation.NonNull;\n" +
>+			"public class Test2 {\n" +
>+			"    public void bar(@NonNull String str) {}\n" +
>+			"}";
>+		env.addClass( this.srcRoot, "p1", "Test2", test2CodeB );
>+		incrementalBuild( this.projectPath );
>+		expectingProblemsFor(test1Path, 
>+				"Problem : Type mismatch: required \'@NonNull String\' but the provided value is null [ resource : </Project/src/p1/Test1.java> range : <81,85> category : <90> severity : <2>]");
>+
>+		// verify that Test1 was recompiled
>+		expectingUniqueCompiledClasses(new String[] { "p1.Test1", "p1.Test2" });
>+
>+		// fix error by changing to @Nullable (change is only in an annotation name)
>+		String test2CodeC = "package p1;\n" +
>+			"import org.eclipse.jdt.annotation.Nullable;\n" +
>+			"public class Test2 {\n" +
>+			"    public void bar(@Nullable String str) {}\n" +
>+			"}";
>+		env.addClass( this.srcRoot, "p1", "Test2", test2CodeC );
>+		incrementalBuild( this.projectPath );
>+		expectingNoProblems();
>+
>+		// verify that Test1 was recompiled
>+		expectingUniqueCompiledClasses(new String[] { "p1.Test1", "p1.Test2" });
>+	}
>+
>+	// Bug 365992 - [builder] [null] Change of nullness for a parameter doesn't trigger a build for the files that call the method
>+	// Bug 366341 - Incremental compiler fails to detect right scope for annotation related code changes
>+	public void testReturnAnnotationDependency01() throws JavaModelException, IOException {
>+		// prepare the project:
>+		setupProjectForNullAnnotations();
>+
>+		String test1Code = "package p1;\n" +
>+			"import org.eclipse.jdt.annotation.NonNull;\n" +
>+			"public class Test1 {\n" +
>+			"    public @NonNull Object foo() {\n" +
>+			"        return new Test2().bar();\n" +
>+			"    }\n" +
>+			"}";
>+		String test2Code = "package p1;\n" +
>+			"import org.eclipse.jdt.annotation.NonNull;\n" +
>+			"public class Test2 {\n" +
>+			"    public @NonNull Object bar() { return this; }\n" +
>+			"}";
>+
>+		IPath test1Path = env.addClass( this.srcRoot, "p1", "Test1", test1Code );
>+		env.addClass( this.srcRoot, "p1", "Test2", test2Code );
>+
>+		fullBuild( this.projectPath );
>+		expectingNoProblems();
>+
>+		// edit Test2 to replace annotation
>+		String test2CodeB = "package p1;\n" +
>+			"import org.eclipse.jdt.annotation.Nullable;\n" +
>+			"public class Test2 {\n" +
>+			"    public @Nullable Object bar() { return null; }\n" +
>+			"}";
>+		env.addClass( this.srcRoot, "p1", "Test2", test2CodeB );
>+		incrementalBuild( this.projectPath );
>+		expectingProblemsFor(test1Path, 
>+			"Problem : Type mismatch: required \'@NonNull Object\' but the provided value can be null [ resource : </Project/src/p1/Test1.java> range : <126,143> category : <90> severity : <2>]");
>+
>+		// verify that Test1 was recompiled
>+		expectingUniqueCompiledClasses(new String[] { "p1.Test1", "p1.Test2" });
>+
>+		// remove annotation, error changes from can be null to unknown nullness
>+		String test2CodeC = "package p1;\n" +
>+			"public class Test2 {\n" +
>+			"    public Object bar() { return null; }\n" +
>+			"}";
>+		env.addClass( this.srcRoot, "p1", "Test2", test2CodeC );
>+		incrementalBuild( this.projectPath );
>+		expectingProblemsFor(test1Path, 
>+			"Problem : Potential type mismatch: required \'@NonNull Object\' but nullness of the provided value is unknown [ resource : </Project/src/p1/Test1.java> range : <126,143> category : <90> severity : <1>]");
>+
>+		// verify that Test1 was recompiled
>+		expectingUniqueCompiledClasses(new String[] { "p1.Test1", "p1.Test2" });
>+
>+		// back to initial OK version (re-add @NonNull annotation)
>+		env.addClass( this.srcRoot, "p1", "Test2", test2Code );
>+		incrementalBuild( this.projectPath );
>+		expectingNoProblems();
>+
>+		// verify that Test1 was recompiled
>+		expectingUniqueCompiledClasses(new String[] { "p1.Test1", "p1.Test2" });
>+	}
> }
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
>index 8fec4cb..f45e942 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
>@@ -1070,6 +1070,16 @@
> 		return true;
> 	if (hasStructuralAnnotationChanges(currentMethodInfo.getAnnotations(), otherMethodInfo.getAnnotations()))
> 		return true;
>+	// parameter annotations:
>+	int currentAnnotatedParamsCount = currentMethodInfo.getAnnotatedParametersCount();
>+	int otherAnnotatedParamsCount = otherMethodInfo.getAnnotatedParametersCount();
>+	if (currentAnnotatedParamsCount != otherAnnotatedParamsCount)
>+		return true;
>+	for (int i=0; i<currentAnnotatedParamsCount; i++) {
>+		if (hasStructuralAnnotationChanges(currentMethodInfo.getParameterAnnotations(i), otherMethodInfo.getParameterAnnotations(i)))
>+			return true;
>+	}
>+
> 	if (!CharOperation.equals(currentMethodInfo.getSelector(), otherMethodInfo.getSelector()))
> 		return true;
> 	if (!CharOperation.equals(currentMethodInfo.getMethodDescriptor(), otherMethodInfo.getMethodDescriptor()))
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
>index 3cd62b0..88d60ac 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
>@@ -271,7 +271,7 @@
> public IBinaryAnnotation[] getParameterAnnotations(int index) {
> 	return null;
> }
>-public int getNumParameterAnnotations() {
>+public int getAnnotatedParametersCount() {
> 	return 0;
> }
> /**
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfoWithParameterAnnotations.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfoWithParameterAnnotations.java
>index 2aad9f8..8f31b3e 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfoWithParameterAnnotations.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfoWithParameterAnnotations.java
>@@ -37,7 +37,7 @@
> public IBinaryAnnotation[] getParameterAnnotations(int index) {
> 	return this.parameterAnnotations[index];
> }
>-public int getNumParameterAnnotations() {
>+public int getAnnotatedParametersCount() {
> 	return this.parameterAnnotations == null ? 0 : this.parameterAnnotations.length;
> }
> protected void initialize() {
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
>index 68b63f6..177ae24 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
>@@ -71,7 +71,7 @@
>  * using {@link #getParameterAnnotations(int)}.
>  * @return one beyond the highest legal argument to {@link #getParameterAnnotations(int)}.
>  */
>-int getNumParameterAnnotations();
>+int getAnnotatedParametersCount();
> 
> /**
>  * Answer the name of the method.
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
>index 4a1bad4..8a71b4a 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
>@@ -1181,7 +1181,7 @@
> 	// parameters:
> 	TypeBinding[] parameters = methodBinding.parameters;
> 	int numVisibleParams = parameters.length;
>-	int numParamAnnotations = method.getNumParameterAnnotations();
>+	int numParamAnnotations = method.getAnnotatedParametersCount();
> 	if (numParamAnnotations > 0) {
> 		int startIndex = numParamAnnotations - numVisibleParams;
> 		for (int j = 0; j < numVisibleParams; j++) {
>diff --git a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
>index e146520..f0090b1 100644
>--- a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
>+++ b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
>@@ -65,7 +65,7 @@
> 		public IBinaryAnnotation[] getParameterAnnotations(int index) {
> 			return null;
> 		}
>-		public int getNumParameterAnnotations() {
>+		public int getAnnotatedParametersCount() {
> 			return 0;
> 		}
> 		public char[] getSelector() {

Actions: View | Diff

Attachments on bug 365992: 208319