You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/06/13 14:01:19 UTC
svn commit: r667490 - in
/maven/artifact/trunk/src/test/java/org/apache/maven/artifact:
AbstractArtifactComponentTestCase.java
repository/metadata/AbstractRepositoryMetadataTest.java
testutils/TestFileManager.java
Author: brett
Date: Fri Jun 13 05:01:19 2008
New Revision: 667490
URL: http://svn.apache.org/viewvc?rev=667490&view=rev
Log:
[MARTIFACT-11] Do not use FileReader/FileWriter for encoding purposes
Submitted by: Benjamin Bentmann
Modified:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=667490&r1=667489&r2=667490&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java Fri Jun 13 05:01:19 2008
@@ -27,8 +27,9 @@
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
@@ -225,7 +226,7 @@
artifactFile.getParentFile().mkdirs();
}
- Writer writer = new FileWriter( artifactFile );
+ Writer writer = new OutputStreamWriter( new FileOutputStream( artifactFile ), "ISO-8859-1" );
writer.write( artifact.getId() );
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java?rev=667490&r1=667489&r2=667490&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java Fri Jun 13 05:01:19 2008
@@ -65,7 +65,7 @@
trm.updateRepositoryMetadata( local.repository, remote.repository );
fileManager.assertFileExistence( basedir, path, true );
- assertTrue( fileManager.getFileContents( new File( basedir, path ) ).indexOf( "<version>"
+ assertTrue( fileManager.getFileContents( new File( basedir, path ), "UTF-8" ).indexOf( "<version>"
+ Artifact.LATEST_VERSION + "</version>" ) < 0 );
mm.verifyAll();
@@ -94,7 +94,7 @@
trm.updateRepositoryMetadata( local.repository, remote.repository );
fileManager.assertFileExistence( basedir, path, true );
- assertTrue( fileManager.getFileContents( new File( basedir, path ) ).indexOf( "<version>"
+ assertTrue( fileManager.getFileContents( new File( basedir, path ), "UTF-8" ).indexOf( "<version>"
+ Artifact.RELEASE_VERSION + "</version>" ) < 0 );
mm.verifyAll();
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java?rev=667490&r1=667489&r2=667490&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java Fri Jun 13 05:01:19 2008
@@ -40,14 +40,9 @@
import junit.framework.Assert;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -178,77 +173,36 @@
}
}
- public void assertFileContents( File dir, String filename, String contentsTest )
+ public void assertFileContents( File dir, String filename, String contentsTest, String encoding )
throws IOException
{
assertFileExistence( dir, filename, true );
File file = new File( dir, filename );
- FileReader reader = null;
- StringWriter writer = new StringWriter();
+ String contents = FileUtils.fileRead( file, encoding );
- try
- {
- reader = new FileReader( file );
-
- IOUtil.copy( reader, writer );
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- Assert.assertEquals( contentsTest, writer.toString() );
+ Assert.assertEquals( contentsTest, contents );
}
- public File createFile( File dir, String filename, String contents )
+ public File createFile( File dir, String filename, String contents, String encoding )
throws IOException
{
File file = new File( dir, filename );
file.getParentFile().mkdirs();
- FileWriter writer = null;
-
- try
- {
- writer = new FileWriter( file );
-
- IOUtil.copy( new StringReader( contents ), writer );
- }
- finally
- {
- IOUtil.close( writer );
- }
+ FileUtils.fileWrite( file.getPath(), encoding, contents );
markForDeletion( file );
return file;
}
- public String getFileContents( File file )
+ public String getFileContents( File file, String encoding )
throws IOException
{
- String result = null;
-
- FileReader reader = null;
- try
- {
- reader = new FileReader( file );
-
- StringWriter writer = new StringWriter();
-
- IOUtil.copy( reader, writer );
-
- result = writer.toString();
- }
- finally
- {
- IOUtil.close( reader );
- }
-
- return result;
+ return FileUtils.fileRead( file, encoding );
}
protected void finalize()
@@ -259,11 +213,11 @@
super.finalize();
}
- public File createFile( String filename, String content )
+ public File createFile( String filename, String content, String encoding )
throws IOException
{
File dir = createTempDir();
- return createFile( dir, filename, content );
+ return createFile( dir, filename, content, encoding );
}
}