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 2016/05/21 08:50:24 UTC
svn commit: r1744877 - in
/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase:
AbstractBackupPomsPhaseTest.java CreateBackupPomsPhaseTest.java
RestoreBackupPomsPhaseTest.java
Author: rfscholte
Date: Sat May 21 08:50:24 2016
New Revision: 1744877
URL: http://svn.apache.org/viewvc?rev=1744877&view=rev
Log:
Migrate more PhaseTests to PlexusJUnit4TestCase
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java?rev=1744877&r1=1744876&r2=1744877&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java Sat May 21 08:50:24 2016
@@ -22,7 +22,7 @@ package org.apache.maven.shared.release.
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
@@ -34,7 +34,7 @@ import java.util.List;
* @author Edwin Punzalan
*/
public abstract class AbstractBackupPomsPhaseTest
- extends PlexusTestCase
+ extends PlexusJUnit4TestCase
{
private final String pomFilename = "pom.xml";
@@ -42,7 +42,7 @@ public abstract class AbstractBackupPoms
protected ReleasePhase phase;
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java?rev=1744877&r1=1744876&r2=1744877&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java Sat May 21 08:50:24 2016
@@ -19,14 +19,18 @@ package org.apache.maven.shared.release.
* under the License.
*/
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
-import org.apache.maven.shared.release.util.ReleaseUtil;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.junit.Test;
+
/**
* @author Edwin Punzalan
*/
@@ -39,33 +43,35 @@ public class CreateBackupPomsPhaseTest
return (ReleasePhase) lookup( ReleasePhase.ROLE, "create-backup-poms" );
}
+ @Test
public void testBasicPom()
throws Exception
{
String projectPath = "target/test-classes/projects/create-backup-poms/basic-pom";
- //should create backup files
+ // should create backup files
runExecuteOnProjects( projectPath );
- //should delete backup files
+ // should delete backup files
runCleanOnProjects( projectPath );
- //should re-create backup files
+ // should re-create backup files
runSimulateOnProjects( projectPath );
}
+ @Test
public void testMultiModulePom()
throws Exception
{
String projectPath = "target/test-classes/projects/create-backup-poms/pom-with-modules";
- //should create backup files
+ // should create backup files
runExecuteOnProjects( projectPath );
- //should delete backup files
+ // should delete backup files
runCleanOnProjects( projectPath );
- //should re-create backup files
+ // should re-create backup files
runSimulateOnProjects( projectPath );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java?rev=1744877&r1=1744876&r2=1744877&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java Sat May 21 08:50:24 2016
@@ -19,15 +19,18 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.FileUtils;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
+import org.junit.Test;
/**
* @author Edwin Punzalan
@@ -43,12 +46,13 @@ public class RestoreBackupPomsPhaseTest
return (ReleasePhase) lookup( ReleasePhase.ROLE, "restore-backup-poms" );
}
+ @Test
public void testBasicPom()
throws Exception
{
String projectPath = "/projects/restore-backup-poms/basic-pom";
- //copy poms so tests are valid without clean
+ // copy poms so tests are valid without clean
File sourceDir = getTestFile( "src/test/resources" + projectPath );
File testDir = getTestFile( "target/test-classes" + projectPath );
FileUtils.copyDirectoryStructure( sourceDir, testDir );
@@ -58,12 +62,13 @@ public class RestoreBackupPomsPhaseTest
runExecuteOnProjects( testPath );
}
+ @Test
public void testMultiModulePom()
throws Exception
{
String projectPath = "/projects/restore-backup-poms/pom-with-modules";
- //copy poms so tests are valid without clean
+ // copy poms so tests are valid without clean
File sourceDir = getTestFile( "src/test/resources" + projectPath );
File testDir = getTestFile( "target/test-classes" + projectPath );
FileUtils.copyDirectoryStructure( sourceDir, testDir );