Attachment #143244 for bug #281609

Lines 50-60 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/JavadocQualifiedTypeReference.java (-5 / +1 lines)
50	Binding binding = scope.getTypeOrPackage(this.tokens);	50	Binding binding = scope.getTypeOrPackage(this.tokens);
51	if (binding instanceof PackageBinding) {	51	if (binding instanceof PackageBinding) {
52	this.packageBinding = (PackageBinding) binding;	52	this.packageBinding = (PackageBinding) binding;
53	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=211054	53	// Valid package references are allowed in Javadoc (https://bugs.eclipse.org/bugs/show_bug.cgi?id=281609)
54	// allow references to current package only. All other package references should be reported as invalid
55	if (scope.compilationUnitScope().fPackage != this.packageBinding) {
56	scope.problemReporter().javadocInvalidReference(this.sourceStart, this.sourceEnd);
57	}
58	} else {	54	} else {
59	reportInvalidType(scope);	55	reportInvalidType(scope);
60	}	56	}

Lines 65-75 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/JavadocSingleTypeReference.java (-5 / +1 lines)
65	Binding binding = scope.getTypeOrPackage(tokens);	65	Binding binding = scope.getTypeOrPackage(tokens);
66	if (binding instanceof PackageBinding) {	66	if (binding instanceof PackageBinding) {
67	this.packageBinding = (PackageBinding) binding;	67	this.packageBinding = (PackageBinding) binding;
68	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=211054	68	// Valid package references are allowed in Javadoc (https://bugs.eclipse.org/bugs/show_bug.cgi?id=281609)
69	// allow references to current package only. All other package references should be reported as invalid
70	if (scope.compilationUnitScope().fPackage != this.packageBinding) {
71	scope.problemReporter().javadocInvalidReference(this.sourceStart, this.sourceEnd);
72	}
73	} else {	69	} else {
74	if (this.resolvedType.problemId() == ProblemReasons.NonStaticReferenceInStaticContext) {	70	if (this.resolvedType.problemId() == ProblemReasons.NonStaticReferenceInStaticContext) {
75	TypeBinding closestMatch = this.resolvedType.closestMatch();	71	TypeBinding closestMatch = this.resolvedType.closestMatch();




					}
				}
			}
			/*
			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=283413
			 * As per Javadoc documentation, reference to Java elements inside package info requires qualified names.
			 */
			if (scope.referenceCompilationUnit().isPackageInfo() && typeReference instanceof JavadocSingleTypeReference) {
				if (resolvedType.fPackage.compoundName.length > 0) {
					scope.problemReporter().javadocInvalidReference(typeReference.sourceStart, typeReference.sourceEnd);
					return;
				}
			}
		}
	}





				"pack/package-info.java",
				"/**\n" +
				" * Valid javadoc.\n" +
				" * @see pack.Test\n" +
				" * @see Unknown\n" +
				" * @see pack.Test#foo()\n" +
				" * @see pack.Test#unknown()\n" +
				" * @see pack.Test#field\n" +
				" * @see pack.Test#unknown\n" +
				" * @param unexpected\n" +
				" * @throws unexpected\n" +
				" * @return unexpected \n" +

				"	public void foo() {}\n" +
				"}\n"
			},
			"----------\n" + 
			"1. ERROR in pack\\package-info.java (at line 4)\n" + 
			"	* @see Unknown\n" + 
			"	       ^^^^^^^\n" + 
			"Javadoc: Unknown cannot be resolved to a type\n" + 
			"----------\n" + 
			"2. ERROR in pack\\package-info.java (at line 6)\n" + 
			"	* @see pack.Test#unknown()\n" + 
			"	                 ^^^^^^^\n" + 
			"Javadoc: The method unknown() is undefined for the type Test\n" + 
			"----------\n" + 
			"3. ERROR in pack\\package-info.java (at line 8)\n" + 
			"	* @see pack.Test#unknown\n" + 
			"	                 ^^^^^^^\n" + 
			"Javadoc: unknown cannot be resolved or is not a field\n" + 
			"----------\n" + 
			"4. ERROR in pack\\package-info.java (at line 9)\n" + 
			"	* @param unexpected\n" + 
			"	   ^^^^^\n" + 
			"Javadoc: Unexpected tag\n" + 
			"----------\n" + 
			"5. ERROR in pack\\package-info.java (at line 10)\n" + 
			"	* @throws unexpected\n" + 
			"	   ^^^^^^\n" + 
			"Javadoc: Unexpected tag\n" + 
			"----------\n" + 
			"6. ERROR in pack\\package-info.java (at line 11)\n" + 
			"	* @return unexpected \n" + 
			"	   ^^^^^^\n" + 
			"Javadoc: Unexpected tag\n" + 
			"----------\n",
			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
		);

			"----------\n"
		);
	}
	/**
	 * @bug 284333:Javadoc for package-info.java not processed correctly
	 * @test that in a package-info.java file
	 * 				1. References to valid packages are accepted without any warnings or errors
	 * 				2. References to valid Java elements (including the ones in the same package) without qualified names are reported
	 * 				3. References to valid Java elements with qualified names are accepted
	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=284333"
	 */
	public void testBug284333() {
		runNegativeTest(new String[]{
				"goo/bar/package-info.java",
				"/**\n" +
				"*/\n" +
				"package goo.bar;\n",
				"foo/bar/ClassInSamePackage.java",
				"package foo.bar;\n" +
				"public class ClassInSamePackage {\n" +
				"	public static int SOME_FIELD; \n" +
				"}\n",
				"foo/bar/goo/ClassInSubPackage.java",
				"package foo.bar.goo;\n" +
				"public class ClassInSubPackage {\n" +
				"	public static void foo() { \n" +
				"   }\n" +
				"}\n",
				"foo/ClassInEnclosingPackage.java",
				"package foo;\n" +
				"public class ClassInEnclosingPackage {\n" +
				"	public static int SOME_FIELD; \n" +
				"}\n",
				"foo/bar/package-info.java",
				"/**\n" +
				" * @see ClassInSamePackage#SOME_FIELD\n" +
				" * @see foo.bar.ClassInSamePackage#SOME_FIELD\n" +
				" * @see ClassInSamePackage#SOME_FIELD\n" +
				" * @see ClassInSubPackage#foo\n" +
				" * @see foo.bar.goo.ClassInSubPackage#foo\n" +
				" * @see ClassInSubPackage#foo\n" +
				" * @see ClassInEnclosingPackage\n" +
				" * @see foo.ClassInEnclosingPackage\n" +
				" * @see ClassInEnclosingPackage\n" +
				" * @see foo.bar\n" +
				" * @see goo.bar\n" +
				" * @see foo.bar.goo\n" +
				" */\n" +
				"package foo.bar;\n"	
		},
		"----------\n" + 
		"1. ERROR in foo\\bar\\package-info.java (at line 2)\n" + 
		"	* @see ClassInSamePackage#SOME_FIELD\n" + 
		"	       ^^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"2. ERROR in foo\\bar\\package-info.java (at line 4)\n" + 
		"	* @see ClassInSamePackage#SOME_FIELD\n" + 
		"	       ^^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"3. ERROR in foo\\bar\\package-info.java (at line 5)\n" + 
		"	* @see ClassInSubPackage#foo\n" + 
		"	       ^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInSubPackage cannot be resolved to a type\n" + 
		"----------\n" + 
		"4. ERROR in foo\\bar\\package-info.java (at line 7)\n" + 
		"	* @see ClassInSubPackage#foo\n" + 
		"	       ^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInSubPackage cannot be resolved to a type\n" + 
		"----------\n" + 
		"5. ERROR in foo\\bar\\package-info.java (at line 8)\n" + 
		"	* @see ClassInEnclosingPackage\n" + 
		"	       ^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" + 
		"----------\n" + 
		"6. ERROR in foo\\bar\\package-info.java (at line 10)\n" + 
		"	* @see ClassInEnclosingPackage\n" + 
		"	       ^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" + 
		"----------\n");
	}	

	/**
	 * Additional tests for "https://bugs.eclipse.org/bugs/show_bug.cgi?id=284333" 
	 * @test that in a non package-info.java file
	 * 				2. References without qualified names to valid Java elements (in the same package) are accepted
	 * 	 			2. References without qualified names to valid Java elements (not in the same package) are reported
	 * 				3. References with qualified names to valid Java elements are accepted
	 */	
	public void testBug284333a() {
		runNegativeTest(new String[]{
				"goo/bar/package-info.java",
				"/**\n" +
				"*/\n" +
				"package goo.bar;\n",
				"foo/bar/ClassInSamePackage.java",
				"package foo.bar;\n" +
				"public class ClassInSamePackage {\n" +
				"	public static int SOME_FIELD; \n" +
				"}\n",
				"foo/bar/goo/ClassInSubPackage.java",
				"package foo.bar.goo;\n" +
				"public class ClassInSubPackage {\n" +
				"	public static void foo() { \n" +
				"   }\n" +
				"}\n",
				"foo/ClassInEnclosingPackage.java",
				"package foo;\n" +
				"public class ClassInEnclosingPackage {\n" +
				"	public static int SOME_FIELD; \n" +
				"}\n",
				"foo/bar/NotAPackageInfo.java",
				"package foo.bar;\n" +
				"/**\n" +
				" * @see ClassInSamePackage#SOME_FIELD\n" +
				" * @see foo.bar.ClassInSamePackage#SOME_FIELD\n" +
				" * @see ClassInSamePackage#SOME_FIELD\n" +
				" */\n" +
				" public class NotAPackageInfo {\n" +
				"/**\n" +
				" * @see ClassInSubPackage#foo\n" +
				" * @see foo.bar.goo.ClassInSubPackage#foo\n" +
				" * @see ClassInSubPackage#foo\n" +
				" */\n" +
				"	public static int SOME_FIELD = 0;\n" +
				"/**\n" +
				" * @see ClassInEnclosingPackage\n" +
				" * @see foo.ClassInEnclosingPackage\n" +
				" * @see ClassInEnclosingPackage\n" +
				" */\n" +
				" 	public static void foo() {\n" +
				"	}\n" +
				"	" +
				" }\n"	
		},
		"----------\n" + 
		"1. ERROR in foo\\bar\\NotAPackageInfo.java (at line 9)\n" + 
		"	* @see ClassInSubPackage#foo\n" + 
		"	       ^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInSubPackage cannot be resolved to a type\n" + 
		"----------\n" + 
		"2. ERROR in foo\\bar\\NotAPackageInfo.java (at line 11)\n" + 
		"	* @see ClassInSubPackage#foo\n" + 
		"	       ^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInSubPackage cannot be resolved to a type\n" + 
		"----------\n" + 
		"3. ERROR in foo\\bar\\NotAPackageInfo.java (at line 15)\n" + 
		"	* @see ClassInEnclosingPackage\n" + 
		"	       ^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" + 
		"----------\n" + 
		"4. ERROR in foo\\bar\\NotAPackageInfo.java (at line 17)\n" + 
		"	* @see ClassInEnclosingPackage\n" + 
		"	       ^^^^^^^^^^^^^^^^^^^^^^^\n" + 
		"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" + 
		"----------\n");
	}
	/**
	 * Additional tests for "https://bugs.eclipse.org/bugs/show_bug.cgi?id=284333" 
	 * @test that in a non package-info.java file
	 * 				2. References without qualified names to valid Java elements (in the same package) are accepted
	 * 	 			2. References without qualified names to imported Java elements are accepted
	 * 				3. References with qualified names to valid Java elements are accepted
	 */	
	public void testBug284333b() {
		runConformTest(new String[] {
				"goo/bar/package-info.java",
				"/**\n" +
				"*/\n" +
				"package goo.bar;\n",
				"foo/bar/ClassInSamePackage.java",
				"package foo.bar;\n" +
				"public class ClassInSamePackage {\n" +
				"	public static int SOME_FIELD; \n" +
				"}\n",
				"foo/bar/goo/ClassInSubPackage.java",
				"package foo.bar.goo;\n" +
				"public class ClassInSubPackage {\n" +
				"	public static void foo() { \n" +
				"   }\n" +
				"}\n",
				"foo/ClassInEnclosingPackage.java",
				"package foo;\n" +
				"public class ClassInEnclosingPackage {\n" +
				"	public static int SOME_FIELD; \n" +
				"}\n",
				"foo/bar/NotAPackageInfo.java",
				"package foo.bar;\n" +
				"import foo.*;\n" +
				"import foo.bar.goo.*;\n" +
				"/**\n" +
				" * @see ClassInSamePackage#SOME_FIELD\n" +
				" * @see foo.bar.ClassInSamePackage#SOME_FIELD\n" +
				" * @see ClassInSamePackage#SOME_FIELD\n" +
				" * @see goo.bar\n" +
				" */\n" +
				" public class NotAPackageInfo {\n" +
				"/**\n" +
				" * @see ClassInSubPackage#foo\n" +
				" * @see foo.bar.goo.ClassInSubPackage#foo\n" +
				" * @see ClassInSubPackage#foo\n" +
				" * @see goo.bar\n" +
				" */\n" +
				"	public static int SOME_FIELD = 0;\n" +
				"/**\n" +
				" * @see ClassInEnclosingPackage\n" +
				" * @see foo.ClassInEnclosingPackage\n" +
				" * @see ClassInEnclosingPackage\n" +
				" * @see goo.bar\n" +
				" */\n" +
				" 	public static void foo() {\n" +
				"	}\n" +
				"	" +
				" }\n"	
		});
	}	
}




			"	/**\n" +
			"	 * @see java\n" +
			"	 * @see java.util\n" +
			"	 * @see java.unknown\n" +
			"	 */\n" +
			"	void foo() {}\n" +
			"}\n"
		 },
		 "----------\n" +
			"1. ERROR in X.java (at line 5)\n" +
		"	* @see java\n" + 
		"	       ^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 4)\n" + 
		"	* @see java.util\n" + 
		"	       ^^^^^^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n"
	);
}
public void testBug50695b() {
	runNegativeTest(
		new String[] {
			"X.java",
			"public class X {\n" +
				"	/**\n" +
				"	 * @see java.unknown\n" +
				"	 */\n" +
				"	void foo() {}\n" +
				"}\n"
		 },
		"----------\n" +
			"1. ERROR in X.java (at line 3)\n" +
			"	* @see java.unknown\n" +
			"	       ^^^^^^^^^^^^\n" +
			"Javadoc: java.unknown cannot be resolved to a type\n" +
			"----------\n"
			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
	);
}

