Attachment #25604 for bug #99903

Lines 107-112 Link Here

(-)src/org/eclipse/jdt/core/tests/model/AbstractJavaSearchTests.java (+3 lines)
107	} else if (element instanceof IImportDeclaration) {	107	} else if (element instanceof IImportDeclaration) {
108	IImportDeclaration importDeclaration = (IImportDeclaration)element;	108	IImportDeclaration importDeclaration = (IImportDeclaration)element;
109	unit = (ICompilationUnit)importDeclaration.getAncestor(IJavaElement.COMPILATION_UNIT);	109	unit = (ICompilationUnit)importDeclaration.getAncestor(IJavaElement.COMPILATION_UNIT);
		110	} else if (element instanceof IPackageDeclaration) {
		111	IPackageDeclaration packageDeclaration = (IPackageDeclaration)element;
		112	unit = (ICompilationUnit)packageDeclaration.getAncestor(IJavaElement.COMPILATION_UNIT);
110	}	113	}
111	if (resource instanceof IFile) {	114	if (resource instanceof IFile) {
112	char[] contents = getSource(resource, element, unit);	115	char[] contents = getSource(resource, element, unit);




//		org.eclipse.jdt.internal.codeassist.SelectionEngine.DEBUG = true;
//		TESTS_PREFIX =  "testBug100772_MultipleClasses";
//		TESTS_NAMES = new String[] { "testBug100772_ClassAndSubclass04" };
//		TESTS_NUMBERS = new int[] { 99903 };
//		TESTS_RANGE = new int[] { 83304, -1 };
		}


		this.discard = false;
		search(type, REFERENCES);
		assertSearchResults(
			"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" + 
			"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" + 
			"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" + 
			"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" + 
			"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC"
		);
	}
	public void testBug83804_Method() throws CoreException {

		this.discard = false;
		search(methods[0], REFERENCES);
		assertSearchResults(
			"src/b83804/package-info.java [foo()] EXACT_MATCH INSIDE_JAVADOC"
		);
	}
	public void testBug83804_Field() throws CoreException {

		assertEquals("Invalid number of fields", 1, fields.length);
		search(fields[0], REFERENCES);
		assertSearchResults(
			"src/b83804/package-info.java [field] EXACT_MATCH INSIDE_JAVADOC"
		);
	}


		assertSearchResults(
			"src/b86380/Test.java b86380.Test [Annot] EXACT_MATCH OUTSIDE_JAVADOC\n" + 
			"src/b86380/Test.java b86380.Test.field [Annot] EXACT_MATCH OUTSIDE_JAVADOC\n" + 
			"src/b86380/package-info.java [Annot] EXACT_MATCH INSIDE_JAVADOC\n" + 
			"src/b86380/package-info.java [Annot] EXACT_MATCH OUTSIDE_JAVADOC"
		);
	}
	public void testBug86380_Method() throws CoreException {

		search(methods[0], REFERENCES);
		assertSearchResults(
			"src/b86380/Test.java b86380.Test [12] EXACT_MATCH OUTSIDE_JAVADOC\n" + 
			"src/b86380/package-info.java [value] EXACT_MATCH OUTSIDE_JAVADOC"
		);
	}
	public void testBug86380_Field() throws CoreException {

		search(fields[0], REFERENCES);
		assertSearchResults(
			"src/b86380/Test.java b86380.Test.field [field] EXACT_MATCH OUTSIDE_JAVADOC\n" + 
			"src/b86380/package-info.java [field] EXACT_MATCH INSIDE_JAVADOC"
		);
	}


	}

	/**
	 * Bug 99903: [1.5][search] range wrong for package-info
	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=99903"
	 */
	public void testBug99903_annotation() throws CoreException {
		workingCopies = new ICompilationUnit[3];
		workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/b99903/package-info.java",
			"/**\n" + 
			" * @see Test\n" + 
			" */\n" + 
			"@Annot\n" + 
			"package b99903;\n"
		);
		workingCopies[1] = getWorkingCopy("/JavaSearchBugs/src/b99903/Test.java",
			"package b99903;\n" + 
			"public class Test {\n" + 
			"}\n"
		);
		workingCopies[2] = getWorkingCopy("/JavaSearchBugs/src/b99903/Annot.java",
			"package b99903;\n" + 
			"public @interface Annot {\n" + 
			"}\n"
		);
		IType type = workingCopies[2].getType("Annot");
		search(type, REFERENCES);
		this.discard = false;
		assertSearchResults(
			"src/b99903/package-info.java [Annot] EXACT_MATCH"
		);
	}
	public void testBug99903_javadoc() throws CoreException {
		assertNotNull("There should be working copies!", workingCopies);
		assertEquals("Invalid number of working copies kept between tests!", 3, workingCopies.length);
		resultCollector.showInsideDoc = true;
		IType type = workingCopies[1].getType("Test");
		search(type, REFERENCES);
		assertSearchResults(
			"src/b99903/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC"
		);
	}

	/**
	 * Bug 100695: [1.5][search] Renaming a field of generic array type has no effect
	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=100695"
	 */

