You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2014/06/12 03:31:51 UTC
[2/3] git commit: MNG-5645: When a number is not used in a version
correctly, provide a better error. Submitted by: Phil Pratt-Szeliga
MNG-5645: When a number is not used in a version correctly, provide a better error.
Submitted by: Phil Pratt-Szeliga
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/af1ecd5f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af1ecd5f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af1ecd5f
Branch: refs/heads/master
Commit: af1ecd5f000f0c9f1d8138a5d473981ce941b431
Parents: c652993
Author: Jason van Zyl <ja...@tesla.io>
Authored: Wed Jun 11 08:44:42 2014 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Wed Jun 11 08:44:42 2014 -0400
----------------------------------------------------------------------
.../versioning/DefaultArtifactVersion.java | 15 +++--
.../versioning/DefaultArtifactVersionTest.java | 68 ++++++++++++--------
pom.xml | 3 +
3 files changed, 54 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/af1ecd5f/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
index 745afdd..6a6ab74 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.versioning;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
+import java.util.NoSuchElementException;
/**
* Default implementation of artifact versioning.
@@ -204,12 +205,18 @@ public class DefaultArtifactVersion
private static Integer getNextIntegerToken( StringTokenizer tok )
{
- String s = tok.nextToken();
- if ( ( s.length() > 1 ) && s.startsWith( "0" ) )
+ try {
+ String s = tok.nextToken();
+ if ( ( s.length() > 1 ) && s.startsWith( "0" ) )
+ {
+ throw new NumberFormatException( "Number part has a leading 0: '" + s + "'" );
+ }
+ return Integer.valueOf( s );
+ }
+ catch( NoSuchElementException e )
{
- throw new NumberFormatException( "Number part has a leading 0: '" + s + "'" );
+ throw new NumberFormatException( "Number is invalid" );
}
- return Integer.valueOf( s );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/af1ecd5f/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
index 813210b..4989e15 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
@@ -38,9 +38,10 @@ public class DefaultArtifactVersionTest
String qualifier )
{
ArtifactVersion artifactVersion = newArtifactVersion( version );
- String parsed = "'" + version + "' parsed as ('" + artifactVersion.getMajorVersion() + "', '"
- + artifactVersion.getMinorVersion() + "', '" + artifactVersion.getIncrementalVersion() + "', '"
- + artifactVersion.getBuildNumber() + "', '" + artifactVersion.getQualifier() + "'), ";
+ String parsed =
+ "'" + version + "' parsed as ('" + artifactVersion.getMajorVersion() + "', '"
+ + artifactVersion.getMinorVersion() + "', '" + artifactVersion.getIncrementalVersion() + "', '"
+ + artifactVersion.getBuildNumber() + "', '" + artifactVersion.getQualifier() + "'), ";
assertEquals( parsed + "check major version", major, artifactVersion.getMajorVersion() );
assertEquals( parsed + "check minor version", minor, artifactVersion.getMinorVersion() );
assertEquals( parsed + "check incremental version", incremental, artifactVersion.getIncrementalVersion() );
@@ -51,39 +52,39 @@ public class DefaultArtifactVersionTest
public void testVersionParsing()
{
- 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 );
+ 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 );
// 0 at the beginning of a number has a special handling
- checkVersionParsing( "02" , 0, 0, 0, 0, "02" );
- checkVersionParsing( "0.09" , 0, 0, 0, 0, "0.09" );
- checkVersionParsing( "0.2.09" , 0, 0, 0, 0, "0.2.09" );
- checkVersionParsing( "2.0-01" , 2, 0, 0, 0, "01" );
+ checkVersionParsing( "02", 0, 0, 0, 0, "02" );
+ checkVersionParsing( "0.09", 0, 0, 0, 0, "0.09" );
+ checkVersionParsing( "0.2.09", 0, 0, 0, 0, "0.2.09" );
+ checkVersionParsing( "2.0-01", 2, 0, 0, 0, "01" );
// version schemes not really supported: fully transformed as qualifier
- checkVersionParsing( "1.0.1b" , 0, 0, 0, 0, "1.0.1b" );
- checkVersionParsing( "1.0M2" , 0, 0, 0, 0, "1.0M2" );
- checkVersionParsing( "1.0RC2" , 0, 0, 0, 0, "1.0RC2" );
+ checkVersionParsing( "1.0.1b", 0, 0, 0, 0, "1.0.1b" );
+ checkVersionParsing( "1.0M2", 0, 0, 0, 0, "1.0M2" );
+ checkVersionParsing( "1.0RC2", 0, 0, 0, 0, "1.0RC2" );
checkVersionParsing( "1.1.2.beta1", 1, 1, 2, 0, "beta1" );
checkVersionParsing( "1.7.3.beta1", 1, 7, 3, 0, "beta1" );
- checkVersionParsing( "1.7.3.0" , 0, 0, 0, 0, "1.7.3.0" );
- checkVersionParsing( "1.7.3.0-1" , 0, 0, 0, 0, "1.7.3.0-1" );
- checkVersionParsing( "PATCH-1193602" , 0, 0, 0, 0, "PATCH-1193602" );
- checkVersionParsing( "5.0.0alpha-2006020117" , 0, 0, 0, 0, "5.0.0alpha-2006020117" );
+ checkVersionParsing( "1.7.3.0", 0, 0, 0, 0, "1.7.3.0" );
+ checkVersionParsing( "1.7.3.0-1", 0, 0, 0, 0, "1.7.3.0-1" );
+ checkVersionParsing( "PATCH-1193602", 0, 0, 0, 0, "PATCH-1193602" );
+ checkVersionParsing( "5.0.0alpha-2006020117", 0, 0, 0, 0, "5.0.0alpha-2006020117" );
checkVersionParsing( "1.0.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.0.-SNAPSHOT" );
checkVersionParsing( "1..0-SNAPSHOT", 0, 0, 0, 0, "1..0-SNAPSHOT" );
checkVersionParsing( "1.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.-SNAPSHOT" );
checkVersionParsing( ".1.0-SNAPSHOT", 0, 0, 0, 0, ".1.0-SNAPSHOT" );
- checkVersionParsing( "1.2.3.200705301630" , 0, 0, 0, 0, "1.2.3.200705301630" );
- checkVersionParsing( "1.2.3-200705301630" , 1, 2, 3, 0, "200705301630" );
+ checkVersionParsing( "1.2.3.200705301630", 0, 0, 0, 0, "1.2.3.200705301630" );
+ checkVersionParsing( "1.2.3-200705301630", 1, 2, 3, 0, "200705301630" );
}
public void testVersionComparing()
@@ -146,7 +147,7 @@ public class DefaultArtifactVersionTest
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-SNAPSHOT" );
assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-2-SNAPSHOT" );
assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-beta-1-SNAPSHOT" );
@@ -156,7 +157,7 @@ public class DefaultArtifactVersionTest
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" );
+ // 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" );
@@ -192,6 +193,18 @@ public class DefaultArtifactVersionTest
assertFalse( newArtifactVersion( "1" ).equals( "non-an-artifact-version-instance" ) );
}
+ public void testNonNumericVersionRepresentationReturnsANumberFormatException()
+ {
+ try
+ {
+ new DefaultArtifactVersion( "..." );
+ }
+ catch ( Exception e )
+ {
+ assertTrue("We expect a NumberFormatException to be thrown.", e instanceof NumberFormatException);
+ }
+ }
+
private void assertVersionOlder( String left, String right )
{
assertTrue( left + " should be older than " + right,
@@ -207,5 +220,4 @@ public class DefaultArtifactVersionTest
assertTrue( right + " should be equal to " + left,
newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0 );
}
-
}
http://git-wip-us.apache.org/repos/asf/maven/blob/af1ecd5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93d0216..44107b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,9 @@
<contributor>
<name>Sébastian Le Merdy (MNG-5613)</name>
</contributor>
+ <contributor>
+ <name>Phil Pratt-Szeliga (MNG-5645)</name>
+ </contributor>
</contributors>
<prerequisites>