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

PR: MNG-505 

test multiple ranges on each side

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219808 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-07-19 23:27:41 +00:00
parent 11082da5f4
commit 407c29c3e0
2 changed files with 174 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
View File

@ -219,7 +219,7 @@ else if ( r2.isEmpty() )
private List intersection( List r1, List r2 ) private List intersection( List r1, List r2 )
{ {
List restrictions = new ArrayList( Math.min( r1.size(), r2.size() ) ); List restrictions = new ArrayList( r1.size() + r2.size() );
Iterator i1 = r1.iterator(); Iterator i1 = r1.iterator();
Iterator i2 = r2.iterator(); Iterator i2 = r2.iterator();
Restriction res1 = (Restriction) i1.next(); Restriction res1 = (Restriction) i1.next();

174
maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
View File

@ -411,7 +411,179 @@ public void testIntersections()
restrictions = mergedRange.getRestrictions(); restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() ); assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
// TODO: multiple on one side, multiple on both sides, boundaries range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.4]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.4", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2),(1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2),(1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "(,1.1),(1.4,)" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
range1 = VersionRange.createFromVersionSpec( "(,1.1],[1.4,)" );
range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.6,]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.5,]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 2 );
assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.5", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.7]" );
range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.5,1.6]" );
mergedRange = range1.restrict( range2 );
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
restriction = (Restriction) restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
restriction = (Restriction) restrictions.get( 2 );
assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.6", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
} }
private void checkInvalidRange( String version ) private void checkInvalidRange( String version )