Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MRM-709: Use commons-io instead of Plexus Utils 

* migrating FileUtils from plexus-utils to commons-io

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@630586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2008-02-24 04:41:38 +00:00
parent 7151c6cada
commit ad39008ac5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
View File

@ -19,9 +19,9 @@ package org.apache.maven.archiva.configuration;
* under the License. * under the License.
*/ */
import org.apache.commons.io.FileUtils;
import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.registry.RegistryException; import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.util.FileUtils;
import org.custommonkey.xmlunit.XMLAssert; import org.custommonkey.xmlunit.XMLAssert;
import org.easymock.MockControl; import org.easymock.MockControl;
@ -169,7 +169,7 @@ public class ArchivaConfigurationTest
// TODO: remove with commons-configuration 1.4 // TODO: remove with commons-configuration 1.4
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
FileUtils.fileWrite( file.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( file, "<configuration/>", null );
DefaultArchivaConfiguration archivaConfiguration = DefaultArchivaConfiguration archivaConfiguration =
(DefaultArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save" ); (DefaultArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save" );
@ -224,7 +224,7 @@ public class ArchivaConfigurationTest
assertFalse( userFile.exists() ); assertFalse( userFile.exists() );
userFile.getParentFile().mkdirs(); userFile.getParentFile().mkdirs();
FileUtils.fileWrite( userFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( userFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" ); (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" );
@ -310,7 +310,7 @@ public class ArchivaConfigurationTest
assertFalse( userFile.exists() ); assertFalse( userFile.exists() );
baseFile.getParentFile().mkdirs(); baseFile.getParentFile().mkdirs();
FileUtils.fileWrite( baseFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( baseFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" ); (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" );
@ -342,10 +342,10 @@ public class ArchivaConfigurationTest
assertFalse( userFile.exists() ); assertFalse( userFile.exists() );
baseFile.getParentFile().mkdirs(); baseFile.getParentFile().mkdirs();
FileUtils.fileWrite( baseFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( baseFile, "<configuration/>", null );
userFile.getParentFile().mkdirs(); userFile.getParentFile().mkdirs();
FileUtils.fileWrite( userFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( userFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" ); (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" );
@ -359,10 +359,10 @@ public class ArchivaConfigurationTest
assertTrue( "Check file exists", baseFile.exists() ); assertTrue( "Check file exists", baseFile.exists() );
assertEquals( "Check base file is unchanged", "<configuration/>", assertEquals( "Check base file is unchanged", "<configuration/>",
FileUtils.fileRead( baseFile.getAbsolutePath() ) ); FileUtils.readFileToString( baseFile, null ) );
assertTrue( "Check file exists", userFile.exists() ); assertTrue( "Check file exists", userFile.exists() );
assertFalse( "Check base file is changed", assertFalse( "Check base file is changed",
"<configuration/>".equals( FileUtils.fileRead( userFile.getAbsolutePath() ) ) ); "<configuration/>".equals( FileUtils.readFileToString( userFile, null ) ) );
// check it // check it
configuration = archivaConfiguration.getConfiguration(); configuration = archivaConfiguration.getConfiguration();
@ -384,7 +384,7 @@ public class ArchivaConfigurationTest
FileUtils.copyFile( getTestFile( "src/test/conf/conf-user.xml" ), userFile ); FileUtils.copyFile( getTestFile( "src/test/conf/conf-user.xml" ), userFile );
baseFile.getParentFile().mkdirs(); baseFile.getParentFile().mkdirs();
FileUtils.fileWrite( baseFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( baseFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" ); (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" );
@ -398,10 +398,10 @@ public class ArchivaConfigurationTest
assertTrue( "Check file exists", baseFile.exists() ); assertTrue( "Check file exists", baseFile.exists() );
assertEquals( "Check base file is unchanged", "<configuration/>", assertEquals( "Check base file is unchanged", "<configuration/>",
FileUtils.fileRead( baseFile.getAbsolutePath() ) ); FileUtils.readFileToString( baseFile, null ) );
assertTrue( "Check file exists", userFile.exists() ); assertTrue( "Check file exists", userFile.exists() );
assertFalse( "Check base file is changed", assertFalse( "Check base file is changed",
"<configuration/>".equals( FileUtils.fileRead( userFile.getAbsolutePath() ) ) ); "<configuration/>".equals( FileUtils.readFileToString( userFile, null ) ) );
// check it // check it
configuration = archivaConfiguration.getConfiguration(); configuration = archivaConfiguration.getConfiguration();
@ -423,7 +423,7 @@ public class ArchivaConfigurationTest
FileUtils.copyFile( getTestFile( "src/test/conf/conf-base.xml" ), baseFile ); FileUtils.copyFile( getTestFile( "src/test/conf/conf-base.xml" ), baseFile );
userFile.getParentFile().mkdirs(); userFile.getParentFile().mkdirs();
FileUtils.fileWrite( userFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( userFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" ); (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-save-user" );
@ -552,7 +552,7 @@ public class ArchivaConfigurationTest
assertEquals( "check remote repositories size.", 2, configuration.getRemoteRepositoriesAsMap().size() ); assertEquals( "check remote repositories size.", 2, configuration.getRemoteRepositoriesAsMap().size() );
assertEquals( "check v1 repositories size.", 0, configuration.getRepositories().size() ); assertEquals( "check v1 repositories size.", 0, configuration.getRepositories().size() );
String actualXML = FileUtils.fileRead( userFile ); String actualXML = FileUtils.readFileToString( userFile, null );
XMLAssert.assertXpathNotExists( "//configuration/repositories/repository", actualXML ); XMLAssert.assertXpathNotExists( "//configuration/repositories/repository", actualXML );
XMLAssert.assertXpathNotExists( "//configuration/repositories", actualXML ); XMLAssert.assertXpathNotExists( "//configuration/repositories", actualXML );
} }
@ -606,7 +606,7 @@ public class ArchivaConfigurationTest
FileUtils.copyFile( getTestFile( "src/test/conf/escape-cron-expressions.xml" ), baseFile ); FileUtils.copyFile( getTestFile( "src/test/conf/escape-cron-expressions.xml" ), baseFile );
userFile.getParentFile().mkdirs(); userFile.getParentFile().mkdirs();
FileUtils.fileWrite( userFile.getAbsolutePath(), "<configuration/>" ); FileUtils.writeStringToFile( userFile, "<configuration/>", null );
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-cron-expressions" ); (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-cron-expressions" );