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 2008/12/10 23:35:11 UTC
svn commit: r725470 -
/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/
Author: bentmann
Date: Wed Dec 10 14:35:11 2008
New Revision: 725470
URL: http://svn.apache.org/viewvc?rev=725470&view=rev
Log:
o Fixed some version ranges to match actual release history
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java Wed Dec 10 14:35:11 2008
@@ -31,7 +31,7 @@
{
public MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest() {
- super( "(2.0.1,2.99.99)" );//extension support removed from 3.0
+ super( "(2.0.1,2.0.5),(2.0.6,2.99.99)" );//extension support removed from 3.0
}
public void testit0115()
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java Wed Dec 10 14:35:11 2008
@@ -78,7 +78,10 @@
* NOTE: We intentionally do not check whether the build paths have been basedir aligned, that's another
* story...
*/
- assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+ if ( matchesVersionRange( "(2.0.8,)" ) )
+ {
+ assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+ }
assertTrue( props.getProperty( prefix + "projectSiteOut" ).endsWith( "doc" ) );
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java Wed Dec 10 14:35:11 2008
@@ -78,7 +78,10 @@
* NOTE: We intentionally do not check whether the build paths have been basedir aligned, that's another
* story...
*/
- assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+ if ( matchesVersionRange( "(2.0.8,)" ) )
+ {
+ assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+ }
assertTrue( props.getProperty( prefix + "projectSiteOut" ).endsWith( "doc" ) );
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java Wed Dec 10 14:35:11 2008
@@ -38,7 +38,6 @@
public MavenIT0144LifecycleExecutionOrderTest()
{
- super( "(2.0.4,)" );
}
/**
@@ -75,12 +74,21 @@
expected.add( "generate-test-resources" );
expected.add( "process-test-resources" );
expected.add( "test-compile" );
- expected.add( "process-test-classes" );
+ if ( matchesVersionRange( "(2.0.4,)" ) )
+ {
+ expected.add( "process-test-classes" );
+ }
expected.add( "test" );
expected.add( "package" );
- expected.add( "pre-integration-test" );
+ if ( matchesVersionRange( "(2.0.1,)" ) )
+ {
+ expected.add( "pre-integration-test" );
+ }
expected.add( "integration-test" );
- expected.add( "post-integration-test" );
+ if ( matchesVersionRange( "(2.0.1,)" ) )
+ {
+ expected.add( "post-integration-test" );
+ }
expected.add( "verify" );
expected.add( "install" );
expected.add( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java Wed Dec 10 14:35:11 2008
@@ -46,7 +46,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- if ( matchesVersionRange( "[2.0.4, 2.99.99)" ) )
+ if ( matchesVersionRange( "(, 2.99.99)" ) )
{
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java Wed Dec 10 14:35:11 2008
@@ -27,8 +27,6 @@
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
/**
* This is a sample integration test. The IT tests typically
* operate by having a sample project in the
@@ -43,7 +41,7 @@
*
*/
public class MavenITmng3372DirectInvocationOfPluginsTest
- extends TestCase
+ extends AbstractMavenIntegrationTestCase
{
public MavenITmng3372DirectInvocationOfPluginsTest()
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java Wed Dec 10 14:35:11 2008
@@ -38,7 +38,7 @@
public MavenITmng3475BaseAlignedDirTest()
{
- super( "(2.0.1,)");
+ super( "(2.0.1,2.0.3),(2.0.3,)");
}
/**
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java?rev=725470&r1=725469&r2=725470&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java Wed Dec 10 14:35:11 2008
@@ -35,6 +35,11 @@
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng3831PomInterpolationTest()
+ {
+ super( "(,2.0.2),(2.0.2,)" );
+ }
+
/**
* Test that expressions of the form ${*} resolve correctly to POM values (ugly but real).
*/
@@ -81,7 +86,10 @@
* NOTE: We intentionally do not check whether the build paths have been basedir aligned, that's another
* story...
*/
- assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+ if ( matchesVersionRange( "(2.0.8,)" ) )
+ {
+ assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+ }
assertTrue( props.getProperty( prefix + "projectSiteOut" ).endsWith( "doc" ) );
}