Author: ogusakov
Date: Mon Sep 29 16:29:42 2008
New Revision: 700305
URL: http://svn.apache.org/viewvc?rev=700305&view=rev
Log:
fixed MavenIT0119PluginPrefixOrder as it depended on current settings.xml
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java?rev=700305&r1=700304&r2=700305&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java
Mon Sep 29 16:29:42 2008
@@ -34,6 +34,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder" );
Verifier verifier;
+ //use my custom settings upon invocation.
+ ArrayList cli = new ArrayList();
// Install the parent POM, extension and the plugin
verifier = new Verifier( testDir.getAbsolutePath() );
@@ -42,20 +44,22 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+ // 2008-09-29 Oleg: fixed the test. If current settings.xml contains
codehause group,
+ // default order will be changed. Artificially make currently set
groups disappear
+
// now run the test. Since we have apache and codehaus, i should get
the apache one first
testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder/test-project" );
+ cli.add("-s '" +testDir.getAbsolutePath()+"/settings-apache.xml'");
verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setCliOptions( cli );
verifier.executeGoal( "it0119:apache" );
verifier.verifyErrorFreeLog();
-
+ cli.clear();
// now run the test. Since we have apache and codehaus and a prefix in my
settings, i should get the custom one first
testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder/test-project" );
verifier = new Verifier( testDir.getAbsolutePath() );
- //use my custom settings upon invocation.
- ArrayList cli = new ArrayList();
cli.add("-s '" +testDir.getAbsolutePath()+"/settings.xml'");
verifier.setCliOptions( cli );
verifier.executeGoal( "it0119:custom" );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml?rev=700305&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml
Mon Sep 29 16:29:42 2008
@@ -0,0 +1,2 @@
+<settings>
+</settings>
\ No newline at end of file