Return to bug 99903

Lines 46-52 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (-12 / +53 lines)
46	// org.eclipse.jdt.internal.codeassist.SelectionEngine.DEBUG = true;	46	// org.eclipse.jdt.internal.codeassist.SelectionEngine.DEBUG = true;
47	// TESTS_PREFIX = "testBug100772_MultipleClasses";	47	// TESTS_PREFIX = "testBug100772_MultipleClasses";
48	// TESTS_NAMES = new String[] { "testBug100772_ClassAndSubclass04" };	48	// TESTS_NAMES = new String[] { "testBug100772_ClassAndSubclass04" };
49	// TESTS_NUMBERS = new int[] { 100772 };	49	// TESTS_NUMBERS = new int[] { 99903 };
50	// TESTS_RANGE = new int[] { 83304, -1 };	50	// TESTS_RANGE = new int[] { 83304, -1 };
51	}	51	}
52		52
Lines 1956-1966 Link Here
1956	this.discard = false;	1956	this.discard = false;
1957	search(type, REFERENCES);	1957	search(type, REFERENCES);
1958	assertSearchResults(	1958	assertSearchResults(
1959	"src/b83804/package-info.java b83804.package-info [Test] EXACT_MATCH INSIDE_JAVADOC\n" +	1959	"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" +
1960	"src/b83804/package-info.java b83804.package-info [Test] EXACT_MATCH INSIDE_JAVADOC\n" +	1960	"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" +
1961	"src/b83804/package-info.java b83804.package-info [Test] EXACT_MATCH INSIDE_JAVADOC\n" +	1961	"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" +
1962	"src/b83804/package-info.java b83804.package-info [Test] EXACT_MATCH INSIDE_JAVADOC\n" +	1962	"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC\n" +
1963	"src/b83804/package-info.java b83804.package-info [Test] EXACT_MATCH INSIDE_JAVADOC"	1963	"src/b83804/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC"
1964	);	1964	);
1965	}	1965	}
1966	public void testBug83804_Method() throws CoreException {	1966	public void testBug83804_Method() throws CoreException {
Lines 1972-1978 Link Here
1972	this.discard = false;	1972	this.discard = false;
1973	search(methods[0], REFERENCES);	1973	search(methods[0], REFERENCES);
1974	assertSearchResults(	1974	assertSearchResults(
1975	"src/b83804/package-info.java b83804.package-info [foo()] EXACT_MATCH INSIDE_JAVADOC"	1975	"src/b83804/package-info.java [foo()] EXACT_MATCH INSIDE_JAVADOC"
1976	);	1976	);
1977	}	1977	}
1978	public void testBug83804_Field() throws CoreException {	1978	public void testBug83804_Field() throws CoreException {
Lines 1983-1989 Link Here
1983	assertEquals("Invalid number of fields", 1, fields.length);	1983	assertEquals("Invalid number of fields", 1, fields.length);
1984	search(fields[0], REFERENCES);	1984	search(fields[0], REFERENCES);
1985	assertSearchResults(	1985	assertSearchResults(
1986	"src/b83804/package-info.java b83804.package-info [field] EXACT_MATCH INSIDE_JAVADOC"	1986	"src/b83804/package-info.java [field] EXACT_MATCH INSIDE_JAVADOC"
1987	);	1987	);
1988	}	1988	}
1989		1989
Lines 2443-2450 Link Here
2443	assertSearchResults(	2443	assertSearchResults(
2444	"src/b86380/Test.java b86380.Test [Annot] EXACT_MATCH OUTSIDE_JAVADOC\n" +	2444	"src/b86380/Test.java b86380.Test [Annot] EXACT_MATCH OUTSIDE_JAVADOC\n" +
2445	"src/b86380/Test.java b86380.Test.field [Annot] EXACT_MATCH OUTSIDE_JAVADOC\n" +	2445	"src/b86380/Test.java b86380.Test.field [Annot] EXACT_MATCH OUTSIDE_JAVADOC\n" +
2446	"src/b86380/package-info.java b86380.package-info [Annot] EXACT_MATCH INSIDE_JAVADOC\n" +	2446	"src/b86380/package-info.java [Annot] EXACT_MATCH INSIDE_JAVADOC\n" +
2447	"src/b86380/package-info.java b86380.package-info [Annot] EXACT_MATCH OUTSIDE_JAVADOC"	2447	"src/b86380/package-info.java [Annot] EXACT_MATCH OUTSIDE_JAVADOC"
2448	);	2448	);
2449	}	2449	}
2450	public void testBug86380_Method() throws CoreException {	2450	public void testBug86380_Method() throws CoreException {
Lines 2458-2464 Link Here
2458	search(methods[0], REFERENCES);	2458	search(methods[0], REFERENCES);
2459	assertSearchResults(	2459	assertSearchResults(
2460	"src/b86380/Test.java b86380.Test [12] EXACT_MATCH OUTSIDE_JAVADOC\n" +	2460	"src/b86380/Test.java b86380.Test [12] EXACT_MATCH OUTSIDE_JAVADOC\n" +
2461	"src/b86380/package-info.java b86380.package-info [value] EXACT_MATCH OUTSIDE_JAVADOC"	2461	"src/b86380/package-info.java [value] EXACT_MATCH OUTSIDE_JAVADOC"
2462	);	2462	);
2463	}	2463	}
2464	public void testBug86380_Field() throws CoreException {	2464	public void testBug86380_Field() throws CoreException {
Lines 2471-2477 Link Here
2471	search(fields[0], REFERENCES);	2471	search(fields[0], REFERENCES);
2472	assertSearchResults(	2472	assertSearchResults(
2473	"src/b86380/Test.java b86380.Test.field [field] EXACT_MATCH OUTSIDE_JAVADOC\n" +	2473	"src/b86380/Test.java b86380.Test.field [field] EXACT_MATCH OUTSIDE_JAVADOC\n" +
2474	"src/b86380/package-info.java b86380.package-info [field] EXACT_MATCH INSIDE_JAVADOC"	2474	"src/b86380/package-info.java [field] EXACT_MATCH INSIDE_JAVADOC"
2475	);	2475	);
2476	}	2476	}
2477		2477
Lines 3738-3743 Link Here
3738	}	3738	}
3739		3739
3740	/**	3740	/**
		3741	* Bug 99903: [1.5][search] range wrong for package-info
		3742	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=99903"
		3743	*/
		3744	public void testBug99903_annotation() throws CoreException {
		3745	workingCopies = new ICompilationUnit[3];
		3746	workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/b99903/package-info.java",
		3747	"/**\n" +
		3748	" * @see Test\n" +
		3749	" */\n" +
		3750	"@Annot\n" +
		3751	"package b99903;\n"
		3752	);
		3753	workingCopies[1] = getWorkingCopy("/JavaSearchBugs/src/b99903/Test.java",
		3754	"package b99903;\n" +
		3755	"public class Test {\n" +
		3756	"}\n"
		3757	);
		3758	workingCopies[2] = getWorkingCopy("/JavaSearchBugs/src/b99903/Annot.java",
		3759	"package b99903;\n" +
		3760	"public @interface Annot {\n" +
		3761	"}\n"
		3762	);
		3763	IType type = workingCopies[2].getType("Annot");
		3764	search(type, REFERENCES);
		3765	this.discard = false;
		3766	assertSearchResults(
		3767	"src/b99903/package-info.java [Annot] EXACT_MATCH"
		3768	);
		3769	}
		3770	public void testBug99903_javadoc() throws CoreException {
		3771	assertNotNull("There should be working copies!", workingCopies);
		3772	assertEquals("Invalid number of working copies kept between tests!", 3, workingCopies.length);
		3773	resultCollector.showInsideDoc = true;
		3774	IType type = workingCopies[1].getType("Test");
		3775	search(type, REFERENCES);
		3776	assertSearchResults(
		3777	"src/b99903/package-info.java [Test] EXACT_MATCH INSIDE_JAVADOC"
		3778	);
		3779	}
		3780
		3781	/**
3741	* Bug 100695: [1.5][search] Renaming a field of generic array type has no effect	3782	* Bug 100695: [1.5][search] Renaming a field of generic array type has no effect
3742	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=100695"	3783	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=100695"
3743	*/	3784	*/