Author: hboutemy
Date: Wed Apr 23 13:03:50 2008
New Revision: 651032
URL: http://svn.apache.org/viewvc?rev=651032&view=rev
Log:
Cleanup unit tests to make them more readable; add more tests for snapshots;
failures are commented out (see table at
http://docs.codehaus.org/display/MAVEN/Versioning) (merged from trunk r559053)
Modified:
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/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=651032&r1=651031&r2=651032&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
Wed Apr 23 13:03:50 2008
@@ -148,104 +148,93 @@
public void testVersionComparing()
{
- DefaultArtifactVersion version = new DefaultArtifactVersion( "1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "2" ) ) < 0
);
-
- version = new DefaultArtifactVersion( "1.5" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "2" ) ) < 0
);
-
- version = new DefaultArtifactVersion( "1" );
- assertEquals( 0, version.compareTo( new DefaultArtifactVersion( "1" )
) );
-
- version = new DefaultArtifactVersion( "2" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) > 0
);
-
- version = new DefaultArtifactVersion( "2.5" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) > 0
);
-
- version = new DefaultArtifactVersion( "1.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) ==
0 );
-
- version = new DefaultArtifactVersion( "1.0.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1" ) ) ==
0 );
-
- version = new DefaultArtifactVersion( "1.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.1" ) ) <
0 );
-
- version = new DefaultArtifactVersion( "1.2" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.1" ) ) >
0 );
-
- version = new DefaultArtifactVersion( "1.0.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.1" ) ) <
0 );
-
- version = new DefaultArtifactVersion( "1.2.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.1" ) ) >
0 );
-
- version = new DefaultArtifactVersion( "1.0-alpha-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0" ) ) <
0 );
-
- version = new DefaultArtifactVersion( "1.0-alpha-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-2" ) ) < 0 );
-
- version = new DefaultArtifactVersion( "1.0-alpha-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-beta-1" ) ) < 0 );
-
- version = new DefaultArtifactVersion( "1.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1" ) ) > 0 );
-
- version = new DefaultArtifactVersion( "1.0-alpha-2" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1" ) ) > 0 );
-
- version = new DefaultArtifactVersion( "1.0-beta-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1" ) ) > 0 );
-
- version = new DefaultArtifactVersion( "1.0-beta-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-SNAPSHOT" ) ) > 0 );
-
- version = new DefaultArtifactVersion( "1.0-SNAPSHOT" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-beta-1" ) ) < 0 );
-
- version = new DefaultArtifactVersion( "1.0-SNAPSHOT" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0" ) ) <
0 );
-
- version = new DefaultArtifactVersion( "1.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-SNAPSHOT" ) ) > 0 );
-
- version = new DefaultArtifactVersion( "1.0-alpha-1-SNAPSHOT" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1" ) ) < 0 );
-
- version = new DefaultArtifactVersion( "1.0-alpha-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.0-alpha-1-SNAPSHOT" ) ) > 0 );
-
- version = new DefaultArtifactVersion( "1.0" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0-1" ) )
< 0 );
-
- version = new DefaultArtifactVersion( "1.0-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0-2" ) )
< 0 );
-
- version = new DefaultArtifactVersion( "1.0-1" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.0" ) ) >
0 );
-
- 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 );
-
- version = new DefaultArtifactVersion( "1.10" );
- assertTrue( version.compareTo( new DefaultArtifactVersion( "1.2" ) ) >
0 );
-
- // version = new DefaultArtifactVersion( "1.1-foo-10" );
- // assertTrue( version.compareTo( new DefaultArtifactVersion(
"1.1-foo-2" ) ) > 0 );
+ assertVersionEqual( "1", "1" );
+ assertVersionOlder( "1", "2" );
+ assertVersionOlder( "1.5", "2" );
+ assertVersionOlder( "1", "2.5" );
+ assertVersionEqual( "1", "1.0" );
+ assertVersionEqual( "1", "1.0.0" );
+ assertVersionOlder( "1.0", "1.1" );
+ assertVersionOlder( "1.1", "1.2" );
+ assertVersionOlder( "1.0.0", "1.1" );
+ assertVersionOlder( "1.1", "1.2.0" );
+ assertVersionOlder( "1.2", "1.10" );
+
+ assertVersionOlder( "1.0-alpha-1", "1.0" );
+ assertVersionOlder( "1.0-alpha-1", "1.0-alpha-2" );
+ assertVersionOlder( "1.0-alpha-1", "1.0-beta-1" );
+
+ assertVersionOlder( "1.0-SNAPSHOT", "1.0-beta-1" );
+ assertVersionOlder( "1.0-SNAPSHOT", "1.0" );
+ assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-1" );
+
+ assertVersionOlder( "1.0", "1.0-1" );
+ assertVersionOlder( "1.0-1", "1.0-2" );
+ assertVersionEqual( "2.0-0", "2.0" );
+ assertVersionOlder( "2.0", "2.0-1" );
+ assertVersionOlder( "2.0.0", "2.0-1" );
+ assertVersionOlder( "2.0-1", "2.0.1" );
+
+ assertVersionOlder( "2.0.1-klm", "2.0.1-lmn" );
+ assertVersionOlder( "2.0.1-xyz", "2.0.1" );
+
+ assertVersionOlder( "2.0.1", "2.0.1-123" );
+ assertVersionOlder( "2.0.1-xyz", "2.0.1-123" );
+ //assertVersionOlder( "1.1-foo-2", "1.1-foo-10" );
+ }
+
+ public void testVersionSnapshotComparing()
+ {
+ assertVersionEqual( "1-SNAPSHOT", "1-SNAPSHOT" );
+ assertVersionOlder( "1-SNAPSHOT", "2-SNAPSHOT" );
+ assertVersionOlder( "1.5-SNAPSHOT", "2-SNAPSHOT" );
+ assertVersionOlder( "1-SNAPSHOT", "2.5-SNAPSHOT" );
+ assertVersionEqual( "1-SNAPSHOT", "1.0-SNAPSHOT" );
+ assertVersionEqual( "1-SNAPSHOT", "1.0.0-SNAPSHOT" );
+ assertVersionOlder( "1.0-SNAPSHOT", "1.1-SNAPSHOT" );
+ assertVersionOlder( "1.1-SNAPSHOT", "1.2-SNAPSHOT" );
+ assertVersionOlder( "1.0.0-SNAPSHOT", "1.1-SNAPSHOT" );
+ assertVersionOlder( "1.1-SNAPSHOT", "1.2.0-SNAPSHOT" );
+
+ //assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-SNAPSHOT" );
+ assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-2-SNAPSHOT" );
+ assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-beta-1-SNAPSHOT" );
+
+ assertVersionOlder( "1.0-SNAPSHOT-SNAPSHOT", "1.0-beta-1-SNAPSHOT" );
+ assertVersionOlder( "1.0-SNAPSHOT-SNAPSHOT", "1.0-SNAPSHOT" );
+ assertVersionOlder( "1.0-alpha-1-SNAPSHOT-SNAPSHOT",
"1.0-alpha-1-SNAPSHOT" );
+
+ //assertVersionOlder( "1.0-SNAPSHOT", "1.0-1-SNAPSHOT" );
+ //assertVersionOlder( "1.0-1-SNAPSHOT", "1.0-2-SNAPSHOT" );
+ //assertVersionEqual( "2.0-0-SNAPSHOT", "2.0-SNAPSHOT" );
+ //assertVersionOlder( "2.0-SNAPSHOT", "2.0-1-SNAPSHOT" );
+ //assertVersionOlder( "2.0.0-SNAPSHOT", "2.0-1-SNAPSHOT" );
+ assertVersionOlder( "2.0-1-SNAPSHOT", "2.0.1-SNAPSHOT" );
+
+ assertVersionOlder( "2.0.1-klm-SNAPSHOT", "2.0.1-lmn-SNAPSHOT" );
+ // assertVersionOlder( "2.0.1-xyz-SNAPSHOT", "2.0.1-SNAPSHOT" );
+ //assertVersionOlder( "2.0.1-SNAPSHOT", "2.0.1-123-SNAPSHOT" );
+ //assertVersionOlder( "2.0.1-xyz-SNAPSHOT", "2.0.1-123-SNAPSHOT" );
+ }
+
+
+ public void testSnapshotVsReleases()
+ {
+ assertVersionOlder( "1.0-RC1", "1.0-SNAPSHOT" );
+ //assertVersionOlder( "1.0-rc1", "1.0-SNAPSHOT" );
+ //assertVersionOlder( "1.0-rc-1", "1.0-SNAPSHOT" );
+ }
+
+ private void assertVersionOlder( String left, String right )
+ {
+ assertTrue( left + " should be older than " + right, new
DefaultArtifactVersion( left ).compareTo( new DefaultArtifactVersion( right ) )
< 0 );
+ assertTrue( right + " should be newer than " + left, new
DefaultArtifactVersion( right ).compareTo( new DefaultArtifactVersion( left ) )
> 0 );
+ }
+
+ private void assertVersionEqual( String left, String right )
+ {
+ assertTrue( left + " should be equal to " + right, new
DefaultArtifactVersion( left ).compareTo( new DefaultArtifactVersion( right ) )
== 0 );
+ assertTrue( right + " should be equal to " + left, new
DefaultArtifactVersion( right ).compareTo( new DefaultArtifactVersion( left ) )
== 0 );
}
public void testVersionComparingWithBuildNumberZero()
