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

o Fixed some version ranges to match actual release history 

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@725470 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2008-12-10 22:35:11 +00:00
parent 836c6f6305
commit b4103e01da
8 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java
View File

@ -31,7 +31,7 @@ public class MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest
{
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()

5
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java
View File

@ -78,7 +78,10 @@ public class MavenIT0139Test
* 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" ) );
}

5
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java
View File

@ -78,7 +78,10 @@ public class MavenIT0140Test
* 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" ) );
}

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
View File

@ -38,7 +38,6 @@ public class MavenIT0144LifecycleExecutionOrderTest
public MavenIT0144LifecycleExecutionOrderTest()
{
super( "(2.0.4,)" );
}
/**
@ -75,12 +74,21 @@ public class MavenIT0144LifecycleExecutionOrderTest
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" );

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
View File

@ -46,7 +46,7 @@ public class MavenITmng2196ParentResolutionTest
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
if ( matchesVersionRange( "[2.0.4, 2.99.99)" ) )
if ( matchesVersionRange( "(, 2.99.99)" ) )
{
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
View File

@ -27,8 +27,6 @@ import java.util.ArrayList;
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 @@ import junit.framework.TestCase;
*
*/
public class MavenITmng3372DirectInvocationOfPluginsTest
extends TestCase
extends AbstractMavenIntegrationTestCase
{
public MavenITmng3372DirectInvocationOfPluginsTest()

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
View File

@ -38,7 +38,7 @@ public class MavenITmng3475BaseAlignedDirTest
public MavenITmng3475BaseAlignedDirTest()
{
super( "(2.0.1,)");
super( "(2.0.1,2.0.3),(2.0.3,)");
}
/**

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
View File

@ -35,6 +35,11 @@ public class MavenITmng3831PomInterpolationTest
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 @@ public class MavenITmng3831PomInterpolationTest
* 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" ) );
}