You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2007/11/01 20:01:17 UTC
svn commit: r591123 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/ main/java/org/codehaus/
test/java/org/apache/maven/shared/release/phase/
Author: hboutemy
Date: Thu Nov 1 12:01:16 2007
New Revision: 591123
URL: http://svn.apache.org/viewvc?rev=591123&view=rev
Log:
[MRELEASE-87] add XML encoding support for POM reading/writing
Added:
maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/
- copied from r590475, maven/plugins/trunk/maven-install-plugin/src/main/java/org/codehaus/
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
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/AbstractEditModeRewritingReleasePhaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.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/GenerateReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Thu Nov 1 12:01:16 2007
@@ -42,7 +42,9 @@
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.WriterFactory;
import org.jdom.Comment;
import org.jdom.Document;
import org.jdom.Element;
@@ -57,10 +59,7 @@
import org.jdom.xpath.XPath;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
@@ -121,8 +120,7 @@
private static String readXmlFile( File file )
throws IOException
{
- // TODO use ReaderFactory.newXmlReader() when plexus-utils is upgraded to 1.4.5+
- return IOUtil.toString( new FileInputStream( file ), "UTF-8" );
+ return IOUtil.toString( ReaderFactory.newXmlReader( file ) );
}
private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor, Settings settings,
@@ -669,8 +667,7 @@
Writer writer = null;
try
{
- // TODO use WriterFactory.newXmlWriter() when plexus-utils is upgraded to 1.4.5+
- writer = new OutputStreamWriter( new FileOutputStream( pomFile ), "UTF-8" );
+ writer = WriterFactory.newXmlWriter( pomFile );
if ( intro != null )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java Thu Nov 1 12:01:16 2007
@@ -46,11 +46,10 @@
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.WriterFactory;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
@@ -151,8 +150,7 @@
try
{
- // TODO use WriterFactory.newXmlWriter() when plexus-utils is upgraded to 1.4.5+
- fileWriter = new OutputStreamWriter( new FileOutputStream( releasePomFile ), "UTF-8" );
+ fileWriter = WriterFactory.newXmlWriter( releasePomFile );
pomWriter.write( fileWriter, releasePom );
}
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=591123&r1=591122&r2=591123&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 Thu Nov 1 12:01:16 2007
@@ -23,10 +23,11 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -84,13 +85,18 @@
{
MavenXpp3Reader reader = new MavenXpp3Reader();
- // TODO use ReaderFactory.newXmlReader() when plexus-utils is upgraded to 1.4.5+
- Model model = reader.read( new InputStreamReader( new FileInputStream( pomFile ), "UTF-8" ) );
+ Model model = reader.read( ReaderFactory.newXmlReader( pomFile ) );
MavenProject project = new MavenProject( model );
project.setFile( pomFile );
return project;
+ }
+
+ protected String readXmlFile( File file )
+ throws IOException
+ {
+ return IOUtil.toString( ReaderFactory.newXmlReader( file ) );
}
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java Thu Nov 1 12:01:16 2007
@@ -53,7 +53,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithEditModeFailure()
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java Thu Nov 1 12:01:16 2007
@@ -46,6 +46,8 @@
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import org.jmock.Mock;
import java.io.File;
@@ -220,40 +222,46 @@
return map;
}
- protected boolean compareFiles( List reactorProjects )
+ protected boolean comparePomFiles( List reactorProjects )
throws IOException
{
- compareFiles( reactorProjects, "" );
+ comparePomFiles( reactorProjects, "" );
// TODO: return void since this is redundant
return true;
}
- protected void compareFiles( List reactorProjects, String expectedFileSuffix )
+ protected void comparePomFiles( List reactorProjects, String expectedFileSuffix )
throws IOException
{
for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
- compareFiles( project, expectedFileSuffix );
+ comparePomFiles( project, expectedFileSuffix );
}
}
- protected void compareFiles( MavenProject project, String expectedFileSuffix )
+ protected void comparePomFiles( MavenProject project, String expectedFileSuffix )
throws IOException
{
File actualFile = project.getFile();
File expectedFile = new File( actualFile.getParentFile(), "expected-pom" + expectedFileSuffix + ".xml" );
- compareFiles( expectedFile, actualFile );
+ comparePomFiles( expectedFile, actualFile );
}
- protected void compareFiles( File expectedFile, File actualFile )
+ protected String readXmlFile( File file )
throws IOException
{
- String actual = FileUtils.fileRead( actualFile );
- String expected = FileUtils.fileRead( expectedFile );
+ return IOUtil.toString( ReaderFactory.newXmlReader( file ) );
+ }
+
+ protected void comparePomFiles( File expectedFile, File actualFile )
+ throws IOException
+ {
+ String actual = readXmlFile( actualFile );
+ String expected = readXmlFile( expectedFile );
expected = expected.replaceAll( "\\$\\{remoterepo\\}", getRemoteRepositoryURL() );
assertEquals( "Check the transformed POM", expected, actual );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java Thu Nov 1 12:01:16 2007
@@ -60,7 +60,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomWithParent()
@@ -71,7 +71,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomWithUnmappedParent()
@@ -112,7 +112,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
protected abstract void mapAlternateNextVersion( ReleaseDescriptor config, String projectId );
@@ -125,7 +125,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomWithChangedInheritedVersion()
@@ -137,7 +137,7 @@
phase.execute( config, null, reactorProjects );
MavenProject project = (MavenProject) getProjectsAsMap( reactorProjects ).get( "groupId:subproject1" );
- compareFiles( project, "-version-changed" );
+ comparePomFiles( project, "-version-changed" );
}
protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
@@ -152,7 +152,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomUnmappedDependencies()
@@ -181,7 +181,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteManagedPomDependencies()
@@ -192,7 +192,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteManagedPomUnmappedDependencies()
@@ -221,7 +221,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomUnmappedPlugins()
@@ -250,7 +250,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteManagedPomPlugins()
@@ -261,7 +261,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteManagedPomUnmappedPlugins()
@@ -290,7 +290,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomUnmappedReportPlugins()
@@ -319,7 +319,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomExtension()
@@ -330,7 +330,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomUnmappedExtension()
@@ -359,7 +359,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomExtensionUndefinedVersion()
@@ -370,7 +370,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteAddSchema()
@@ -388,7 +388,7 @@
phase.execute( config, null, reactorProjects );
- compareFiles( reactorProjects, "-with-schema" );
+ comparePomFiles( reactorProjects, "-with-schema" );
copyFiles = false;
}
@@ -575,7 +575,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
protected abstract List createReactorProjects( String path, boolean copyFiles )
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=591123&r1=591122&r2=591123&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 Thu Nov 1 12:01:16 2007
@@ -20,7 +20,6 @@
*/
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.FileUtils;
import java.util.List;
import java.util.Iterator;
@@ -113,9 +112,9 @@
{
assertTrue( "Check if backup file was created.", backupFile.exists() );
- String pomContents = FileUtils.fileRead( pomFile );
+ String pomContents = readXmlFile( pomFile );
- String backupContents = FileUtils.fileRead( backupFile );
+ String backupContents = readXmlFile( backupFile );
assertTrue( "Check if pom and backup files are identical", pomContents.equals( backupContents ) );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java Thu Nov 1 12:01:16 2007
@@ -35,7 +35,6 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.util.FileUtils;
import org.jmock.Mock;
import org.jmock.core.Constraint;
import org.jmock.core.constraint.IsAnything;
@@ -83,7 +82,7 @@
phase.execute( config, null, reactorProjects );
- compareFiles( reactorProjects );
+ comparePomFiles( reactorProjects );
}
/*
@@ -186,24 +185,24 @@
return config;
}
-
+
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#readTestProjectFile(java.lang.String)
*/
protected String readTestProjectFile( String fileName ) throws IOException
{
- return FileUtils.fileRead( getTestFile( "target/test-classes/projects/generate-release-poms/" + fileName ) );
+ return readXmlFile( getTestFile( "target/test-classes/projects/generate-release-poms/" + fileName ) );
}
/*
* @see org.apache.maven.shared.release.phase.AbstractReleaseTestCase#compareFiles(org.apache.maven.project.MavenProject, java.lang.String)
*/
- protected void compareFiles( MavenProject project, String expectedFileSuffix ) throws IOException
+ protected void comparePomFiles( MavenProject project, String expectedFileSuffix ) throws IOException
{
File actualFile = ReleaseUtil.getReleasePom( project );
File expectedFile = new File( actualFile.getParentFile(), "expected-release-pom" + expectedFileSuffix + ".xml" );
- compareFiles( expectedFile, actualFile );
+ comparePomFiles( expectedFile, actualFile );
// verify scm provider expectations here
// TODO: can we move this somewhere better?
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=591123&r1=591122&r2=591123&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 Thu Nov 1 12:01:16 2007
@@ -96,9 +96,9 @@
assertTrue( "Check if expected file exists.", expectedFile.exists() );
- String pomContents = FileUtils.fileRead( pomFile );
+ String pomContents = readXmlFile( pomFile );
- String expectedContents = FileUtils.fileRead( expectedFile );
+ String expectedContents = readXmlFile( expectedFile );
assertTrue( "Check if pom and backup files are identical", pomContents.equals( expectedContents ) );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java Thu Nov 1 12:01:16 2007
@@ -23,7 +23,6 @@
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.artifact.ArtifactUtils;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -157,7 +156,7 @@
protected String readTestProjectFile( String fileName )
throws IOException
{
- return FileUtils.fileRead( getTestFile( "target/test-classes/projects/rewrite-for-development/" + fileName ) );
+ return readXmlFile( getTestFile( "target/test-classes/projects/rewrite-for-development/" + fileName ) );
}
protected List createReactorProjects( String path, boolean copyFiles )
@@ -246,7 +245,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithCvsFromTag()
@@ -266,7 +265,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithInheritedScm()
@@ -293,7 +292,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomWithParentAndProperties()
@@ -313,7 +312,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomDependenciesWithoutDependenciesVersionUpdate()
@@ -327,6 +326,6 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java?rev=591123&r1=591122&r2=591123&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java Thu Nov 1 12:01:16 2007
@@ -21,7 +21,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -57,7 +56,7 @@
protected String readTestProjectFile( String fileName )
throws IOException
{
- return FileUtils.fileRead( getTestFile( "target/test-classes/projects/rewrite-for-release/" + fileName ) );
+ return readXmlFile( getTestFile( "target/test-classes/projects/rewrite-for-release/" + fileName ) );
}
public void testSimulateRewrite()
@@ -125,7 +124,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
@@ -173,7 +172,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithTagBase()
@@ -187,7 +186,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithTagBaseAndVaryingScmUrls()
@@ -200,7 +199,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithCvsFromTag()
@@ -212,7 +211,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithEmptyScm()
@@ -224,7 +223,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteInterpolatedVersions()
@@ -235,7 +234,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewriteInterpolatedVersionsDifferentVersion()
@@ -259,7 +258,7 @@
// skip subproject1 - we don't need to worry about its version mapping change, it has no deps of any kind
if ( !"groupId".equals( project.getGroupId() ) || !"subproject1".equals( project.getArtifactId() ) )
{
- compareFiles( project, "-different-version" );
+ comparePomFiles( project, "-different-version" );
}
}
}
@@ -273,7 +272,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
public void testRewritePomWithParentAndProperties()
@@ -288,7 +287,7 @@
phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( reactorProjects ) );
+ assertTrue( comparePomFiles( reactorProjects ) );
}
protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )