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

[MNG-6127] support IT re-run without cleaning

This commit is contained in:
Hervé Boutemy 2018-02-08 22:35:21 +01:00
parent b2805f87f1
commit 2df8667f33
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
View File

@ -53,25 +53,29 @@ public class MavenITmng6127PluginExecutionConfigurationInterferenceTest
verifier.resetStreams();
verifier.verifyErrorFreeLog();
File modAconfigurationFile = new File( modAprojectDir, "configuration.txt" );
File modBconfigurationFile = new File( modBprojectDir, "configuration.txt" );
File modCconfigurationFile = new File( modCprojectDir, "configuration.txt" );
modAconfigurationFile.delete();
modBconfigurationFile.delete();
modCconfigurationFile.delete();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.executeGoal( "verify" );
verifier.resetStreams();
verifier.verifyErrorFreeLog();
File modAconfigurationFile = new File( modAprojectDir, "configuration.txt" );
verifier.assertFilePresent( modAconfigurationFile.getCanonicalPath() );
String modAactual = FileUtils.fileRead( modAconfigurationFile );
assertEquals( "mod-asecond", modAactual );
assertEquals( "name=mod-a, secondName=second from components.xml", modAactual );
File modBconfigurationFile = new File( modBprojectDir, "configuration.txt" );
verifier.assertFilePresent( modBconfigurationFile.getCanonicalPath() );
String modBactual = FileUtils.fileRead( modBconfigurationFile );
assertEquals( "mod-bsecond", modBactual );
assertEquals( "name=mod-b, secondName=second from components.xml", modBactual );
File modCconfigurationFile = new File( modCprojectDir, "configuration.txt" );
verifier.assertFilePresent( modCconfigurationFile.getCanonicalPath() );
String modCactual = FileUtils.fileRead( modCconfigurationFile );
assertEquals( "second", modCactual );
assertEquals( "secondName=second from components.xml", modCactual );
}
}

4
its/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
View File

@ -68,9 +68,9 @@ public class TestMojo
{
if ( name != null )
{
w.write( name );
w.write( "name=" + name + ", " );
}
w.write( secondName );
w.write( "secondName=" + secondName );
}
catch ( IOException e )
{

2
its/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/resources/META-INF/plexus/components.xml
View File

@ -17,7 +17,7 @@
<mojo>
<goal>mng-6127:mng-6127-plugin:test</goal>
<configuration>
<secondName>second</secondName>
<secondName>second from components.xml</secondName>
</configuration>
</mojo>
</mojos>