refactor: inline method

Signed-off-by: Sandra Parsick <[email protected]>

Author: sparsick

pom.xml

@@ -226,7 +226,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java

@@ -18,14 +18,6 @@
  */
 package org.apache.maven.plugins.checkstyle;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Collections;
-import java.util.List;
-import java.util.ResourceBundle;
-
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.doxia.tools.SiteTool;
 import org.apache.maven.model.Plugin;
@@ -47,6 +39,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Collections;
+import java.util.List;
+import java.util.ResourceBundle;
+
 /**
  * @author Edwin Punzalan
  */
@@ -69,7 +69,30 @@ public void setUp() throws Exception {
 
     @Test
     public void testNoSource() throws Exception {
-        File generatedReport = generateReport("checkstyle", "no-source-plugin-config.xml");
+        File pluginXmlFile = new File(getBasedir(), "src/test/resources/plugin-configs/" + "no-source-plugin-config.xml");
+        CheckstyleReport mojo1 = (CheckstyleReport) lookupMojo("checkstyle", pluginXmlFile);
+        Assertions.assertNotNull(mojo1, "Mojo not found.");
+
+        LegacySupport legacySupport = lookup(LegacySupport.class);
+        legacySupport.setSession(newMavenSession(new MavenProjectStub()));
+        DefaultRepositorySystemSession repoSession =
+                (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
+        repoSession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
+                .newInstance(repoSession, new LocalRepository(artifactStubFactory.getWorkingDir())));
+
+        List<MavenProject> reactorProjects =
+                mojo1.getReactorProjects() != null ? mojo1.getReactorProjects() : Collections.emptyList();
+
+        setVariableValueToObject(mojo1, "mojoExecution", getMockMojoExecution());
+        setVariableValueToObject(mojo1, "session", legacySupport.getSession());
+        setVariableValueToObject(mojo1, "repoSession", legacySupport.getRepositorySession());
+        setVariableValueToObject(mojo1, "reactorProjects", reactorProjects);
+        setVariableValueToObject(
+                mojo1, "remoteProjectRepositories", mojo1.getProject().getRemoteProjectRepositories());
+        setVariableValueToObject(
+                mojo1, "siteDirectory", new File(mojo1.getProject().getBasedir(), "src/site"));
+        CheckstyleReport mojo = mojo1;
+        File generatedReport = generateReport(mojo, pluginXmlFile);
         assertFalse(new File(generatedReport.getAbsolutePath()).exists());
     }
 
@@ -815,41 +838,6 @@ protected File getGeneratedReport(String name) throws IOException {
         return report;
     }
 
-    /**
-     * Generate the report and return the generated file
-     *
-     * @param goal the mojo goal.
-     * @param pluginXml the name of the XML file in "src/test/resources/plugin-configs/"
-     * @return the generated HTML file
-     * @throws Exception if any
-     */
-    protected File generateReport(String goal, String pluginXml) throws Exception {
-        File pluginXmlFile = new File(getBasedir(), "src/test/resources/plugin-configs/" + pluginXml);
-        CheckstyleReport mojo1 = (CheckstyleReport) lookupMojo(goal, pluginXmlFile);
-        Assertions.assertNotNull(mojo1, "Mojo not found.");
-
-        LegacySupport legacySupport = lookup(LegacySupport.class);
-        legacySupport.setSession(newMavenSession(new MavenProjectStub()));
-        DefaultRepositorySystemSession repoSession =
-                (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
-        repoSession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
-                .newInstance(repoSession, new LocalRepository(artifactStubFactory.getWorkingDir())));
-
-        List<MavenProject> reactorProjects =
-                mojo1.getReactorProjects() != null ? mojo1.getReactorProjects() : Collections.emptyList();
-
-        setVariableValueToObject(mojo1, "mojoExecution", getMockMojoExecution());
-        setVariableValueToObject(mojo1, "session", legacySupport.getSession());
-        setVariableValueToObject(mojo1, "repoSession", legacySupport.getRepositorySession());
-        setVariableValueToObject(mojo1, "reactorProjects", reactorProjects);
-        setVariableValueToObject(
-                mojo1, "remoteProjectRepositories", mojo1.getProject().getRemoteProjectRepositories());
-        setVariableValueToObject(
-                mojo1, "siteDirectory", new File(mojo1.getProject().getBasedir(), "src/site"));
-        CheckstyleReport mojo = mojo1;
-        return generateReport(mojo, pluginXmlFile);
-    }
-
     protected File generateReport(CheckstyleReport mojo, File pluginXmlFile) throws Exception {
         mojo.execute();