/**
 * Bug 51626.
 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51626">51626</a>

		// warning - Tag @see: reference not found: java.lang
		// warning - Tag @see: reference not found: PKG
		"----------\n" + 
		"1. ERROR in pkg\\X.java (at line 7)\n" + 
		"	* @see java\n" + 
		"	       ^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"2. ERROR in pkg\\X.java (at line 6)\n" + 
		"	* @see java.lang\n" + 
		"	       ^^^^^^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"3. ERROR in pkg\\X.java (at line 7)\n" + 
		"	* @see PKG\n" + 
		"	       ^^^\n" + 
		"Javadoc: PKG cannot be resolved to a type\n" + 

	);
}
public void testBug211054b() {
	runConformTest(
		new String[] {
			"x/y/z/X.java",
			"package x.y.z;\n" +

			"	 \n" +
			"	}\n" +
			"}\n"
		});
		// warning - Tag @see: reference not found: java
		// warning - Tag @see: reference not found: java.lang
		// warning - Tag @see: reference not found: x
		// warning - Tag @see: reference not found: x.y
		"----------\n" + 
		"1. ERROR in x\\y\\z\\X.java (at line 5)\n" + 
		"	* @see java\n" + 
		"	       ^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"2. ERROR in x\\y\\z\\X.java (at line 6)\n" + 
		"	* @see java.lang\n" + 
		"	       ^^^^^^^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"3. ERROR in x\\y\\z\\X.java (at line 7)\n" + 
		"	* @see x\n" + 
		"	       ^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n" + 
		"4. ERROR in x\\y\\z\\X.java (at line 8)\n" + 
		"	* @see x.y\n" + 
		"	       ^^^\n" + 
		"Javadoc: Invalid reference\n" + 
		"----------\n"
	);
}

/**

Return to bug 281609

Lines 820-825 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java (+10 lines)
820	}	820	}
821	}	821	}
822	}	822	}
		823	/*
		824	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=283413
		825	* As per Javadoc documentation, reference to Java elements inside package info requires qualified names.
		826	*/
		827	if (scope.referenceCompilationUnit().isPackageInfo() && typeReference instanceof JavadocSingleTypeReference) {
		828	if (resolvedType.fPackage.compoundName.length > 0) {
		829	scope.problemReporter().javadocInvalidReference(typeReference.sourceStart, typeReference.sourceEnd);
		830	return;
		831	}
		832	}
