Author: aheritier
Date: Fri Mar 21 17:30:56 2014
New Revision: 1579989
URL: http://svn.apache.org/r1579989
Log:
MJAVADOC-351: Javadoc:fix fixTags parameter doesn't support 'return' value
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1579989&r1=1579988&r2=1579989&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Fri Mar 21 17:30:56 2014
@@ -531,7 +531,7 @@ public abstract class AbstractFixJavadoc
for (String aSplit : split) {
String s = aSplit.trim();
if (JavadocUtil.equalsIgnoreCase(s, FIX_TAGS_ALL, AUTHOR_TAG,
VERSION_TAG, SINCE_TAG, PARAM_TAG,
- THROWS_TAG, LINK_TAG)) {
+ THROWS_TAG, LINK_TAG, RETURN_TAG)) {
filtered.add(s);
} else {
if (getLog().isWarnEnabled()) {
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java?rev=1579989&r1=1579988&r2=1579989&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
Fri Mar 21 17:30:56 2014
@@ -574,6 +574,35 @@ public class FixJavadocMojoTest
javaMethod, tag } );
assertEquals( " * @return A map configured.", tagJavadoc );
}
+
+ public void testInitParameters()
+ throws Throwable
+ {
+ AbstractFixJavadocMojo mojoInstance = new FixJavadocMojo();
+ setVariableValueToObject( mojoInstance, "fixTags", "author, version,
since, param, return, throws, link" );
+ setVariableValueToObject(mojoInstance, "defaultSince", "1.0");
+ setVariableValueToObject(mojoInstance, "level", "protected");
+
+ PrivateAccessor.invoke( mojoInstance, "init", new Class[] { }, new
String[] { } );
+
+ String[] fixTags = (String[]) getVariableValueFromObject(mojoInstance,
"fixTagsSplitted");
+
+ assertEquals("author", fixTags[0]);
+ assertEquals("version", fixTags[1]);
+ assertEquals("since", fixTags[2]);
+ assertEquals("param", fixTags[3]);
+ assertEquals("return", fixTags[4]);
+ assertEquals("throws", fixTags[5]);
+ assertEquals("link", fixTags[6]);
+ assertEquals(7, fixTags.length);
+
+ setVariableValueToObject( mojoInstance, "fixTags", "return,
fake_value" );
+ PrivateAccessor.invoke( mojoInstance, "init", new Class[] { }, new
String[] { } );
+ fixTags = (String[]) getVariableValueFromObject(mojoInstance,
"fixTagsSplitted");
+
+ assertEquals("return", fixTags[0]);
+ assertEquals(1, fixTags.length);
+ }
// ----------------------------------------------------------------------
// private methods
