Extend GerritVersion with 2.9

Add 2.9 to the recognized versions of Gerrit including tests.

Bug: 437825
Signed-off-by: Sascha Vogt <sascha@vogt-neuenbuerg.de>
Change-Id: I4de9c19fbd9b915a14933b1ada09e36159c42629

3 files changed, 30 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
index b21fe5460..75922b9e9 100644
--- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
@@ -773,6 +773,11 @@ public class GerritClient extends ReviewsClient {
 		return GerritVersion.isVersion28OrLater(version);
 	}
 
+	private boolean isVersion29OrLater(IProgressMonitor monitor) throws GerritException {
+		Version version = getCachedVersion(monitor);
+		return GerritVersion.isVersion29OrLater(version);
+	}
+
 	/**
 	 * Returns watched changes of the currently logged in user
 	 */
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java
index 1553b9764..b90d2480a 100644
--- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritVersion.java
@@ -31,6 +31,8 @@ public class GerritVersion extends Version {
 
 	private static final Version VERSION_2_8_0 = new Version(2, 8, 0);
 
+	private static final Version VERSION_2_9_0 = new Version(2, 9, 0);
+
 	// e.g. 2.6 or 2.6.0
 	private static final Pattern MAJOR_MINOR_MICRO_VERSION_PATTERN = Pattern.compile("V?\\d+\\.\\d+(\\.\\d+)?"); //$NON-NLS-1$
 
@@ -64,10 +66,6 @@ public class GerritVersion extends Version {
 		throw new IllegalArgumentException("Unrecognized version pattern : " + version); //$NON-NLS-1$
 	}
 
-	public static boolean isVersion28OrLater(Version version) {
-		return version.compareTo(VERSION_2_8_0) >= 0;
-	}
-
 	public static boolean isVersion26OrLater(Version version) {
 		return version.compareTo(VERSION_2_6_0) >= 0;
 	}
@@ -76,6 +74,14 @@ public class GerritVersion extends Version {
 		return version.compareTo(VERSION_2_7_0) >= 0;
 	}
 
+	public static boolean isVersion28OrLater(Version version) {
+		return version.compareTo(VERSION_2_8_0) >= 0;
+	}
+
+	public static boolean isVersion29OrLater(Version version) {
+		return version.compareTo(VERSION_2_9_0) >= 0;
+	}
+
 	public static boolean isVersion24x(Version version) {
 		return version.compareTo(VERSION_2_4_0) >= 0 && version.compareTo(VERSION_2_5_0) < 0;
 	}
diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritVersionTest.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritVersionTest.java
index 355a04678..9da63a490 100644
--- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritVersionTest.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritVersionTest.java
@@ -11,9 +11,7 @@
 
 package org.eclipse.mylyn.gerrit.tests.core.client;
 
-import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.isVersion24x;
-import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.isVersion26OrLater;
-import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.parseGerritVersion;
+import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.*;
 import junit.framework.TestCase;
 
 import org.junit.Test;
@@ -127,6 +125,20 @@ public class GerritVersionTest extends TestCase {
 	}
 
 	@Test
+	public void testIsVersion29OrLater() throws Exception {
+		assertFalse(isVersion29OrLater(parseGerritVersion("2.8.9")));
+		assertFalse(isVersion29OrLater(parseGerritVersion("2.8.9-q")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9-q")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9.0")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9.0-q")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9.0-rc2")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9.1")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9.1-q")));
+		assertTrue(isVersion29OrLater(parseGerritVersion("2.9.1-rc2")));
+	}
+
+	@Test
 	public void testIsVersion24x() throws Exception {
 		assertFalse(isVersion24x(parseGerritVersion("2.3.9")));
 		assertFalse(isVersion24x(parseGerritVersion("2.3.9-q")));