Author: hboutemy
Date: Tue Feb 22 02:19:54 2011
New Revision: 1073206
URL: http://svn.apache.org/viewvc?rev=1073206&view=rev
Log:
fixed reader/writer leaks
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java?rev=1073206&r1=1073205&r2=1073206&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
Tue Feb 22 02:19:54 2011
@@ -29,14 +29,11 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectBuildingResult;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.PropertyUtils;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -332,7 +329,7 @@ public class DefaultArchetypeCreatorTest
private boolean assertContent( File template, String content )
throws FileNotFoundException, IOException
{
- String templateContent = IOUtil.toString( new FileReader( template ) );
+ String templateContent = FileUtils.fileRead( template, "UTF-8" );
return StringUtils.countMatches( templateContent, content ) > 0;
}
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java?rev=1073206&r1=1073205&r2=1073206&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
Tue Feb 22 02:19:54 2011
@@ -20,11 +20,13 @@ package org.apache.maven.archetype.old.d
*/
import java.io.File;
+import java.io.InputStream;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.IOUtil;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -49,7 +51,15 @@ public class ArchetypeXsdTest
"http://www.w3.org/2001/XMLSchema"; );
saxParser.setProperty(
"http://java.sun.com/xml/jaxp/properties/schemaSource";, archetypeXsd );
- saxParser.parse( new InputSource( getClass().getResourceAsStream(
"sample-archetype.xml" ) ), new Handler() );
+ InputStream in = getClass().getResourceAsStream(
"sample-archetype.xml" );
+ try
+ {
+ saxParser.parse( new InputSource( in ), new Handler() );
+ }
+ finally
+ {
+ IOUtil.close( in );
+ }
}
private static class Handler
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java?rev=1073206&r1=1073205&r2=1073206&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java
Tue Feb 22 02:19:54 2011
@@ -28,26 +28,22 @@ import java.io.File;
* @author rafale
*/
public class DefaultRepositoryCrawlerTest
-extends AbstractMojoTestCase
+ extends AbstractMojoTestCase
{
/**
* Test of crawl method, of class DefaultRepositoryCrawler.
*/
- public void testCrawl ()
- throws Exception
+ public void testCrawl()
+ throws Exception
{
- System.out.println ( "crawl" );
+ System.out.println( "crawl" );
- File repository = getTestFile (
"target/test-classes/repositories/central" );
- RepositoryCrawler instance =
- (RepositoryCrawler) lookup ( RepositoryCrawler.class.getName () );
+ File repository = getTestFile(
"target/test-classes/repositories/central" );
+ RepositoryCrawler instance = (RepositoryCrawler) lookup(
RepositoryCrawler.class.getName() );
- ArchetypeCatalog result = instance.crawl ( repository );
- System.err.println ( "result = " + result );
- assertTrue (
- ( 5 <= result.getArchetypes ().size () )
- && ( result.getArchetypes ().size () <= 8 )
- );
+ ArchetypeCatalog result = instance.crawl( repository );
+ System.err.println( "result = " + result );
+ assertTrue( ( 5 <= result.getArchetypes().size() ) && (
result.getArchetypes().size() <= 8 ) );
// TODO: should write to another directory
// instance.writeCatalog(result, new File(repository,
"archetype-catalog.xml"));
@@ -71,15 +67,15 @@ extends AbstractMojoTestCase
//// fail ( "The test case is a prototype." );
// }
- protected void tearDown ()
- throws Exception
+ protected void tearDown()
+ throws Exception
{
- super.tearDown ();
+ super.tearDown();
}
- protected void setUp ()
- throws Exception
+ protected void setUp()
+ throws Exception
{
- super.setUp ();
+ super.setUp();
}
}
