various versions cannot be < both SNAPSHOT and alpha-1-SNAPSHOT, so use a (hopefully!) unrealistic version in the 2.0.x series as a boundary. Once we get the first 2.1 alpha out, these can be switched to be < 2.1-alpha-1

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@680148 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-07-27 16:49:16 +00:00
parent a55a0dcd2a
commit 18269faa00
11 changed files with 17 additions and 11 deletions

View File

@ -13,7 +13,8 @@ public class MavenIT0026Test
public MavenIT0026Test()
throws InvalidVersionSpecificationException
{
super( "[,2.1-ALPHA-1-SNAPSHOT)" );
// < 2.1 (including snapshots)
super( "[,2.0.99)" );
}
/**

View File

@ -14,7 +14,8 @@ public class MavenIT0051Test
public MavenIT0051Test()
throws InvalidVersionSpecificationException
{
super( "[,2.1-ALPHA-1-SNAPSHOT)" );
// < 2.1 (including snapshots)
super( "[,2.0.99)" );
}
/**

View File

@ -14,7 +14,8 @@ public class MavenIT0092Test
public MavenIT0092Test()
throws InvalidVersionSpecificationException
{
super( "[,2.1-ALPHA-1-SNAPSHOT)" );
// < 2.1 (including snapshots)
super( "[,2.0.99)" );
}
/**

View File

@ -14,7 +14,8 @@ public class MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest
public MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest()
throws InvalidVersionSpecificationException
{
super( "(,2.1-ALPHA-1-SNAPSHOT)" );
// < 2.1 (including snapshots)
super( "(,2.0.99)" );
}
public void testit0111()

View File

@ -14,7 +14,8 @@ public class MavenIT0114ExtensionThatProvidesResources
public MavenIT0114ExtensionThatProvidesResources()
throws InvalidVersionSpecificationException
{
super( "(,2.1-ALPHA-1-SNAPSHOT)" );
// < 2.1 (including snapshots)
super( "(,2.0.99)" );
}
public void testit0114()

View File

@ -15,7 +15,7 @@ public class MavenITmng1493NonStandardModulePomNames
public MavenITmng1493NonStandardModulePomNames()
throws InvalidVersionSpecificationException
{
super( "[2.1-ALPHA-1-SNAPSHOT,)" ); // 2.1+
super( "[2.0.99,)" ); // 2.1+ (including snapshots)
}
public void testitMNG1493 ()

View File

@ -14,7 +14,7 @@ public class MavenITmng3221InfiniteForking
public MavenITmng3221InfiniteForking()
throws InvalidVersionSpecificationException
{
super( "(2.0.8,2.1-ALPHA-1-SNAPSHOT)" ); // only test in 2.0.9+
super( "(2.0.8,2.0.99)" ); // only test in 2.0.9+, not 2.1+ (including snapshots)
}
public void testitMNG3221a()

View File

@ -273,7 +273,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest
dir.mkdirs();
if ( matchesVersionRange( "(2.0.8,2.1-ALPHA-1-SNAPSHOT)" ) )
// < 2.1 (including snapshots)
if ( matchesVersionRange( "(2.0.8,2.0.99)" ) )
{
return new File( dir, "maven-metadata-testing-repo.xml" );
}

View File

@ -14,7 +14,7 @@ public class MavenITmng3485OverrideWagonExtensionTest
public MavenITmng3485OverrideWagonExtensionTest()
throws InvalidVersionSpecificationException
{
super( "(2.0.8,2.1-ALPHA-1-SNAPSHOT)" ); // only test in 2.0.9+
super( "(2.0.8,2.0.99)" ); // only test in 2.0.9+, < 2.1 (including snapshots)
}
public void testitMNG3485 ()

View File

@ -94,7 +94,7 @@ public class MavenITmng3599useHttpProxyForWebDAV
// Doesn't work until 2.0.10+
// TODO: reinstate for 2.1 when WebDAV works
if ( matchesVersionRange( "(2.0.9,2.1-ALPHA-1-SNAPSHOT)" ) )
if ( matchesVersionRange( "(2.0.9,2.0.99)" ) )
{
newSettings = StringUtils.replace( settings, "@protocol@", "dav" );
FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );

View File

@ -36,7 +36,7 @@ public class MavenITmng3652UserAgentHeader
// TODO: fix support for this in 2.1-SNAPSHOT
// 2.0.10+
//super( "(2.0.9,)" );
super( "(2.0.9,2.1-ALPHA-1-SNAPSHOT)" );
super( "(2.0.9,2.0.99)" );
}
public void setUp()