提交 cc796a9f 编写于 作者: K Kohsuke Kawaguchi

fixed a bug in handling version number comparison between "1.*" and "1"

上级 afc0c223
...@@ -85,6 +85,8 @@ public class VersionNumber implements Comparable<VersionNumber> { ...@@ -85,6 +85,8 @@ public class VersionNumber implements Comparable<VersionNumber> {
private static class WildCardItem implements Item { private static class WildCardItem implements Item {
public int compareTo(Item item) { public int compareTo(Item item) {
if (item==null) // 1.* ( > 1.99) > 1
return 1;
switch (item.getType()) { switch (item.getType()) {
case INTEGER_ITEM: case INTEGER_ITEM:
case LIST_ITEM: case LIST_ITEM:
......
...@@ -31,6 +31,7 @@ import junit.framework.TestCase; ...@@ -31,6 +31,7 @@ import junit.framework.TestCase;
public class VersionNumberTest extends TestCase { public class VersionNumberTest extends TestCase {
public void testIsNewerThan() { public void testIsNewerThan() {
assertTrue(new VersionNumber("2.0.*").isNewerThan(new VersionNumber("2.0")));
assertTrue(new VersionNumber("2.0.*").isNewerThan(new VersionNumber("2.0.1"))); assertTrue(new VersionNumber("2.0.*").isNewerThan(new VersionNumber("2.0.1")));
assertTrue(new VersionNumber("2.0.1").isNewerThan(new VersionNumber("2.0.1-SNAPSHOT"))); assertTrue(new VersionNumber("2.0.1").isNewerThan(new VersionNumber("2.0.1-SNAPSHOT")));
assertTrue(new VersionNumber("2.0.1-SNAPSHOT").isNewerThan(new VersionNumber("2.0.0.99"))); assertTrue(new VersionNumber("2.0.1-SNAPSHOT").isNewerThan(new VersionNumber("2.0.0.99")));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册