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/01 12:41:55 UTC
svn commit: r469870 - in /maven/plugins/trunk/maven-ear-plugin/src/test:
java/org/apache/maven/plugin/ear/AbstractEarPluginTestCase.java
resources/settings.xml
Author: snicoll
Date: Wed Nov 1 03:41:54 2006
New Revision: 469870
URL: http://svn.apache.org/viewvc?view=rev&rev=469870
Log:
Added settings.xml for test execution.
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml (with props)
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=469870&r1=469869&r2=469870
==============================================================================
--- 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 Wed Nov 1 03:41:54 2006
@@ -54,6 +54,8 @@
*/
protected File localRepositoryDir = new File( getBasedir().getAbsolutePath(), "target/test-classes/m2repo" );
+ protected File settingsFile = new File( getBasedir().getAbsolutePath(), "target/test-classes/settings.ml" );
+
/**
* Execute the EAR plugin for the specified project.
@@ -67,7 +69,8 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/projects/" + projectName );
- Verifier verifier = new Verifier( testDir.getAbsolutePath());
+ // Specifying the settings here does not seem to work.
+ Verifier verifier = new Verifier( testDir.getAbsolutePath(), settingsFile.getAbsolutePath() );
verifier.localRepo = localRepositoryDir.getAbsolutePath();
verifier.executeGoal( "package" );
// If no error is expected make sure that error logs are free
@@ -75,6 +78,7 @@
{
verifier.verifyErrorFreeLog();
}
+ verifier.resetStreams();
assertEarArchive( testDir, projectName );
assertEarDirectory( testDir, projectName );
@@ -327,11 +331,13 @@
final File[] expectedDeploymentDescriptors =
getDeploymentDescriptors( new File( baseDir, "expected-META-INF" ) );
-
- if (expectedDeploymentDescriptors == null) {
- assertNull( "No deployment descriptor was expected", actualDeploymentDescriptors);
- } else {
- assertNotNull( "Missing deployment descriptor", actualDeploymentDescriptors);
+ if ( expectedDeploymentDescriptors == null )
+ {
+ assertNull( "No deployment descriptor was expected", actualDeploymentDescriptors );
+ }
+ else
+ {
+ assertNotNull( "Missing deployment descriptor", actualDeploymentDescriptors );
}
// Make sure we have the same number of files
assertEquals( "Number of Deployment descriptor(s) mismatch", expectedDeploymentDescriptors.length,
@@ -353,8 +359,8 @@
FileReader actual = null;
try
{
- expected = new FileReader( expectedDeploymentDescriptor);
- actual = new FileReader( actualDeploymentDescriptor);
+ expected = new FileReader( expectedDeploymentDescriptor );
+ actual = new FileReader( actualDeploymentDescriptor );
XMLAssert.assertXMLEqual(
"Wrong deployment descriptor generated for[" + expectedDeploymentDescriptor.getName() + "]",
expected, actual );
@@ -363,11 +369,15 @@
{
e.printStackTrace();
fail( "Could not assert deployment descriptor " + e.getMessage() );
- } finally {
- if (expected != null) {
+ }
+ finally
+ {
+ if ( expected != null )
+ {
expected.close();
}
- if (actual != null) {
+ if ( actual != null )
+ {
actual.close();
}
}
Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml?view=auto&rev=469870
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml Wed Nov 1 03:41:54 2006
@@ -0,0 +1,18 @@
+<settings xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <profiles>
+ <profile>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <id>test</id>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision