backmerge - resolved conflicts and took all changes from @jesse over

Author: aamotharald

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java

@@ -80,22 +80,13 @@
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 
 /**
- * TODO: add a way to use the plugin POM for the lookup so that the user doesn't have to provide the a:g:v:goal
- * as the role hint for the mojo lookup.
- * TODO: standardize the execution of the mojo and looking at the results, but could simply have a template method
- * for verifying the state of the mojo post execution
- * TODO: need a way to look at the state of the mojo without adding getters, this could be where we finally specify
- * the expressions which extract values from the mojo.
- * TODO: create a standard directory structure for picking up POMs to make this even easier, we really just need a testing
- * descriptor and make this entirely declarative!
+ * @author jesse
  *
  * @deprected As of version 3.4.0, it is advised to work with JUnit5 tests which do not
  * use this class but {@link MojoTest}
  * instead.
  *
- * @author jesse
  */
-@Deprecated
 public abstract class AbstractMojoTestCase extends PlexusTestCase {
     private static final DefaultArtifactVersion MAVEN_VERSION;
 
@@ -124,12 +115,6 @@ public abstract class AbstractMojoTestCase extends PlexusTestCase {
 
     private Map<String, MojoDescriptor> mojoDescriptors;
 
-    /*
-     * for the harness I think we have decided against going the route of using the maven project builder.
-     * instead I think we are going to try and make an instance of the localrespository and assign that
-     * to either the project stub or into the mojo directly with injection...not sure yet though.
-     */
-    // private MavenProjectBuilder projectBuilder;
     @Override
     protected void setUp() throws Exception {
         assertTrue(

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java

@@ -323,8 +323,5 @@ public String getName() {
     }
 
     @Override
-    public void setThreshold(int threshold) {
-        // TODO Auto-generated method stub
-
-    }
+    public void setThreshold(int threshold) {}
 }

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java

@@ -92,7 +92,6 @@ public File getBasedir(String project) throws IOException {
     // static helpers
 
     public static void cp(File basedir, String from, String to) throws IOException {
-        // TODO ensure destination lastModified timestamp changes
         FileUtils.copyFile(new File(basedir, from), new File(basedir, to));
     }
 

maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/PluginArtifactFileTest.java

@@ -27,7 +27,7 @@ public class PluginArtifactFileTest extends AbstractMojoTestCase {
     private static final String FS = System.getProperty("file.separator");
 
     public void testArtifact() throws Exception {
-        MojoExecution execution = newMojoExecution("parameters"); // TODO dedicated test mojo
+        MojoExecution execution = newMojoExecution("parameters");
 
         List<Artifact> artifacts =
                 execution.getMojoDescriptor().getPluginDescriptor().getArtifacts();
@@ -40,6 +40,4 @@ public void testArtifact() throws Exception {
         assertEquals("0.0.1-SNAPSHOT", artifact.getBaseVersion());
         assertTrue(artifact.getFile().getAbsolutePath().endsWith(FS + "target" + FS + "test-classes"));
     }
-
-    // TODO find a way to automate testing of jar:file:/ test plugin URLs
 }