You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/11/21 22:50:46 UTC
svn commit: r477911 -
/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java
Author: snicoll
Date: Tue Nov 21 13:50:46 2006
New Revision: 477911
URL: http://svn.apache.org/viewvc?view=rev&rev=477911
Log:
Added test utility.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java?view=diff&rev=477911&r1=477910&r2=477911
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java Tue Nov 21 13:50:46 2006
@@ -19,16 +19,12 @@
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.custommonkey.xmlunit.XMLAssert;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.archiver.UnArchiver;
import java.io.File;
import java.io.FileReader;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -72,10 +68,10 @@
protected File executeMojo( final String projectName, final Properties properties, boolean expectNoError )
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/projects/" + projectName );
- Verifier verifier = new Verifier( testDir.getAbsolutePath());
+ File testDir = getTestDir( projectName );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
// Let's add alternate settings.xml setting so that the latest dependencies are used
- verifier.getCliOptions().add("-s " + settingsFile.getAbsolutePath());
+ verifier.getCliOptions().add( "-s " + settingsFile.getAbsolutePath() );
verifier.localRepo = localRepositoryDir.getAbsolutePath();
verifier.executeGoal( "package" );
// If no error is expected make sure that error logs are free
@@ -313,6 +309,12 @@
basedir = new File( basedirString );
}
return basedir;
+ }
+
+ protected File getTestDir( String projectName )
+ throws IOException
+ {
+ return ResourceExtractor.simpleExtractResources( getClass(), "/projects/" + projectName );
}
// Generated application.xml stuff