You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/01/02 16:21:25 UTC
[maven-release] 02/03: Proper usage of createReactorProjects(
String sourcePath, String targetPath, String executionRoot )
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 7242c5508fbb3ffedd289d4adc2b8a0b4bc51dc2
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Jan 2 17:12:51 2018 +0100
Proper usage of createReactorProjects( String sourcePath, String targetPath, String executionRoot )
---
.../release/phase/AbstractReleaseTestCase.java | 24 +++++++++++++++++-----
.../phase/CheckDependencySnapshotsPhaseTest.java | 4 +++-
.../release/phase/CheckoutProjectFromScmTest.java | 12 +++++++----
.../phase/GenerateReleasePomsPhaseTest.java | 6 ++++--
.../release/phase/RemoveReleasePomsPhaseTest.java | 5 +++--
.../phase/RewritePomsForBranchPhaseTest.java | 4 +++-
.../phase/RewritePomsForDevelopmentPhaseTest.java | 5 +++--
.../phase/RewritePomsForReleasePhaseTest.java | 4 +++-
.../shared/release/phase/ScmBranchPhaseTest.java | 9 +++++---
.../phase/ScmCommitDevelopmentPhaseTest.java | 3 ++-
.../phase/ScmCommitPreparationPhaseTest.java | 6 ++++--
.../shared/release/phase/ScmTagPhaseTest.java | 7 ++++---
12 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index 94e346f..ce3e5ef 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -154,16 +154,30 @@ public abstract class AbstractReleaseTestCase
return createReactorProjects( path, path, subpath );
}
- protected List<MavenProject> createReactorProjects( String path, String targetPath, String subpath )
+ /**
+ *
+ * @param sourcePath sourceDirectory to copy from
+ * @param targetPath targetDirectory to copy to
+ * @param executionRoot sub directory of targetPath in case the root pom.xml is not used (e.g. flat projects)
+ * @return all Maven projects
+ * @throws Exception if any occurs
+ */
+ protected List<MavenProject> createReactorProjects( String sourcePath, String targetPath, String executionRoot )
throws Exception
{
- final Path testCaseRootFrom = Paths.get( getBasedir(), "src/test/resources" ).resolve( Paths.get( "projects", path, subpath ) ) ;
+ final Path testCaseRootFrom = Paths.get( getBasedir(), "src/test/resources" ).resolve( Paths.get( "projects", sourcePath ) ) ;
- final Path testCaseRootTo = Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", targetPath, subpath ) ) ;
+ final Path testCaseRootTo = Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", targetPath ) ) ;
Stack<Path> projectFiles = new Stack<>();
-
- projectFiles.push( Paths.get( "pom.xml" ) );
+ if ( executionRoot == null )
+ {
+ projectFiles.push( Paths.get( "pom.xml" ) );
+ }
+ else
+ {
+ projectFiles.push( Paths.get( executionRoot, "pom.xml" ) );
+ }
List<DefaultArtifactRepository> repos =
Collections.singletonList( new DefaultArtifactRepository( "central", getRemoteRepositoryURL(), new DefaultRepositoryLayout() ) );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
index e957e1b..7128929 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
@@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -1216,7 +1217,8 @@ public class CheckDependencySnapshotsPhaseTest
private List<MavenProject> createDescriptorFromProjects( String path )
throws Exception
{
- return createReactorProjects( "check-dependencies/", path );
+ String dir = "check-dependencies/" + Objects.toString( path, "" );
+ return createReactorProjects( dir, dir, null );
}
private Prompter createNoMockPrompter()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
index f343925..bb3d52b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
@@ -93,7 +93,8 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "single-pom" );
+ String dir = "scm-commit/single-pom";
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
// execute
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -134,8 +135,9 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
+ String dir = "scm-commit/multimodule-with-deep-subprojects";
List<MavenProject> reactorProjects =
- createReactorProjects( "scm-commit", "multimodule-with-deep-subprojects" );
+ createReactorProjects( dir, dir, null );
// execute
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -205,7 +207,8 @@ public class CheckoutProjectFromScmTest
ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
scmManagerStub.setException( new NoSuchScmProviderException( "..." ) );
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "single-pom" );
+ String dir = "scm-commit/single-pom";
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
// execute
try
@@ -234,7 +237,8 @@ public class CheckoutProjectFromScmTest
ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
scmManagerStub.setException( new ScmRepositoryException( "..." ) );
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "single-pom" );
+ String dir = "scm-commit/single-pom";
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
// execute
try
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index 6d16e39..c3a95e1 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -177,7 +177,8 @@ public class GenerateReleasePomsPhaseTest
protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "generate-release-poms/", path );
+ String dir = "generate-release-poms/" + path;
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
scmProviderMock = mock( ScmProvider.class );
@@ -207,7 +208,8 @@ public class GenerateReleasePomsPhaseTest
protected void verifyReactorProjects( String path, boolean copyFiles )
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "generate-release-poms/", path );
+ String dir = "generate-release-poms/"+ path;
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
List<File> releasePoms = new ArrayList<File>();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 6d49ec9..c1a3332 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -228,10 +228,11 @@ public class RemoveReleasePomsPhaseTest
verifyNoMoreInteractions( scmProviderMock );
}
- private List<MavenProject> createReactorProjects( String path )
+ protected List<MavenProject> createReactorProjects( String path )
throws Exception
{
- return createReactorProjects( "remove-release-poms/", path );
+ String dir = "remove-release-poms/" + path;
+ return createReactorProjects( dir, dir, null );
}
private ReleaseDescriptor createReleaseDescriptor()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
index 092cfba..8905af5 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
@@ -27,6 +27,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -60,7 +61,8 @@ public class RewritePomsForBranchPhaseTest
protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
throws Exception
{
- return createReactorProjects( "rewrite-for-branch/", path );
+ String dir = "rewrite-for-branch/" + Objects.toString( path, "" );
+ return createReactorProjects( dir, dir, null );
}
protected String readTestProjectFile( String fileName )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index d00aca3..5b48292 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -90,7 +90,7 @@ public class RewritePomsForDevelopmentPhaseTest
private List<MavenProject> createReactorProjectsWhenSimulated( String name )
throws Exception
{
- return createReactorProjects( "rewrite-for-release/", "rewrite-for-development/", name );
+ return createReactorProjects( "rewrite-for-release/" + name, "rewrite-for-development/" + name, null );
}
@Test
@@ -195,7 +195,8 @@ public class RewritePomsForDevelopmentPhaseTest
protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
throws Exception
{
- return createReactorProjects( "rewrite-for-development/", path );
+ String dir = "rewrite-for-development/" + path;
+ return createReactorProjects( dir, dir, null );
}
protected ReleaseDescriptor createDescriptorFromBasicPom( List<MavenProject> reactorProjects )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
index 1cc0a44..6f0d618 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -27,6 +27,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -60,7 +61,8 @@ public class RewritePomsForReleasePhaseTest
protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
throws Exception
{
- return createReactorProjects( "rewrite-for-release/", path );
+ String dir = "rewrite-for-release/" + Objects.toString( path, "" );
+ return createReactorProjects( dir, dir, null );
}
protected String readTestProjectFile( String fileName )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
index cede0a2..1af9ec6 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
@@ -121,8 +121,9 @@ public class ScmBranchPhaseTest
throws Exception
{
// prepare
+ String dir = "scm-commit/multimodule-with-deep-subprojects";
List<MavenProject> reactorProjects =
- createReactorProjects( "scm-commit/", "multimodule-with-deep-subprojects" );
+ createReactorProjects( dir, dir, null );
String sourceUrl = "http://svn.example.com/repos/project/trunk/";
String scmUrl = "scm:svn:" + sourceUrl;
ReleaseDescriptor descriptor = new ReleaseDescriptor();
@@ -206,7 +207,8 @@ public class ScmBranchPhaseTest
{
// prepare
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
+ String dir = "scm-commit/multiple-poms";
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
@@ -407,7 +409,8 @@ public class ScmBranchPhaseTest
private List<MavenProject> createReactorProjects()
throws Exception
{
- return createReactorProjects( "scm-commit/", "single-pom" );
+ String dir = "scm-commit/single-pom";
+ return createReactorProjects( dir, dir, null );
}
private static ReleaseDescriptor createReleaseDescriptor()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
index 56875c0..4b60f5c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
@@ -171,7 +171,8 @@ public class ScmCommitDevelopmentPhaseTest
private List<MavenProject> createReactorProjects()
throws Exception
{
- return createReactorProjects( "scm-commit/", "single-pom" );
+ String dir = "scm-commit/single-pom";
+ return createReactorProjects( dir, dir, null );
}
private static ReleaseDescriptor createReleaseDescriptor( MavenProject rootProject )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
index fb2ea9e..9740822 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
@@ -132,7 +132,8 @@ public class ScmCommitPreparationPhaseTest
{
// prepare
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
+ String dir = "scm-commit/multiple-poms";
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -459,7 +460,8 @@ public class ScmCommitPreparationPhaseTest
private List<MavenProject> createReactorProjects()
throws Exception
{
- return createReactorProjects( "scm-commit/", "single-pom" );
+ String dir = "scm-commit/single-pom";
+ return createReactorProjects( dir, dir, null );
}
private static ReleaseDescriptor createReleaseDescriptor()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
index 239f213..e1e1729 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
@@ -122,7 +122,7 @@ public class ScmTagPhaseTest
{
// prepare
List<MavenProject> reactorProjects =
- createReactorProjects( "scm-commit/", "multimodule-with-deep-subprojects" );
+ createReactorProjects( "scm-commit/multimodule-with-deep-subprojects", "" );
String sourceUrl = "http://svn.example.com/repos/project/trunk/";
String scmUrl = "scm:svn:" + sourceUrl;
ReleaseDescriptor descriptor = new ReleaseDescriptor();
@@ -206,7 +206,8 @@ public class ScmTagPhaseTest
{
// prepare
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms" );
+ String dir = "scm-commit/multiple-poms";
+ List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
descriptor.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) );
@@ -406,7 +407,7 @@ public class ScmTagPhaseTest
private List<MavenProject> createReactorProjects()
throws Exception
{
- return createReactorProjects( "scm-commit/", "single-pom" );
+ return createReactorProjects( "scm-commit/single-pom", "" );
}
private static ReleaseDescriptor createReleaseDescriptor()
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.