[MJAVADOC-414] Artifacts missing from test classpath.

 Patch of Michael Srb applied.


git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1666819 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

@@ -402,6 +402,7 @@ under the License.
                 <pomInclude>MJAVADOC-365/pom.xml</pomInclude>
                 <pomInclude>MJAVADOC-369/pom.xml</pomInclude>
                 <pomInclude>MJAVADOC-407/pom.xml</pomInclude>
+                <pomInclude>MJAVADOC-414/pom.xml</pomInclude>
               </pomIncludes>
             </configuration>
           </plugin>

src/it/MJAVADOC-414/invoker.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=clean javadoc:test-javadoc

src/it/MJAVADOC-414/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+  <artifactId>mjavadoc-414</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>@pom.version@</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>

src/it/MJAVADOC-414/src/main/java/mjavadoc414/App.java

@@ -0,0 +1,30 @@
+package mjavadoc414;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class App
+{
+
+    public void method()
+    {
+        System.out.println( "method() called." );
+    }
+
+}

src/it/MJAVADOC-414/src/test/java/mjavadoc414/test/AppTest.java

@@ -0,0 +1,43 @@
+package mjavadoc414.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import mjavadoc414.App;
+
+public class AppTest extends TestCase
+{
+
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * Tests {@link mjavadoc414.App}.
+     */
+    public void testApp()
+    {
+        new App().method();
+    }
+
+}

src/it/MJAVADOC-414/verify.bsh

@@ -0,0 +1,47 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.*;
+import org.codehaus.plexus.util.*;
+
+File indexFile = new File( basedir, "target/site/testapidocs/mjavadoc414/test/AppTest.html" );
+
+if ( !indexFile.exists() )
+{
+    System.err.println( indexFile.getAbsolutePath() + " is missing." );
+    return false;
+}
+
+File buildLog = new File( basedir, "build.log" );
+String content = IOUtil.toString( new FileInputStream( buildLog ) );
+String importError = "error: cannot find symbol";
+if ( content.contains( importError ) )
+{
+    System.err.println( "build.log contains '" + importError + "'" );
+    return false;
+}
+
+String referenceWarning = "Tag @link: reference not found: mjavadoc414.App";
+if ( content.contains( referenceWarning ) )
+{
+    System.err.println( "build.log contains '" + referenceWarning + "'" );
+    return false;
+}
+return true;

src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

@@ -1751,6 +1751,16 @@ protected boolean isAggregator()
         return false;
     }
 
+    /**
+     * Indicates whether this goal generates documentation for the <code>Java Test code</code>.
+     *
+     * @return <code>true</code> if the goal generates Test Javadocs, <code>false</code> otherwise.
+     */
+    protected boolean isTest()
+    {
+        return false;
+    }
+
     /**
      * @return the output directory
      */
@@ -2499,6 +2509,11 @@ private String getClasspath()
         List<String> classpathElements = new ArrayList<String>();
         Map<String, Artifact> compileArtifactMap = new HashMap<String, Artifact>();
 
+        if ( isTest() )
+        {
+            classpathElements.addAll( getProjectBuildOutputDirs( project ) );
+        }
+
         populateCompileArtifactMap( compileArtifactMap, getProjectArtifacts( project ) );
 
         if ( isAggregator() && project.isExecutionRoot() )

src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java

@@ -220,4 +220,10 @@ protected SourceResolverConfig configureDependencySourceResolution( final Source
     {
         return super.configureDependencySourceResolution( config ).withoutCompileSources().withTestSources();
     }
+
+    @Override
+    protected boolean isTest()
+    {
+        return true;
+    }
 }

src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java

@@ -354,4 +354,10 @@ protected SourceResolverConfig configureDependencySourceResolution( final Source
     {
         return super.configureDependencySourceResolution( config ).withoutCompileSources().withTestSources();
     }
+
+    @Override
+    protected boolean isTest()
+    {
+        return true;
+    }
 }

src/main/java/org/apache/maven/plugin/javadoc/TestResourcesBundleMojo.java

@@ -59,4 +59,9 @@ protected File getJavadocDirectory()
         return testJavadocDirectory;
     }
 
+    @Override
+    protected boolean isTest()
+    {
+        return true;
+    }
 }