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 2006/02/14 03:34:19 UTC
svn commit: r377583 - in
/maven/components/branches/maven-2.0.x/maven-artifact/src:
main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Author: brett
Date: Mon Feb 13 18:34:18 2006
New Revision: 377583
URL: http://svn.apache.org/viewcvs?rev=377583&view=rev
Log:
fix a bug in version parsing
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=377583&r1=377582&r2=377583&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java Mon Feb 13 18:34:18 2006
@@ -224,6 +224,7 @@
majorVersion = null;
minorVersion = null;
incrementalVersion = null;
+ buildNumber = null;
}
}
}
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=377583&r1=377582&r2=377583&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Mon Feb 13 18:34:18 2006
@@ -132,8 +132,15 @@
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() );
+ assertNull( "check qualifier", version.getQualifier() );
assertEquals( "check string value", "2.0-1", version.toString() );
+
+ version = new DefaultArtifactVersion( "5.0.0alpha-2006020117" );
+ assertEquals( "check major version", 0, version.getMajorVersion() );
+ assertEquals( "check minor version", 0, version.getMinorVersion() );
+ assertEquals( "check incremental version", 0, version.getIncrementalVersion() );
+ assertEquals( "check build number", 0, version.getBuildNumber() );
+ assertEquals( "check qualifier", "5.0.0alpha-2006020117", version.getQualifier() );
}
public void testVersionComparing()
@@ -145,7 +152,7 @@
assertTrue( version.compareTo( new DefaultArtifactVersion( "2" ) ) < 0 );
version = new DefaultArtifactVersion( "1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) == 0 );
+ assertEquals( 0, version.compareTo( new DefaultArtifactVersion( "1" ) ) );
version = new DefaultArtifactVersion( "2" );
assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) > 0 );