JENKINS-33361

jenkinsci · Mar 7, 2016 · 965df68 · 965df68
1 parent 87942e8
commit 965df68
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java b/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java
@@ -19,6 +19,7 @@
 import hudson.util.ListBoxModel;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -506,9 +507,9 @@ public int compare(String a, String b) {
 
 				if (stringContainsInteger(aToken)
 						&& stringContainsInteger(bToken)) {
-					int aInt = Integer.parseInt(aToken);
-					int bInt = Integer.parseInt(bToken);
-					difference = aInt - bInt;
+					BigInteger aInt = new BigInteger(aToken);
+					BigInteger bInt = new BigInteger(bToken);
+					difference = aInt.compareTo(bInt);
 				} else {
 					difference = aToken.compareTo(bToken);
 				}
@@ -520,7 +521,7 @@ && stringContainsInteger(bToken)) {
 				bIndex += bToken.length();
 			}
 
-			return new Integer(a.length()).compareTo(new Integer(b.length()));
+			return Integer.valueOf(a.length()).compareTo(Integer.valueOf(b.length()));
 		}
 
 	}

diff --git a/src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java b/src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java
@@ -120,6 +120,14 @@ public void testSmartNumberStringComparerWorksWithSameNumberComponents() {
     	assertTrue(comparer.compare("v_1.1.1.1", "v_2.0.0.0") < 0);
     	assertTrue(comparer.compare("v_1.1.1.1", "v_1.1.1.0") > 0);
     }
+
+    @Test
+    public void testSmartNumberStringComparerVeryLongReleaseNumber() {
+        Comparator<String> comparer = new GitParameterDefinition.SmartNumberStringComparer();
+        assertTrue(comparer.compare("v_1.1.20150122112449123456789.1", "v_1.1.20150122112449123456788.1") > 0);
+        assertTrue(comparer.compare("v_1.1.20150122112449123456789.1", "v_1.1.20150122112449123456789.1") == 0);
+        assertTrue(comparer.compare("v_1.1.20150122112449123456789.1", "v_1.1.20150122112449223456789.1") < 0);
+    }
 
     @Test
     public void testSmartNumberStringComparerWorksWithDifferentNumberComponents() {