Attachment #11147 for bug #62697




		suite.addTest(new JavaSearchJavadocTests("testBug49994field", support));
		suite.addTest(new JavaSearchJavadocTests("testBug49994method", support));
		suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));
		suite.addTest(new JavaSearchJavadocTests("testBug54962", support));
		suite.addTest(new JavaSearchJavadocTests("testBug54962qualified", support));
	}

	/* (non-Javadoc)

			StringBuffer buffer = new StringBuffer(expected.length());
			while (tokenizer.hasMoreTokens()) {
				String token = tokenizer.nextToken();
				if (token.startsWith("src/j1/JavadocSearched.java") || token.startsWith("test47909.jar") || token.indexOf("OUTSIDE_JAVADOC") > 0) {
					if (buffer.length() > 0) buffer.append('\n');
					buffer.append(token);
				}

		setJavadocOptions();
		JavaSearchResultCollector result = new JavaSearchResultCollector();
		result.showAccuracy = true;
		result.showInsideDoc = true;
		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");
		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
		assertSearchResults(
			"src/j6/Bug54962.java [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
				"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
				"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
				"src/j7/qua/li/fied/Bug54962a.java [j6] EXACT_MATCH OUTSIDE_JAVADOC",
			result);
	}
	public void testBug54962qualified() throws CoreException {
		setJavadocOptions();
		JavaSearchResultCollector result = new JavaSearchResultCollector();
		result.showAccuracy = true;
		result.showInsideDoc = true;
		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962a.java").getPackageDeclaration("j7.qua.li.fied");
		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
		assertSearchResults(
			"src/j7/qua/li/fied/Bug54962a.java [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC\n" + 
				"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
				"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC",
			result);
	}
}

Removed Link Here

(-)workspace/JavaSearch/src/j7/qua/li/fied/Bug54962.java (-8 lines)
1	package j7.qua.li.fied;
2	/**
3	* @see j7.qua.li.fied
4	* @see j7.qua.li.fied.BUG54962
5	* @see j7.qua.li.fied.Bug54962
6	*/
7	public class Bug54962 {
8	}

Added Link Here

(-)workspace/JavaSearch/src/j7/qua/li/fied/Bug54962a.java (+10 lines)
1	package j7.qua.li.fied;
2	import j6.Bug54962;
3	/**
4	* @see j7.qua.li.fied
5	* @see j7.qua.li.fied.BUG54962a
6	* @see j7.qua.li.fied.Bug54962a
7	*/
8	public class Bug54962a {
9	Bug54962 j6 = new Bug54962();
10	}

Return to bug 62697

Lines 151-158 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java (-10 / +13 lines)
151	suite.addTest(new JavaSearchJavadocTests("testBug49994field", support));	151	suite.addTest(new JavaSearchJavadocTests("testBug49994field", support));
152	suite.addTest(new JavaSearchJavadocTests("testBug49994method", support));	152	suite.addTest(new JavaSearchJavadocTests("testBug49994method", support));
153	suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));	153	suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));
154	suite.addTest(new JavaSearchJavadocTests("testBug54962"));	154	suite.addTest(new JavaSearchJavadocTests("testBug54962", support));
155	suite.addTest(new JavaSearchJavadocTests("testBug54962qualified"));	155	suite.addTest(new JavaSearchJavadocTests("testBug54962qualified", support));
156	}	156	}
157		157
158	/* (non-Javadoc)	158	/* (non-Javadoc)
Lines 166-172 Link Here
166	StringBuffer buffer = new StringBuffer(expected.length());	166	StringBuffer buffer = new StringBuffer(expected.length());
167	while (tokenizer.hasMoreTokens()) {	167	while (tokenizer.hasMoreTokens()) {
168	String token = tokenizer.nextToken();	168	String token = tokenizer.nextToken();
169	if (token.startsWith("src/j1/JavadocSearched.java") \|\| token.startsWith("test47909.jar")) {	169	if (token.startsWith("src/j1/JavadocSearched.java") \|\| token.startsWith("test47909.jar") \|\| token.indexOf("OUTSIDE_JAVADOC") > 0) {
170	if (buffer.length() > 0) buffer.append('\n');	170	if (buffer.length() > 0) buffer.append('\n');
171	buffer.append(token);	171	buffer.append(token);
172	}	172	}
Lines 1047-1070 Link Here
1047	setJavadocOptions();	1047	setJavadocOptions();
1048	JavaSearchResultCollector result = new JavaSearchResultCollector();	1048	JavaSearchResultCollector result = new JavaSearchResultCollector();
1049	result.showAccuracy = true;	1049	result.showAccuracy = true;
		1050	result.showInsideDoc = true;
1050	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");	1051	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");
1051	search(packDecl, REFERENCES, getJavaSearchScope(), result);	1052	search(packDecl, REFERENCES, getJavaSearchScope(), result);
1052	assertSearchResults(	1053	assertSearchResults(
1053	"src/j6/Bug54962.java [j6] EXACT_MATCH\n" +	1054	"src/j6/Bug54962.java [j6] EXACT_MATCH INSIDE_JAVADOC\n" +
1054	"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH\n" +	1055	"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH INSIDE_JAVADOC\n" +
1055	"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH",	1056	"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" +
		1057	"src/j7/qua/li/fied/Bug54962a.java [j6] EXACT_MATCH OUTSIDE_JAVADOC",
1056	result);	1058	result);
1057	}	1059	}
1058	public void testBug54962qualified() throws CoreException {	1060	public void testBug54962qualified() throws CoreException {
1059	setJavadocOptions();	1061	setJavadocOptions();
1060	JavaSearchResultCollector result = new JavaSearchResultCollector();	1062	JavaSearchResultCollector result = new JavaSearchResultCollector();
1061	result.showAccuracy = true;	1063	result.showAccuracy = true;
1062	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962.java").getPackageDeclaration("j7.qua.li.fied");	1064	result.showInsideDoc = true;
		1065	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962a.java").getPackageDeclaration("j7.qua.li.fied");
1063	search(packDecl, REFERENCES, getJavaSearchScope(), result);	1066	search(packDecl, REFERENCES, getJavaSearchScope(), result);
1064	assertSearchResults(	1067	assertSearchResults(
1065	"src/j7/qua/li/fied/Bug54962.java [j7.qua.li.fied] EXACT_MATCH\n" +	1068	"src/j7/qua/li/fied/Bug54962a.java [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC\n" +
1066	"src/j7/qua/li/fied/Bug54962.java j7.qua.li.fied.Bug54962 [j7.qua.li.fied] POTENTIAL_MATCH\n" +	1069	"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] POTENTIAL_MATCH INSIDE_JAVADOC\n" +
1067	"src/j7/qua/li/fied/Bug54962.java j7.qua.li.fied.Bug54962 [j7.qua.li.fied] EXACT_MATCH",	1070	"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC",
1068	result);	1071	result);
1069	}	1072	}
1070	}	1073	}