diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java b/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java index c7e2fbe4..9db52c9b 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java @@ -44,7 +44,7 @@ public abstract class AbstractCheckstyleTestCase extends AbstractMojoTestCase { private ArtifactStubFactory artifactStubFactory; /** - * The current project to be test. + * The project to test. */ private MavenProject testMavenProject; @@ -80,9 +80,9 @@ protected MavenProject getTestMavenProject() { /** * Get the generated report as file in the test maven project. * - * @param name the name of the report. + * @param name the name of the report * @return the generated report as file - * @throws IOException if the return file doesnt exist + * @throws IOException if the return file doesn't exist */ protected File getGeneratedReport(String name) throws IOException { String outputDirectory = getBasedir() + "/target/test/test-harness/" diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java index aaaaf5dc..a9bb6caf 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java @@ -27,7 +27,6 @@ import org.apache.maven.model.Build; import org.apache.maven.model.Organization; import org.apache.maven.model.ReportPlugin; -import org.codehaus.plexus.PlexusTestCase; /** * @author Edwin Punzalan @@ -42,27 +41,22 @@ public List getCompileClasspathElements() throws DependencyResolutionReq /** {@inheritDoc} */ public List getTestClasspathElements() throws DependencyResolutionRequiredException { List list = new ArrayList<>(getCompileClasspathElements()); - list.add(PlexusTestCase.getBasedir() + "/target/test-classes"); + list.add("target/test-classes"); return list; } /** {@inheritDoc} */ public List getCompileSourceRoots() { - return Collections.singletonList(PlexusTestCase.getBasedir() + "/target/classes"); + return Collections.singletonList("target/classes"); } /** {@inheritDoc} */ public List getTestCompileSourceRoots() { List list = new ArrayList<>(getCompileSourceRoots()); - list.add(PlexusTestCase.getBasedir() + "/target/test-classes"); + list.add("target/test-classes"); return list; } - /** {@inheritDoc} */ - public File getBasedir() { - return new File(PlexusTestCase.getBasedir()); - } - /** {@inheritDoc} */ public List getReportPlugins() { ReportPlugin jxrPlugin = new ReportPlugin(); @@ -90,7 +84,7 @@ public String getInceptionYear() { public Build getBuild() { Build build = new Build(); - build.setDirectory(PlexusTestCase.getBasedir() + "/target/test-harness/checkstyle/min"); + build.setDirectory("target/test-harness/checkstyle/min"); return build; } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java index b879a3b2..4279abf9 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java @@ -27,7 +27,6 @@ import org.apache.maven.model.Build; import org.apache.maven.model.Organization; import org.apache.maven.model.ReportPlugin; -import org.codehaus.plexus.PlexusTestCase; /** * @author Edwin Punzalan @@ -43,27 +42,22 @@ public List getCompileClasspathElements() throws DependencyResolutionReq /** {@inheritDoc} */ public List getTestClasspathElements() throws DependencyResolutionRequiredException { List list = new ArrayList<>(getCompileClasspathElements()); - list.add(PlexusTestCase.getBasedir() + "/target/test-classes"); + list.add("target/test-classes"); return list; } /** {@inheritDoc} */ public List getCompileSourceRoots() { - return Collections.singletonList(PlexusTestCase.getBasedir() + "/target/classes"); + return Collections.singletonList("target/classes"); } /** {@inheritDoc} */ public List getTestCompileSourceRoots() { List list = new ArrayList<>(getCompileSourceRoots()); - list.add(PlexusTestCase.getBasedir() + "/target/test-classes"); + list.add("target/test-classes"); return list; } - /** {@inheritDoc} */ - public File getBasedir() { - return new File(PlexusTestCase.getBasedir()); - } - /** {@inheritDoc} */ public List getReportPlugins() { ReportPlugin jxrPlugin = new ReportPlugin(); @@ -91,9 +85,9 @@ public String getInceptionYear() { public Build getBuild() { Build build = new Build(); - build.setDirectory(PlexusTestCase.getBasedir() + "/target/test-harness/checkstyle/multi"); - build.setSourceDirectory(PlexusTestCase.getBasedir() + "/src/test/test-sources"); - build.setTestSourceDirectory(PlexusTestCase.getBasedir() + "/src/test/java"); + build.setDirectory("target/test-harness/checkstyle/multi"); + build.setSourceDirectory("src/test/test-sources"); + build.setTestSourceDirectory("src/test/java"); return build; } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java index 63e4abef..a0c5f946 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java @@ -27,7 +27,6 @@ import org.apache.maven.model.Organization; import org.apache.maven.model.ReportPlugin; import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.PlexusTestCase; /** * @@ -63,11 +62,6 @@ public List getTestCompileSourceRoots() { return Collections.emptyList(); } - /** {@inheritDoc} */ - public File getBasedir() { - return new File(PlexusTestCase.getBasedir()); - } - /** {@inheritDoc} */ public List getReportPlugins() { ReportPlugin jxrPlugin = new ReportPlugin(); @@ -95,7 +89,7 @@ public String getInceptionYear() { public Build getBuild() { Build build = new Build(); - build.setDirectory(PlexusTestCase.getBasedir() + "/target/test-harness/checkstyle/multi"); + build.setDirectory("target/test-harness/checkstyle/multi"); return build; }