Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 99936 invoked from network); 23 Apr 2008 18:53:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2008 18:53:50 -0000 Received: (qmail 20791 invoked by uid 500); 23 Apr 2008 18:53:51 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 20567 invoked by uid 500); 23 Apr 2008 18:53:50 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 20426 invoked by uid 99); 23 Apr 2008 18:53:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 11:53:49 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 18:53:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D3561A9832; Wed, 23 Apr 2008 11:53:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r651003 - /maven/artifact/trunk/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Date: Wed, 23 Apr 2008 18:53:23 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080423185324.1D3561A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Wed Apr 23 11:53:11 2008 New Revision: 651003 URL: http://svn.apache.org/viewvc?rev=651003&view=rev Log: refactored unit tests for better maintenance Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=651003&r1=651002&r2=651003&view=diff ============================================================================== --- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (original) +++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Wed Apr 23 11:53:11 2008 @@ -30,120 +30,44 @@ public class DefaultArtifactVersionTest extends TestCase { + private ArtifactVersion newArtifactVersion( String version ) + { + return new DefaultArtifactVersion( version ); + } + + private void checkVersionParsing( String version, int major, int minor, int incremental, int buildnumber, + String qualifier ) + { + ArtifactVersion artifactVersion = newArtifactVersion( version ); + assertEquals( "check " + version + " major version", major, artifactVersion.getMajorVersion() ); + assertEquals( "check " + version + " minor version", minor, artifactVersion.getMinorVersion() ); + assertEquals( "check " + version + " incremental version", incremental, + artifactVersion.getIncrementalVersion() ); + assertEquals( "check " + version + " build number", buildnumber, artifactVersion.getBuildNumber() ); + assertEquals( "check " + version + " qualifier", qualifier, artifactVersion.getQualifier() ); + assertEquals( "check " + version + " string value", version, artifactVersion.toString() ); + } + public void testVersionParsing() { - DefaultArtifactVersion version = new DefaultArtifactVersion( "1" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 0, version.getMinorVersion() ); - assertEquals( "check incremental version", 0, version.getIncrementalVersion() ); - assertEquals( "check build number", 0, version.getBuildNumber() ); - assertNull( "check qualifier", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.2" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 2, version.getMinorVersion() ); - assertEquals( "check incremental version", 0, version.getIncrementalVersion() ); - assertEquals( "check build number", 0, version.getBuildNumber() ); - assertNull( "check qualifier", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.2.3" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 2, version.getMinorVersion() ); - assertEquals( "check incremental version", 3, version.getIncrementalVersion() ); - assertEquals( "check build number", 0, version.getBuildNumber() ); - assertNull( "check qualifier", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.2.3-1" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 2, version.getMinorVersion() ); - assertEquals( "check incremental version", 3, version.getIncrementalVersion() ); - assertEquals( "check build number", 1, version.getBuildNumber() ); - assertNull( "check qualifier", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.2.3-alpha-1" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 2, version.getMinorVersion() ); - assertEquals( "check incremental version", 3, version.getIncrementalVersion() ); - assertEquals( "check build number", 0, version.getBuildNumber() ); - assertEquals( "check qualifier", "alpha-1", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.2-alpha-1" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 2, version.getMinorVersion() ); - assertEquals( "check incremental version", 0, version.getIncrementalVersion() ); - assertEquals( "check build number", 0, version.getBuildNumber() ); - assertEquals( "check qualifier", "alpha-1", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.2-alpha-1-20050205.060708-1" ); - assertEquals( "check major version", 1, version.getMajorVersion() ); - assertEquals( "check minor version", 2, version.getMinorVersion() ); - assertEquals( "check incremental version", 0, version.getIncrementalVersion() ); - assertEquals( "check build number", 0, version.getBuildNumber() ); - assertEquals( "check qualifier", "alpha-1-20050205.060708-1", version.getQualifier() ); - - version = new DefaultArtifactVersion( "RELEASE" ); - 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", "RELEASE", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.0.1b" ); - 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", "1.0.1b", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.0RC2" ); - 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", "1.0RC2", version.getQualifier() ); - - version = new DefaultArtifactVersion( "1.7.3.0" ); - 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", "1.7.3.0", version.getQualifier() ); - - version = new DefaultArtifactVersion( "0.09" ); - 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", "0.09", version.getQualifier() ); - - version = new DefaultArtifactVersion( "02" ); - 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", "02", version.getQualifier() ); - - version = new DefaultArtifactVersion( "PATCH-1193602" ); - 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", "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() ); - 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() ); + checkVersionParsing( "1" , 1, 0, 0, 0, null ); + checkVersionParsing( "1.2" , 1, 2, 0, 0, null ); + checkVersionParsing( "1.2.3" , 1, 2, 3, 0, null ); + checkVersionParsing( "1.2.3-1" , 1, 2, 3, 1, null ); + checkVersionParsing( "1.2.3-alpha-1" , 1, 2, 3, 0, "alpha-1" ); + checkVersionParsing( "1.2-alpha-1" , 1, 2, 0, 0, "alpha-1" ); + checkVersionParsing( "1.2-alpha-1-20050205.060708-1" , 1, 2, 0, 0, "alpha-1-20050205.060708-1" ); + checkVersionParsing( "RELEASE" , 0, 0, 0, 0, "RELEASE" ); + checkVersionParsing( "2.0-1" , 2, 0, 0, 1, null ); + + // version schemes not really supported: fully transformed as qualifier + checkVersionParsing( "1.0.1b" , 0, 0, 0, 0, "1.0.1b" ); + checkVersionParsing( "1.0RC2" , 0, 0, 0, 0, "1.0RC2" ); + checkVersionParsing( "1.7.3.0" , 0, 0, 0, 0, "1.7.3.0" ); + checkVersionParsing( "0.09" , 0, 0, 0, 0, "0.09" ); + checkVersionParsing( "02" , 0, 0, 0, 0, "02" ); + checkVersionParsing( "PATCH-1193602" , 0, 0, 0, 0, "PATCH-1193602" ); + checkVersionParsing( "5.0.0alpha-2006020117" , 0, 0, 0, 0, "5.0.0alpha-2006020117" ); } public void testVersionComparing() @@ -161,6 +85,7 @@ assertVersionOlder( "1.0-alpha-1", "1.0" ); assertVersionOlder( "1.0-alpha-1", "1.0-alpha-2" ); + //assertVersionOlder( "1.0-alpha-2", "1.0-alpha-15" ); assertVersionOlder( "1.0-alpha-1", "1.0-beta-1" ); assertVersionOlder( "1.0-SNAPSHOT", "1.0-beta-1" ); @@ -225,13 +150,17 @@ 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 ); + assertTrue( left + " should be older than " + right, + newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) < 0 ); + assertTrue( right + " should be newer than " + left, + newArtifactVersion( right ).compareTo( newArtifactVersion( 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 ); + assertTrue( left + " should be equal to " + right, + newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) == 0 ); + assertTrue( right + " should be equal to " + left, + newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0 ); } }