Attachment #11007 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));
		
//		return suite;
	}

			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 152-159 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java (-10 / +13 lines)
152	suite.addTest(new JavaSearchJavadocTests("testBug49994field", support));	152	suite.addTest(new JavaSearchJavadocTests("testBug49994field", support));
153	suite.addTest(new JavaSearchJavadocTests("testBug49994method", support));	153	suite.addTest(new JavaSearchJavadocTests("testBug49994method", support));
154	suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));	154	suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));
155	suite.addTest(new JavaSearchJavadocTests("testBug54962"));	155	suite.addTest(new JavaSearchJavadocTests("testBug54962", support));
156	suite.addTest(new JavaSearchJavadocTests("testBug54962qualified"));	156	suite.addTest(new JavaSearchJavadocTests("testBug54962qualified", support));
157		157
158	// return suite;	158	// return suite;
159	}	159	}
Lines 169-175 Link Here
169	StringBuffer buffer = new StringBuffer(expected.length());	169	StringBuffer buffer = new StringBuffer(expected.length());
170	while (tokenizer.hasMoreTokens()) {	170	while (tokenizer.hasMoreTokens()) {
171	String token = tokenizer.nextToken();	171	String token = tokenizer.nextToken();
172	if (token.startsWith("src/j1/JavadocSearched.java") \|\| token.startsWith("test47909.jar")) {	172	if (token.startsWith("src/j1/JavadocSearched.java") \|\| token.startsWith("test47909.jar") \|\| token.indexOf("OUTSIDE_JAVADOC") > 0) {
173	if (buffer.length() > 0) buffer.append('\n');	173	if (buffer.length() > 0) buffer.append('\n');
174	buffer.append(token);	174	buffer.append(token);
175	}	175	}
Lines 1093-1116 Link Here
1093	setJavadocOptions();	1093	setJavadocOptions();
1094	JavaSearchResultCollector result = new JavaSearchResultCollector();	1094	JavaSearchResultCollector result = new JavaSearchResultCollector();
1095	result.showAccuracy = true;	1095	result.showAccuracy = true;
		1096	result.showInsideDoc = true;
1096	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");	1097	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");
1097	search(packDecl, REFERENCES, getJavaSearchScope(), result);	1098	search(packDecl, REFERENCES, getJavaSearchScope(), result);
1098	assertSearchResults(	1099	assertSearchResults(
1099	"src/j6/Bug54962.java [j6] EXACT_MATCH\n" +	1100	"src/j6/Bug54962.java [j6] EXACT_MATCH INSIDE_JAVADOC\n" +
1100	"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH\n" +	1101	"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH INSIDE_JAVADOC\n" +
1101	"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH",	1102	"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" +
		1103	"src/j7/qua/li/fied/Bug54962a.java [j6] EXACT_MATCH OUTSIDE_JAVADOC",
1102	result);	1104	result);
1103	}	1105	}
1104	public void testBug54962qualified() throws CoreException {	1106	public void testBug54962qualified() throws CoreException {
1105	setJavadocOptions();	1107	setJavadocOptions();
1106	JavaSearchResultCollector result = new JavaSearchResultCollector();	1108	JavaSearchResultCollector result = new JavaSearchResultCollector();
1107	result.showAccuracy = true;	1109	result.showAccuracy = true;
1108	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962.java").getPackageDeclaration("j7.qua.li.fied");	1110	result.showInsideDoc = true;
		1111	IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962a.java").getPackageDeclaration("j7.qua.li.fied");
1109	search(packDecl, REFERENCES, getJavaSearchScope(), result);	1112	search(packDecl, REFERENCES, getJavaSearchScope(), result);
1110	assertSearchResults(	1113	assertSearchResults(
1111	"src/j7/qua/li/fied/Bug54962.java [j7.qua.li.fied] EXACT_MATCH\n" +	1114	"src/j7/qua/li/fied/Bug54962a.java [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC\n" +
1112	"src/j7/qua/li/fied/Bug54962.java j7.qua.li.fied.Bug54962 [j7.qua.li.fied] POTENTIAL_MATCH\n" +	1115	"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] POTENTIAL_MATCH INSIDE_JAVADOC\n" +
1113	"src/j7/qua/li/fied/Bug54962.java j7.qua.li.fied.Bug54962 [j7.qua.li.fied] EXACT_MATCH",	1116	"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC",
1114	result);	1117	result);
1115	}	1118	}
1116	}	1119	}