473225: support Gerrit 2.11.2

Change-Id: I65f53fe3cb7947e47ba4586be7e47c010f5e4a98
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=473225

3 files changed, 35 insertions, 24 deletions

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 7172681dc..f1ed1fa13 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,7 +11,7 @@
 
 package org.eclipse.mylyn.gerrit.tests.core.client;
 
-import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.isVersion210OrLater;
+import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.isVersion2112OrLater;
 import static org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion.parseGerritVersion;
 import junit.framework.TestCase;
 
@@ -123,17 +123,28 @@ public class GerritVersionTest extends TestCase {
 	}
 
 	@Test
-	public void testIsVersion210OrLater() throws Exception {
-		assertFalse(isVersion210OrLater(parseGerritVersion("2.9.9")));
-		assertFalse(isVersion210OrLater(parseGerritVersion("2.9.9-q")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10-q")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10.0")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10.0-q")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10.0-rc2")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10.1")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10.1-q")));
-		assertTrue(isVersion210OrLater(parseGerritVersion("2.10.1-rc2")));
+	public void testIsVersion2112OrLater() throws Exception {
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.9.9")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.9.9-q")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10-q")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10.0")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10.0-q")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10.0-rc2")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10.1")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10.1-q")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.10.1-rc2")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.11")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.11.0")));
+		assertFalse(isVersion2112OrLater(parseGerritVersion("2.11-rc2")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.2")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.2-q")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.2")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.2-q")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.2-rc2")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.3")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.3-q")));
+		assertTrue(isVersion2112OrLater(parseGerritVersion("2.11.3-rc2")));
 	}
 
 }
diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteTest.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteTest.java
index 638f7f468..624b4022d 100644
--- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteTest.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteTest.java
@@ -13,8 +13,6 @@ package org.eclipse.mylyn.internal.gerrit.core.remote;
 
 import junit.framework.TestCase;
 
-import org.eclipse.mylyn.internal.gerrit.core.client.GerritException;
-import org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion;
 import org.eclipse.mylyn.reviews.core.model.IReview;
 import org.junit.After;
 import org.junit.Before;
@@ -45,12 +43,4 @@ public class GerritRemoteTest extends TestCase {
 	public void tearDown() throws Exception {
 		reviewHarness.dispose();
 	}
-
-	boolean isVersion29x() throws GerritException {
-		return GerritVersion.isVersion29x(reviewHarness.getClient().getVersion());
-	}
-
-	boolean isVersion210OrLater() throws GerritException {
-		return GerritVersion.isVersion210OrLater(reviewHarness.getClient().getVersion());
-	}
 }
diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/PatchSetRemoteFactoryTest.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/PatchSetRemoteFactoryTest.java
index 0ab9ed203..f9825ee02 100644
--- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/PatchSetRemoteFactoryTest.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/PatchSetRemoteFactoryTest.java
@@ -35,9 +35,11 @@ import org.apache.commons.io.IOUtils;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jgit.api.CommitCommand;
 import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
+import org.eclipse.mylyn.gerrit.tests.support.GerritFixture;
 import org.eclipse.mylyn.internal.gerrit.core.client.GerritChange;
 import org.eclipse.mylyn.internal.gerrit.core.client.GerritClient;
 import org.eclipse.mylyn.internal.gerrit.core.client.GerritException;
+import org.eclipse.mylyn.internal.gerrit.core.client.GerritVersion;
 import org.eclipse.mylyn.internal.gerrit.core.client.PatchSetContent;
 import org.eclipse.mylyn.internal.gerrit.core.client.compat.PatchScriptX;
 import org.eclipse.mylyn.internal.gerrit.core.client.rest.CommentInput;
@@ -196,10 +198,18 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 		// compare deleted image
 		patchScript = loadPatchSetContent(fileName, detail2, detail4);
-		assertThat(patchScript, nullValue());
+		if (GerritVersion.isVersion2112OrLater(GerritFixture.current().getGerritVersion())) {
+			assertPatchContent(patchScript, equalTo(fileContent2), nullValue(byte[].class));
+		} else {
+			assertThat(patchScript, nullValue());
+		}
 
 		patchScript = loadPatchSetContent(fileName, detail3, detail1);
-		assertThat(patchScript, nullValue());
+		if (GerritVersion.isVersion2112OrLater(GerritFixture.current().getGerritVersion())) {
+			assertPatchContent(patchScript, equalTo(fileContent3), nullValue(byte[].class));
+		} else {
+			assertThat(patchScript, nullValue());
+		}
 
 		// compare added image
 		patchScript = loadPatchSetContent(fileName, detail1, detail2);