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/03/23 19:39:52 UTC
[maven-release] 03/05: Prepare usage of workingDirectory in tests
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch Paths
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 2a30602ab1caff4123892aba4ea77c9d78b01eb0
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 23 17:58:57 2018 +0100
Prepare usage of workingDirectory in tests
---
.../maven/shared/release/phase/AbstractReleaseTestCase.java | 10 +++++-----
.../shared/release/phase/GenerateReleasePomsPhaseTest.java | 4 +---
.../shared/release/phase/RewritePomsForBranchPhaseTest.java | 11 +++++++++--
.../release/phase/RewritePomsForDevelopmentPhaseTest.java | 11 +++++++++--
.../shared/release/phase/RewritePomsForReleasePhaseTest.java | 12 ++++++++++--
5 files changed, 34 insertions(+), 14 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 40334be..2ddee24 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
@@ -98,6 +98,11 @@ public abstract class AbstractReleaseTestCase
localRepository = new MavenArtifactRepository( "local", "file://" + localRepoPath, layout, null, null );
}
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", workingDir ) ) ;
+ }
+
protected List<MavenProject> createReactorProjects( String path, String subpath )
throws Exception
{
@@ -207,11 +212,6 @@ public abstract class AbstractReleaseTestCase
return resolvedProjects;
}
- protected final Path getWorkingDirectory( String workingDir )
- {
- return Paths.get( getBasedir(), "target/test-classes" ).resolve( Paths.get( "projects", workingDir ) ) ;
- }
-
protected static Map<String,MavenProject> getProjectsAsMap( List<MavenProject> reactorProjects )
{
Map<String,MavenProject> map = new HashMap<>();
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 706ce99..1dee628 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
@@ -188,10 +188,8 @@ public class GenerateReleasePomsPhaseTest
List<File> releasePoms = new ArrayList<>();
- for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = iterator.next();
-
releasePoms.add( ReleaseUtil.getReleasePom( project ) );
}
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 5f337b8..875327f 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
@@ -59,11 +60,17 @@ public class RewritePomsForBranchPhaseTest
}
@Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-branch/" + workingDir );
+ }
+
+ @Override
protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-branch/" + Objects.toString( path, "" );
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
@@ -407,7 +414,7 @@ public class RewritePomsForBranchPhaseTest
throws Exception
{
List<MavenProject> reactorProjects =
- createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "root-project" );
+ createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
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 64fcb0c..17d46bc 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.LinkedList;
import java.util.List;
@@ -63,6 +64,12 @@ public class RewritePomsForDevelopmentPhaseTest
{
return "rewrite-poms-for-development";
}
+
+ @Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-development/" + workingDir );
+ }
@Test
public void testSimulateRewrite()
@@ -88,7 +95,7 @@ public class RewritePomsForDevelopmentPhaseTest
private List<MavenProject> createReactorProjectsWhenSimulated( String name )
throws Exception
{
- return createReactorProjects( "rewrite-for-release/" + name, "rewrite-for-development/" + name, null );
+ return createReactorProjects( "rewrite-for-release/" + name, name, null );
}
@Test
@@ -171,7 +178,7 @@ public class RewritePomsForDevelopmentPhaseTest
throws Exception
{
String dir = "rewrite-for-development/" + path;
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
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 a65051d..c83b978 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
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
@@ -58,13 +59,20 @@ public class RewritePomsForReleasePhaseTest
{
return "rewrite-poms-for-release";
}
+
+ @Override
+ protected Path getWorkingDirectory( String workingDir )
+ {
+ return super.getWorkingDirectory( "rewrite-for-release/" + workingDir );
+ }
+
@Override
protected List<MavenProject> prepareReactorProjects( String path )
throws Exception
{
String dir = "rewrite-for-release/" + Objects.toString( path, "" );
- return createReactorProjects( dir, dir, null );
+ return createReactorProjects( dir, path, null );
}
@Override
@@ -408,7 +416,7 @@ public class RewritePomsForReleasePhaseTest
throws Exception
{
List<MavenProject> reactorProjects =
- createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "root-project" );
+ createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "pom-with-parent-flat", "root-project" );
ReleaseDescriptorBuilder builder = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.