You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/18 20:39:35 UTC
svn commit: r326201 - in /maven/components/trunk/maven-artifact/src:
main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Author: brett
Date: Tue Oct 18 11:39:34 2005
New Revision: 326201
URL: http://svn.apache.org/viewcvs?rev=326201&view=rev
Log:
version comparison fixes
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=326201&r1=326200&r2=326201&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java Tue Oct 18 11:39:34 2005
@@ -99,17 +99,18 @@
private int compareIntegers( Integer i1, Integer i2 )
{
+ // treat null as 0 in comparison
if ( i1 == null ? i2 == null : i1.equals( i2 ) )
{
return 0;
}
else if ( i1 == null )
{
- return -1;
+ return -i2.intValue();
}
else if ( i2 == null )
{
- return 1;
+ return i1.intValue();
}
else
{
Modified: maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=326201&r1=326200&r2=326201&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (original)
+++ maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Tue Oct 18 11:39:34 2005
@@ -126,6 +126,14 @@
assertEquals( "check incremental version", 0, version.getIncrementalVersion() );
assertEquals( "check build number", 0, version.getBuildNumber() );
assertEquals( "check qualifier", "PATCH-1193602", version.getQualifier() );
+
+ version = new DefaultArtifactVersion( "2.0-1" );
+ assertEquals( "check major version", 2, version.getMajorVersion() );
+ assertEquals( "check minor version", 0, version.getMinorVersion() );
+ assertEquals( "check incremental version", 0, version.getIncrementalVersion() );
+ assertEquals( "check build number", 1, version.getBuildNumber() );
+ assertEquals( "check qualifier", null, version.getQualifier() );
+ assertEquals( "check string value", "2.0-1", version.toString() );
}
public void testVersionComparing()
@@ -146,10 +154,10 @@
assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) > 0 );
version = new DefaultArtifactVersion( "1.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) > 0 );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) == 0 );
version = new DefaultArtifactVersion( "1.0.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) > 0 );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) == 0 );
version = new DefaultArtifactVersion( "1.0" );
assertTrue( version.compareTo( new DefaultArtifactVersion( "1.1" ) ) < 0 );
@@ -210,5 +218,17 @@
version = new DefaultArtifactVersion( "1.0-2" );
assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0-1" ) ) > 0 );
+
+ version = new DefaultArtifactVersion( "2.0-0" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "2.0" ) ) == 0 );
+
+ version = new DefaultArtifactVersion( "2.0-1" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "2.0" ) ) > 0 );
+
+ version = new DefaultArtifactVersion( "2.0-1" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "2.0.0" ) ) > 0 );
+
+ version = new DefaultArtifactVersion( "2.0-1" );
+ assertTrue( version.compareTo( new DefaultArtifactVersion( "2.0.1" ) ) < 0 );
}
}