You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/28 03:34:29 UTC
svn commit: r680222 [6/6] -
/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java Sun Jul 27 18:34:23 2008
@@ -50,8 +50,8 @@
// The testdir is computed from the location of this
// file.
File testDir = extractTestResources( getClass(), "/mng-3671-pluginLevelDepInterpolation" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "compile" );
/*
* This is the simplest way to check a build
@@ -59,15 +59,15 @@
* an IT test: make the build pass when the test
* should pass, and make the build fail when the
* test should fail. There are other methods
- * supported by the verifier. They can be seen here:
- * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
+ * supported by the itr. They can be seen here:
+ * http://maven.apache.org/shared/maven-itr/apidocs/index.html
*/
- verifier.verifyErrorFreeLog();
+ itr.verifyErrorFreeLog();
/*
- * Reset the streams before executing the verifier
+ * Reset the streams before executing the itr
* again.
*/
- verifier.resetStreams();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java Sun Jul 27 18:34:23 2008
@@ -17,10 +17,10 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-3679-pluginExecIdInterpolation" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "validate" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
assertTrue( new File( testDir, "target/check.txt" ).exists() );
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java Sun Jul 27 18:34:23 2008
@@ -24,9 +24,9 @@
throws Exception
{
File testDir = extractTestResources( getClass(), "/mng-3680-invalidDependencyPOM" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ IntegrationTestRunner itr = new IntegrationTestRunner( testDir.getAbsolutePath() );
+ itr.executeGoal( "compile" );
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
}
}
Modified: maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java?rev=680222&r1=680221&r2=680222&view=diff
==============================================================================
--- maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java (original)
+++ maven/core-integration-testing/branches/embedder/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java Sun Jul 27 18:34:23 2008
@@ -27,25 +27,25 @@
File pluginDir = new File( testDir, "maven-mng3684-plugin" );
File projectDir = new File( testDir, "project" );
- IntegrationTestRunner verifier = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ IntegrationTestRunner itr = new IntegrationTestRunner( pluginDir.getAbsolutePath() );
+ itr.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
- verifier = new IntegrationTestRunner( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ itr = new IntegrationTestRunner( projectDir.getAbsolutePath() );
+ itr.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
File logFile = new File( projectDir, "log.txt" );
logFile.renameTo( new File( projectDir, "log-validate.txt" ) );
- verifier.executeGoal( "site" );
+ itr.executeGoal( "site" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ itr.verifyErrorFreeLog();
+ itr.resetStreams();
logFile.renameTo( new File( projectDir, "log-site.txt" ) );