823	}	833	}
824	}	834	}
825		835

Lines 1272-1315 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java (-68 / +7 lines)
1272	" /**\n" +	1272	" /**\n" +
1273	" * @see java\n" +	1273	" * @see java\n" +
1274	" * @see java.util\n" +	1274	" * @see java.util\n" +
		1275	" * @see java.unknown\n" +
1275	" */\n" +	1276	" */\n" +
1276	" void foo() {}\n" +	1277	" void foo() {}\n" +
1277	"}\n"	1278	"}\n"
1278	},	1279	},
1279	"----------\n" +	1280	"----------\n" +
1280	"1. ERROR in X.java (at line 3)\n" +	1281	"1. ERROR in X.java (at line 5)\n" +
1281	" * @see java\n" +
1282	" ^^^^\n" +
1283	"Javadoc: Invalid reference\n" +
1284	"----------\n" +
1285	"2. ERROR in X.java (at line 4)\n" +
1286	" * @see java.util\n" +
1287	" ^^^^^^^^^\n" +
1288	"Javadoc: Invalid reference\n" +
1289	"----------\n"
1290	);
1291	}
1292	public void testBug50695b() {
1293	runNegativeTest(
1294	new String[] {
1295	"X.java",
1296	"public class X {\n" +
1297	" /**\n" +
1298	" * @see java.unknown\n" +
1299	" */\n" +
1300	" void foo() {}\n" +
1301	"}\n"
1302	},
1303	"----------\n" +
1304	"1. ERROR in X.java (at line 3)\n" +
1305	" * @see java.unknown\n" +	1282	" * @see java.unknown\n" +
1306	" ^^^^^^^^^^^^\n" +	1283	" ^^^^^^^^^^^^\n" +
1307	"Javadoc: java.unknown cannot be resolved to a type\n" +	1284	"Javadoc: java.unknown cannot be resolved to a type\n" +
1308	"----------\n",	1285	"----------\n"
1309	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
1310	);	1286	);
1311	}	1287	}
1312
1313	/**	1288	/**
1314	* Bug 51626.	1289	* Bug 51626.
1315	* @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51626">51626</a>	1290	* @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=51626">51626</a>
Lines 7566-7582 Link Here
7566	// warning - Tag @see: reference not found: java.lang	7541	// warning - Tag @see: reference not found: java.lang
7567	// warning - Tag @see: reference not found: PKG	7542	// warning - Tag @see: reference not found: PKG
7568	"----------\n" +	7543	"----------\n" +
7569	"1. ERROR in pkg\\X.java (at line 5)\n" +	7544	"1. ERROR in pkg\\X.java (at line 7)\n" +
7570	" * @see java\n" +
7571	" ^^^^\n" +
7572	"Javadoc: Invalid reference\n" +
7573	"----------\n" +
7574	"2. ERROR in pkg\\X.java (at line 6)\n" +
7575	" * @see java.lang\n" +
7576	" ^^^^^^^^^\n" +
7577	"Javadoc: Invalid reference\n" +
7578	"----------\n" +
7579	"3. ERROR in pkg\\X.java (at line 7)\n" +
7580	" * @see PKG\n" +	7545	" * @see PKG\n" +
7581	" ^^^\n" +	7546	" ^^^\n" +
7582	"Javadoc: PKG cannot be resolved to a type\n" +	7547	"Javadoc: PKG cannot be resolved to a type\n" +
Lines 7584-7590 Link Here
7584	);	7549	);
7585	}	7550	}
7586	public void testBug211054b() {	7551	public void testBug211054b() {
7587	runNegativeTest(	7552	runConformTest(
7588	new String[] {	7553	new String[] {
7589	"x/y/z/X.java",	7554	"x/y/z/X.java",
7590	"package x.y.z;\n" +	7555	"package x.y.z;\n" +
Lines 7601-7633 Link Here
7601	" \n" +	7566	" \n" +
7602	" }\n" +	7567	" }\n" +
7603	"}\n"	7568	"}\n"
7604	},	7569	});
7605	// warning - Tag @see: reference not found: java
7606	// warning - Tag @see: reference not found: java.lang
7607	// warning - Tag @see: reference not found: x
7608	// warning - Tag @see: reference not found: x.y
7609	"----------\n" +
7610	"1. ERROR in x\\y\\z\\X.java (at line 5)\n" +
7611	" * @see java\n" +
7612	" ^^^^\n" +
7613	"Javadoc: Invalid reference\n" +
7614	"----------\n" +
7615	"2. ERROR in x\\y\\z\\X.java (at line 6)\n" +
7616	" * @see java.lang\n" +
7617	" ^^^^^^^^^\n" +
7618	"Javadoc: Invalid reference\n" +
7619	"----------\n" +
7620	"3. ERROR in x\\y\\z\\X.java (at line 7)\n" +
7621	" * @see x\n" +
7622	" ^\n" +
7623	"Javadoc: Invalid reference\n" +
7624	"----------\n" +
7625	"4. ERROR in x\\y\\z\\X.java (at line 8)\n" +
7626	" * @see x.y\n" +
7627	" ^^^\n" +
7628	"Javadoc: Invalid reference\n" +
7629	"----------\n"
7630	);
7631	}	7570	}
7632		7571
7633	/**	7572	/**

Lines 1664-1675 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java (-35 / +249 lines)
1664	"pack/package-info.java",	1664	"pack/package-info.java",
1665	"/**\n" +	1665	"/**\n" +
1666	" * Valid javadoc.\n" +	1666	" * Valid javadoc.\n" +
1667	" * @see Test\n" +	1667	" * @see pack.Test\n" +
1668	" * @see Unknown\n" +	1668	" * @see Unknown\n" +
1669	" * @see Test#foo()\n" +	1669	" * @see pack.Test#foo()\n" +
1670	" * @see Test#unknown()\n" +	1670	" * @see pack.Test#unknown()\n" +
1671	" * @see Test#field\n" +	1671	" * @see pack.Test#field\n" +
1672	" * @see Test#unknown\n" +	1672	" * @see pack.Test#unknown\n" +
1673	" * @param unexpected\n" +	1673	" * @param unexpected\n" +
1674	" * @throws unexpected\n" +	1674	" * @throws unexpected\n" +
1675	" * @return unexpected \n" +	1675	" * @return unexpected \n" +
Lines 1687-1722 Link Here
1687	" public void foo() {}\n" +	1687	" public void foo() {}\n" +
1688	"}\n"	1688	"}\n"
1689	},	1689	},
1690	"----------\n" +	1690	"----------\n" +
1691	"1. ERROR in pack\\package-info.java (at line 4)\n" +	1691	"1. ERROR in pack\\package-info.java (at line 4)\n" +
1692	" * @see Unknown\n" +	1692	" * @see Unknown\n" +
1693	" ^^^^^^^\n" +	1693	" ^^^^^^^\n" +
1694	"Javadoc: Unknown cannot be resolved to a type\n" +	1694	"Javadoc: Unknown cannot be resolved to a type\n" +
1695	"----------\n" +	1695	"----------\n" +
1696	"2. ERROR in pack\\package-info.java (at line 6)\n" +	1696	"2. ERROR in pack\\package-info.java (at line 6)\n" +
1697	" * @see Test#unknown()\n" +	1697	" * @see pack.Test#unknown()\n" +
1698	" ^^^^^^^\n" +	1698	" ^^^^^^^\n" +
1699	"Javadoc: The method unknown() is undefined for the type Test\n" +	1699	"Javadoc: The method unknown() is undefined for the type Test\n" +
1700	"----------\n" +	1700	"----------\n" +
1701	"3. ERROR in pack\\package-info.java (at line 8)\n" +	1701	"3. ERROR in pack\\package-info.java (at line 8)\n" +
1702	" * @see Test#unknown\n" +	1702	" * @see pack.Test#unknown\n" +
1703	" ^^^^^^^\n" +	1703	" ^^^^^^^\n" +
1704	"Javadoc: unknown cannot be resolved or is not a field\n" +	1704	"Javadoc: unknown cannot be resolved or is not a field\n" +
1705	"----------\n" +	1705	"----------\n" +
1706	"4. ERROR in pack\\package-info.java (at line 9)\n" +	1706	"4. ERROR in pack\\package-info.java (at line 9)\n" +
1707	" * @param unexpected\n" +	1707	" * @param unexpected\n" +
1708	" ^^^^^\n" +	1708	" ^^^^^\n" +
1709	"Javadoc: Unexpected tag\n" +	1709	"Javadoc: Unexpected tag\n" +
1710	"----------\n" +	1710	"----------\n" +
1711	"5. ERROR in pack\\package-info.java (at line 10)\n" +	1711	"5. ERROR in pack\\package-info.java (at line 10)\n" +
1712	" * @throws unexpected\n" +	1712	" * @throws unexpected\n" +
1713	" ^^^^^^\n" +	1713	" ^^^^^^\n" +
1714	"Javadoc: Unexpected tag\n" +	1714	"Javadoc: Unexpected tag\n" +
1715	"----------\n" +	1715	"----------\n" +
1716	"6. ERROR in pack\\package-info.java (at line 11)\n" +	1716	"6. ERROR in pack\\package-info.java (at line 11)\n" +
1717	" * @return unexpected \n" +	1717	" * @return unexpected \n" +
1718	" ^^^^^^\n" +	1718	" ^^^^^^\n" +
1719	"Javadoc: Unexpected tag\n" +	1719	"Javadoc: Unexpected tag\n" +
1720	"----------\n",	1720	"----------\n",
1721	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError	1721	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
1722	);	1722	);
Lines 3930-3933 Link Here
3930	"----------\n"	3930	"----------\n"
3931	);	3931	);
3932	}	3932	}
		3933	/**
		3934	* @bug 284333:Javadoc for package-info.java not processed correctly
		3935	* @test that in a package-info.java file
		3936	* 1. References to valid packages are accepted without any warnings or errors
		3937	* 2. References to valid Java elements (including the ones in the same package) without qualified names are reported
		3938	* 3. References to valid Java elements with qualified names are accepted
		3939	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=284333"
		3940	*/
		3941	public void testBug284333() {
		3942	runNegativeTest(new String[]{
		3943	"goo/bar/package-info.java",
		3944	"/**\n" +
		3945	"*/\n" +
		3946	"package goo.bar;\n",
		3947	"foo/bar/ClassInSamePackage.java",
		3948	"package foo.bar;\n" +
		3949	"public class ClassInSamePackage {\n" +
		3950	" public static int SOME_FIELD; \n" +
		3951	"}\n",
		3952	"foo/bar/goo/ClassInSubPackage.java",
		3953	"package foo.bar.goo;\n" +
		3954	"public class ClassInSubPackage {\n" +
		3955	" public static void foo() { \n" +
		3956	" }\n" +
		3957	"}\n",
		3958	"foo/ClassInEnclosingPackage.java",
		3959	"package foo;\n" +
		3960	"public class ClassInEnclosingPackage {\n" +
		3961	" public static int SOME_FIELD; \n" +
		3962	"}\n",
		3963	"foo/bar/package-info.java",
		3964	"/**\n" +
		3965	" * @see ClassInSamePackage#SOME_FIELD\n" +
		3966	" * @see foo.bar.ClassInSamePackage#SOME_FIELD\n" +
		3967	" * @see ClassInSamePackage#SOME_FIELD\n" +
		3968	" * @see ClassInSubPackage#foo\n" +
		3969	" * @see foo.bar.goo.ClassInSubPackage#foo\n" +
		3970	" * @see ClassInSubPackage#foo\n" +
		3971	" * @see ClassInEnclosingPackage\n" +
		3972	" * @see foo.ClassInEnclosingPackage\n" +
		3973	" * @see ClassInEnclosingPackage\n" +
		3974	" * @see foo.bar\n" +
		3975	" * @see goo.bar\n" +
		3976	" * @see foo.bar.goo\n" +
		3977	" */\n" +
		3978	"package foo.bar;\n"
		3979	},
		3980	"----------\n" +
		3981	"1. ERROR in foo\\bar\\package-info.java (at line 2)\n" +
		3982	" * @see ClassInSamePackage#SOME_FIELD\n" +
		3983	" ^^^^^^^^^^^^^^^^^^\n" +
		3984	"Javadoc: Invalid reference\n" +
		3985	"----------\n" +
		3986	"2. ERROR in foo\\bar\\package-info.java (at line 4)\n" +
		3987	" * @see ClassInSamePackage#SOME_FIELD\n" +
		3988	" ^^^^^^^^^^^^^^^^^^\n" +
		3989	"Javadoc: Invalid reference\n" +
		3990	"----------\n" +
		3991	"3. ERROR in foo\\bar\\package-info.java (at line 5)\n" +
		3992	" * @see ClassInSubPackage#foo\n" +
		3993	" ^^^^^^^^^^^^^^^^^\n" +
		3994	"Javadoc: ClassInSubPackage cannot be resolved to a type\n" +
		3995	"----------\n" +
		3996	"4. ERROR in foo\\bar\\package-info.java (at line 7)\n" +
3997	" * @see ClassInSubPackage#foo\n" +
3998	" ^^^^^^^^^^^^^^^^^\n" +
3999	"Javadoc: ClassInSubPackage cannot be resolved to a type\n" +
4000	"----------\n" +
4001	"5. ERROR in foo\\bar\\package-info.java (at line 8)\n" +
4002	" * @see ClassInEnclosingPackage\n" +
4003	" ^^^^^^^^^^^^^^^^^^^^^^^\n" +
4004	"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" +
4005	"----------\n" +
4006	"6. ERROR in foo\\bar\\package-info.java (at line 10)\n" +
4007	" * @see ClassInEnclosingPackage\n" +
4008	" ^^^^^^^^^^^^^^^^^^^^^^^\n" +
4009	"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" +
4010	"----------\n");
4011	}
4012
4013	/**
4014	* Additional tests for "https://bugs.eclipse.org/bugs/show_bug.cgi?id=284333"
4015	* @test that in a non package-info.java file
4016	* 2. References without qualified names to valid Java elements (in the same package) are accepted
4017	* 2. References without qualified names to valid Java elements (not in the same package) are reported
4018	* 3. References with qualified names to valid Java elements are accepted
4019	*/
4020	public void testBug284333a() {
4021	runNegativeTest(new String[]{
4022	"goo/bar/package-info.java",
4023	"/**\n" +
4024	"*/\n" +
4025	"package goo.bar;\n",
4026	"foo/bar/ClassInSamePackage.java",
4027	"package foo.bar;\n" +
4028	"public class ClassInSamePackage {\n" +
4029	" public static int SOME_FIELD; \n" +
4030	"}\n",
4031	"foo/bar/goo/ClassInSubPackage.java",
4032	"package foo.bar.goo;\n" +
4033	"public class ClassInSubPackage {\n" +
4034	" public static void foo() { \n" +
4035	" }\n" +
4036	"}\n",
4037	"foo/ClassInEnclosingPackage.java",
4038	"package foo;\n" +
4039	"public class ClassInEnclosingPackage {\n" +
4040	" public static int SOME_FIELD; \n" +
4041	"}\n",
4042	"foo/bar/NotAPackageInfo.java",
4043	"package foo.bar;\n" +
4044	"/**\n" +
4045	" * @see ClassInSamePackage#SOME_FIELD\n" +
4046	" * @see foo.bar.ClassInSamePackage#SOME_FIELD\n" +
4047	" * @see ClassInSamePackage#SOME_FIELD\n" +
4048	" */\n" +
4049	" public class NotAPackageInfo {\n" +
4050	"/**\n" +
4051	" * @see ClassInSubPackage#foo\n" +
4052	" * @see foo.bar.goo.ClassInSubPackage#foo\n" +
4053	" * @see ClassInSubPackage#foo\n" +
4054	" */\n" +
4055	" public static int SOME_FIELD = 0;\n" +
4056	"/**\n" +
4057	" * @see ClassInEnclosingPackage\n" +
4058	" * @see foo.ClassInEnclosingPackage\n" +
4059	" * @see ClassInEnclosingPackage\n" +
4060	" */\n" +
4061	" public static void foo() {\n" +
4062	" }\n" +
4063	" " +
4064	" }\n"
4065	},
4066	"----------\n" +
4067	"1. ERROR in foo\\bar\\NotAPackageInfo.java (at line 9)\n" +
4068	" * @see ClassInSubPackage#foo\n" +
4069	" ^^^^^^^^^^^^^^^^^\n" +
4070	"Javadoc: ClassInSubPackage cannot be resolved to a type\n" +
4071	"----------\n" +
4072	"2. ERROR in foo\\bar\\NotAPackageInfo.java (at line 11)\n" +
4073	" * @see ClassInSubPackage#foo\n" +
4074	" ^^^^^^^^^^^^^^^^^\n" +
4075	"Javadoc: ClassInSubPackage cannot be resolved to a type\n" +
4076	"----------\n" +
4077	"3. ERROR in foo\\bar\\NotAPackageInfo.java (at line 15)\n" +
4078	" * @see ClassInEnclosingPackage\n" +
4079	" ^^^^^^^^^^^^^^^^^^^^^^^\n" +
4080	"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" +
4081	"----------\n" +
4082	"4. ERROR in foo\\bar\\NotAPackageInfo.java (at line 17)\n" +
4083	" * @see ClassInEnclosingPackage\n" +
4084	" ^^^^^^^^^^^^^^^^^^^^^^^\n" +
4085	"Javadoc: ClassInEnclosingPackage cannot be resolved to a type\n" +
4086	"----------\n");
4087	}
4088	/**
4089	* Additional tests for "https://bugs.eclipse.org/bugs/show_bug.cgi?id=284333"
4090	* @test that in a non package-info.java file
4091	* 2. References without qualified names to valid Java elements (in the same package) are accepted
4092	* 2. References without qualified names to imported Java elements are accepted
4093	* 3. References with qualified names to valid Java elements are accepted
4094	*/
4095	public void testBug284333b() {
4096	runConformTest(new String[] {
4097	"goo/bar/package-info.java",
4098	"/**\n" +
4099	"*/\n" +
4100	"package goo.bar;\n",
4101	"foo/bar/ClassInSamePackage.java",
4102	"package foo.bar;\n" +
4103	"public class ClassInSamePackage {\n" +
4104	" public static int SOME_FIELD; \n" +
4105	"}\n",
4106	"foo/bar/goo/ClassInSubPackage.java",
4107	"package foo.bar.goo;\n" +
4108	"public class ClassInSubPackage {\n" +
4109	" public static void foo() { \n" +
4110	" }\n" +
4111	"}\n",
4112	"foo/ClassInEnclosingPackage.java",
4113	"package foo;\n" +
4114	"public class ClassInEnclosingPackage {\n" +
4115	" public static int SOME_FIELD; \n" +
4116	"}\n",
4117	"foo/bar/NotAPackageInfo.java",
4118	"package foo.bar;\n" +
4119	"import foo.*;\n" +
4120	"import foo.bar.goo.*;\n" +
4121	"/**\n" +
4122	" * @see ClassInSamePackage#SOME_FIELD\n" +
4123	" * @see foo.bar.ClassInSamePackage#SOME_FIELD\n" +
4124	" * @see ClassInSamePackage#SOME_FIELD\n" +
4125	" * @see goo.bar\n" +
4126	" */\n" +
4127	" public class NotAPackageInfo {\n" +
4128	"/**\n" +
4129	" * @see ClassInSubPackage#foo\n" +
4130	" * @see foo.bar.goo.ClassInSubPackage#foo\n" +
4131	" * @see ClassInSubPackage#foo\n" +
4132	" * @see goo.bar\n" +
4133	" */\n" +
4134	" public static int SOME_FIELD = 0;\n" +
4135	"/**\n" +
4136	" * @see ClassInEnclosingPackage\n" +
4137	" * @see foo.ClassInEnclosingPackage\n" +
4138	" * @see ClassInEnclosingPackage\n" +
4139	" * @see goo.bar\n" +
4140	" */\n" +
4141	" public static void foo() {\n" +
4142	" }\n" +
4143	" " +
4144	" }\n"
4145	});
4146	}
3933	}	4147	}