You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/13 21:33:58 UTC
svn commit: r784458 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
resources/mng-3719/pom.xml
Author: bentmann
Date: Sat Jun 13 19:33:57 2009
New Revision: 784458
URL: http://svn.apache.org/viewvc?rev=784458&view=rev
Log:
o Decoupled IT from log format of core and evaluated log output of IT plugins instead
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java?rev=784458&r1=784457&r2=784458&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java Sat Jun 13 19:33:57 2009
@@ -56,7 +56,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- Pattern pattern = Pattern.compile( ".*\\{execution: step ([0-9])\\}.*" );
+ Pattern pattern = Pattern.compile( ".*step-([0-9])\\.properties.*" );
int[] stepLines = new int[3];
List content = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml?rev=784458&r1=784457&r2=784458&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml Sat Jun 13 19:33:57 2009
@@ -50,7 +50,7 @@
<goal>reset</goal>
</goals>
<configuration>
- <logFile>target/model.properties</logFile>
+ <logFile>target/step-1.properties</logFile>
</configuration>
</execution>
</executions>
@@ -67,7 +67,7 @@
<goal>eval</goal>
</goals>
<configuration>
- <outputFile>target/model.properties</outputFile>
+ <outputFile>target/step-2.properties</outputFile>
<expressions>
<expression>project/properties</expression>
</expressions>
@@ -87,7 +87,7 @@
<goal>reset</goal>
</goals>
<configuration>
- <logFile>target/model.properties</logFile>
+ <logFile>target/step-3.properties</logFile>
</configuration>
</execution>
</executions>