First succesful unit test...finally
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/977f9bb1 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/977f9bb1 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/977f9bb1 Branch: refs/heads/master Commit: 977f9bb1754c4c925da650a9a3af8cab926fb4d9 Parents: b741c5b Author: Rob Tompkins <chtom...@apache.org> Authored: Sat Jan 6 20:08:54 2018 -0500 Committer: Rob Tompkins <chtom...@apache.org> Committed: Sat Jan 6 20:08:54 2018 -0500 ---------------------------------------------------------------------- pom.xml | 42 ++------------------ .../CommonsDistributionDetatchmentMojo.java | 13 +++--- .../mojos/CommonsDistributionStagingMojo.java | 1 - .../mojos/CommonsSiteCompressionMojo.java | 9 +++++ .../mojos/CommonsSiteCompressionMojoTest.java | 24 ++++++++++- .../mojos/compress-site/compress-site.xml | 1 + 6 files changed, 43 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/977f9bb1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ebc4b5f..2061351 100644 --- a/pom.xml +++ b/pom.xml @@ -105,14 +105,9 @@ <version>3.5</version> </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-shared-utils</artifactId> - <version>3.2.0</version> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.2.1</version> + <artifactId>maven-artifact</artifactId> + <version>${maven.dependency.version}</version> </dependency> <dependency> <groupId>org.apache.maven.scm</groupId> @@ -130,16 +125,6 @@ <version>1.9.5</version> </dependency> <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-scm</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.10</version> @@ -150,24 +135,9 @@ <version>1.15</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.24</version> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1.3</version> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - <version>1.13.1</version> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>2.1</version> + <version>3.3.0</version> <scope>test</scope> </dependency> <dependency> @@ -177,12 +147,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven.dependency.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/977f9bb1/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetatchmentMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetatchmentMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetatchmentMojo.java index 5cf361a..fd75e39 100644 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetatchmentMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetatchmentMojo.java @@ -16,7 +16,6 @@ */ package org.apache.commons.release.plugin.mojos; -import edu.emory.mathcs.backport.java.util.Collections; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.release.plugin.SharedFunctions; import org.apache.maven.plugin.AbstractMojo; @@ -32,10 +31,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; /** * The purpose of this maven mojo is to detach the artifacts generated by the maven-assembly-plugin, @@ -77,9 +73,16 @@ public class CommonsDistributionDetatchmentMojo extends AbstractMojo { @Parameter( defaultValue = "${project}", required = true ) private MavenProject project; + /** + */ @Parameter( defaultValue = "${project.build.directory}/commons-release-plugin", alias = "outputDirectory" ) private File workingDirectory; + /** + */ + @Parameter(required = true) + private String distSvnStagingUrl; + public void execute() throws MojoExecutionException { getLog().info("Detatching Assemblies"); for (Object attachedArtifact : project.getAttachedArtifacts()) { http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/977f9bb1/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java index a708961..8bd7bf9 100644 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java @@ -31,7 +31,6 @@ import org.apache.maven.scm.command.checkin.CheckInScmResult; import org.apache.maven.scm.manager.BasicScmManager; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.ScmProvider; -import org.apache.maven.scm.provider.ScmProviderRepository; import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider; import org.apache.maven.scm.repository.ScmRepository; http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/977f9bb1/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java index c030f90..b54e6af 100644 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java @@ -45,12 +45,21 @@ import java.util.zip.ZipOutputStream; @Mojo(name = "compress-site", defaultPhase = LifecyclePhase.POST_SITE, threadSafe = true) public class CommonsSiteCompressionMojo extends AbstractMojo { + /** + */ @Parameter(defaultValue = "${project.build.directory}/commons-release-plugin", alias = "outputDirectory") private File workingDirectory; + /** + */ @Parameter(defaultValue = "${project.build.directory}/site", alias = "siteOutputDirectory") private File siteDirectory; + /** + */ + @Parameter(required = true) + private String distSvnStagingUrl; + private ScatterZipOutputStream dirs; private ParallelScatterZipCreator scatterZipCreator; http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/977f9bb1/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java index 58f3031..d594149 100644 --- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java +++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java @@ -17,24 +17,44 @@ package org.apache.commons.release.plugin.mojos; import org.apache.maven.plugin.testing.AbstractMojoTestCase; +import org.apache.maven.plugin.testing.MojoRule; +import org.junit.Rule; +import org.junit.Test; import java.io.File; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertNotNull; + /** * Unit tests for {@link CommonsSiteCompressionMojo}. * * @author chtompki * @since 1.0 */ -public class CommonsSiteCompressionMojoTest extends AbstractMojoTestCase { +public class CommonsSiteCompressionMojoTest { + + @Rule + public MojoRule rule = new MojoRule() { + @Override + protected void before() throws Throwable { + } + + @Override + protected void after() { + } + }; protected CommonsSiteCompressionMojo mojo; + @Test public void testCompressSite() throws Exception { File testFile = new File("src/test/resources/mojos/compress-site/compress-site.xml"); assertNotNull(testFile); assertTrue(testFile.exists()); - mojo = (CommonsSiteCompressionMojo) lookupMojo("compress-site", testFile); + mojo = (CommonsSiteCompressionMojo) rule.lookupMojo("compress-site", testFile); mojo.execute(); + File siteZip = new File("target/commons-release-plugin/site.zip"); + assertTrue(siteZip.exists()); } } http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/977f9bb1/src/test/resources/mojos/compress-site/compress-site.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/mojos/compress-site/compress-site.xml b/src/test/resources/mojos/compress-site/compress-site.xml index 0d08ab7..40db1ac 100644 --- a/src/test/resources/mojos/compress-site/compress-site.xml +++ b/src/test/resources/mojos/compress-site/compress-site.xml @@ -42,6 +42,7 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-release-plugin</artifactId> <configuration> + <workingDirectory>target/commons-release-plugin</workingDirectory> <distSvnStagingUrl>aBadUrl</distSvnStagingUrl> <siteDirectory>${basedir}/target/test-classes/mojos/compress-site/example-site</siteDirectory> </configuration>
