485241: ignore tests that cannot pass when using cgit

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=485241

Change-Id: I628fad67a9acdb7db2fed86456e4ae15be2786d3
Signed-off-by: Jaxsun McCarthy Huggan <jaxsun.mccarthy@tasktop.com>

4 files changed, 61 insertions, 18 deletions

diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritProject.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritProject.java
index 35daa505a..e2d545cfb 100644
--- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritProject.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritProject.java
@@ -37,7 +37,7 @@ import org.junit.Test;
  */
 public class GerritProject {
 
-	private static final String PROP_ALTERNATE_PUSH = "org.eclipse.mylyn.gerrit.tests.alternate.push";
+	public static final String PROP_ALTERNATE_PUSH = "org.eclipse.mylyn.gerrit.tests.alternate.push";
 
 	public static class GerritProjectTest {
 
@@ -73,8 +73,8 @@ public class GerritProject {
 	}
 
 	private CredentialsProvider getCredentialsProvider(PrivilegeLevel privilegeLevel) throws Exception {
-		AuthenticationCredentials credentials = fixture.location(privilegeLevel).getCredentials(
-				AuthenticationType.REPOSITORY);
+		AuthenticationCredentials credentials = fixture.location(privilegeLevel)
+				.getCredentials(AuthenticationType.REPOSITORY);
 		return new UsernamePasswordCredentialsProvider(getGitUsername(credentials), credentials.getPassword());
 	}
 
@@ -90,8 +90,8 @@ public class GerritProject {
 	public Git getGitProject(PrivilegeLevel privilegeLevel) throws Exception {
 		if (git == null) {
 			String url = fixture.getRepositoryUrl() + PROJECT;
-			AuthenticationCredentials credentials = fixture.location(privilegeLevel).getCredentials(
-					AuthenticationType.REPOSITORY);
+			AuthenticationCredentials credentials = fixture.location(privilegeLevel)
+					.getCredentials(AuthenticationType.REPOSITORY);
 			url = url.replace("://", "://" + getGitUsername(credentials) + ":" + credentials.getPassword() + "@"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 			git = Git.cloneRepository().setDirectory(getFolder()).setURI(url).call();
 		}
@@ -201,8 +201,8 @@ public class GerritProject {
 
 	public AuthenticationCredentials registerAuthenticator(PrivilegeLevel privilegeLevel) throws Exception {
 		// register authenticator to avoid HTTP password prompt
-		AuthenticationCredentials credentials = fixture.location(privilegeLevel).getCredentials(
-				AuthenticationType.REPOSITORY);
+		AuthenticationCredentials credentials = fixture.location(privilegeLevel)
+				.getCredentials(AuthenticationType.REPOSITORY);
 		final PasswordAuthentication authentication = new PasswordAuthentication(credentials.getUserName(),
 				credentials.getPassword().toCharArray());
 		Authenticator.setDefault(new Authenticator() {
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 624b4022d..c293117fb 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
@@ -11,11 +11,14 @@
 
 package org.eclipse.mylyn.internal.gerrit.core.remote;
 
-import junit.framework.TestCase;
-
+import org.eclipse.mylyn.gerrit.tests.support.GerritFixture;
+import org.eclipse.mylyn.gerrit.tests.support.GerritProject;
 import org.eclipse.mylyn.reviews.core.model.IReview;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.Version;
+
+import junit.framework.TestCase;
 
 /**
  * @author Miles Parker
@@ -43,4 +46,14 @@ public class GerritRemoteTest extends TestCase {
 	public void tearDown() throws Exception {
 		reviewHarness.dispose();
 	}
+
+	protected boolean canMakeMultipleCommits() {
+		// when using cgit we can't make multiple commits on fixtures other than 2.10
+		return !Boolean.getBoolean(GerritProject.PROP_ALTERNATE_PUSH) || isGerrit210();
+	}
+
+	private boolean isGerrit210() {
+		Version version = GerritFixture.current().getGerritVersion();
+		return version.getMajor() == 2 && version.getMinor() == 10;
+	}
 }
diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritReviewRemoteFactoryTest.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritReviewRemoteFactoryTest.java
index 9ef0c6474..532307d5c 100644
--- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritReviewRemoteFactoryTest.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritReviewRemoteFactoryTest.java
@@ -120,6 +120,9 @@ public class GerritReviewRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testNewChange() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		CommitCommand command2 = reviewHarness.createCommitCommand();
 		reviewHarness.addFile("testFile2.txt");
 		reviewHarness.commitAndPush(command2);
@@ -432,7 +435,8 @@ public class GerritReviewRemoteFactoryTest extends GerritRemoteTest {
 		assertThat(allowed.size(), is(1));
 		PermissionLabel crvwAllowed = allowed.get(0);
 		assertThat(crvwAllowed.matches(CRVW.getCategory()), is(true));
-		assertThat(crvwAllowed.getName(), is(PermissionLabel.toLabelName(toNameWithDash(CRVW.getCategory().getName()))));
+		assertThat(crvwAllowed.getName(),
+				is(PermissionLabel.toLabelName(toNameWithDash(CRVW.getCategory().getName()))));
 		assertThat(crvwAllowed.getMin(), is(-1));
 		assertThat(crvwAllowed.getMax(), is(1));
 	}
@@ -552,7 +556,8 @@ public class GerritReviewRemoteFactoryTest extends GerritRemoteTest {
 		TestRemoteObserver<IRepository, IReview, String, Date> newReviewListener = new TestRemoteObserver<IRepository, IReview, String, Date>(
 				reviewHarness.getProvider().getReviewFactory());
 
-		RemoteEmfConsumer<IRepository, IReview, String, GerritChange, String, Date> newReviewConsumer = reviewHarness.getProvider()
+		RemoteEmfConsumer<IRepository, IReview, String, GerritChange, String, Date> newReviewConsumer = reviewHarness
+				.getProvider()
 				.getReviewFactory()
 				.getConsumerForRemoteKey(reviewHarness.getRepository(), newReviewShortId);
 		newReviewConsumer.addObserver(newReviewListener);
@@ -581,8 +586,8 @@ public class GerritReviewRemoteFactoryTest extends GerritRemoteTest {
 
 		//now approve, publish and submit Review 2 - this should create a comment authored by Gerrit
 		String approvalMessage = "approval, time: " + System.currentTimeMillis();
-		HashSet<Id> approvals = new HashSet<ApprovalCategoryValue.Id>(Collections.singleton(CRVW.getValue((short) 2)
-				.getId()));
+		HashSet<Id> approvals = new HashSet<ApprovalCategoryValue.Id>(
+				Collections.singleton(CRVW.getValue((short) 2).getId()));
 		reviewHarness.getAdminClient().publishComments(newReviewShortId, 1, approvalMessage, approvals,
 				new NullProgressMonitor());
 		reviewHarness.getAdminClient().submit(newReviewShortId, 1, new NullProgressMonitor());
@@ -632,7 +637,8 @@ public class GerritReviewRemoteFactoryTest extends GerritRemoteTest {
 		TestRemoteObserver<IRepository, IReview, String, Date> newReviewListener = new TestRemoteObserver<IRepository, IReview, String, Date>(
 				reviewHarness.getProvider().getReviewFactory());
 
-		RemoteEmfConsumer<IRepository, IReview, String, GerritChange, String, Date> newReviewConsumer = reviewHarness.getProvider()
+		RemoteEmfConsumer<IRepository, IReview, String, GerritChange, String, Date> newReviewConsumer = reviewHarness
+				.getProvider()
 				.getReviewFactory()
 				.getConsumerForRemoteKey(reviewHarness.getRepository(), newReviewShortId);
 		newReviewConsumer.addObserver(newReviewListener);
@@ -723,8 +729,8 @@ public class GerritReviewRemoteFactoryTest extends GerritRemoteTest {
 	@Test
 	public void testNoLabels() throws Exception {
 		//create a commit w/ -2, resulting in no labels
-		HashSet<Id> approvals = new HashSet<ApprovalCategoryValue.Id>(Collections.singleton(CRVW.getValue((short) -2)
-				.getId()));
+		HashSet<Id> approvals = new HashSet<ApprovalCategoryValue.Id>(
+				Collections.singleton(CRVW.getValue((short) -2).getId()));
 		reviewHarness.getAdminClient().publishComments(reviewHarness.getShortId(), 1, "", approvals,
 				new NullProgressMonitor());
 		reviewHarness.retrieve();
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 470f2cbfb..cae3dfc76 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
@@ -68,6 +68,9 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testPatchSetFiles() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		CommitCommand command2 = reviewHarness.createCommitCommand();
 		reviewHarness.addFile("testFile2.txt");
 		reviewHarness.addFile("testFile3.txt");
@@ -125,11 +128,17 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testFetchBinaryContent() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		fetchBinaryContent("test.png", "testdata/binary/gerrit.png");
 	}
 
 	@Test
 	public void testFetchZippedBinaryContent() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		// test servers are configured so that gif files are zipped (the mimetype is not marked safe)
 		fetchBinaryContent("test.gif", "testdata/binary/gerrit.gif");
 	}
@@ -179,6 +188,9 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testCompareBinaryContent() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		String fileName = "test.png";
 		byte[] fileContent2 = commitFile(fileName, "testdata/binary/gerrit.png");
 		byte[] fileContent3 = commitFile(fileName, "testdata/binary/gerrit2.png");
@@ -221,6 +233,9 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testCompareRenamedImage() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		String fileName = "test.png";
 		String newFileName = "renamed-" + fileName;
 		String path = "testdata/binary/gerrit.png";
@@ -284,6 +299,9 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testPatchSetComments() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		TestRemoteObserverConsumer<IReviewItemSet, List<IFileItem>, String, PatchSetContent, String, Long> patchSetObserver //
 		= setUpAddComments();
 		IReviewItemSet testPatchSet = getReview().getSets().get(1);
@@ -353,6 +371,9 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testBaseComment() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		TestRemoteObserverConsumer<IReviewItemSet, List<IFileItem>, String, PatchSetContent, String, Long> patchSetObserver //
 		= setUpAddComments();
 		IFileItem commentFile = getReview().getSets().get(1).getItems().get(1);
@@ -375,6 +396,9 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 
 	@Test
 	public void testBaseAndPatchSetComments() throws Exception {
+		if (!canMakeMultipleCommits()) {
+			return;
+		}
 		TestRemoteObserverConsumer<IReviewItemSet, List<IFileItem>, String, PatchSetContent, String, Long> patchSetObserver //
 		= setUpAddComments();
 		IFileItem commentFile = getReview().getSets().get(1).getItems().get(1);
@@ -440,8 +464,8 @@ public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
 	@Test
 	public void testLoadPatchSet() throws Exception {
 		// given
-		GerritChange change = reviewHarness.getClient()
-				.getChange(reviewHarness.getShortId(), new NullProgressMonitor());
+		GerritChange change = reviewHarness.getClient().getChange(reviewHarness.getShortId(),
+				new NullProgressMonitor());
 		List<PatchSetDetail> details = change.getPatchSetDetails();
 		assertThat(details, notNullValue());
 		assertThat(details.size(), is(1));