opendev/gerrit
Code Issues Proposed changes

Check approvals and current revisions in submit acceptance tests

Browse Source 
This ensures that new patch sets were created and approvals copied
where necessary.

Change-Id: Ic9378f6abcd189ac90422d686b2e1b8785e5feec
This commit is contained in:
Dave Borowitz
2014-01-08 17:03:31 -08:00
committed by David Ostrovsky
parent 8ab5872d88
commit 4659ec04ee
4 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -16,10 +16,13 @@ package com.google.gerrit.acceptance.rest.change;
import static com.google.gerrit.acceptance.GitUtil.cloneProject;
import static com.google.gerrit.acceptance.GitUtil.initSsh;
import static com.google.gerrit.common.changes.ListChangesOption.CURRENT_REVISION;
import static com.google.gerrit.common.changes.ListChangesOption.DETAILED_LABELS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import com.google.common.base.Joiner;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.GitUtil;
@@ -28,15 +31,20 @@ import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.RestSession;
import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.common.changes.ListChangesOption;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.Project.InheritableBoolean;
import com.google.gerrit.reviewdb.client.Project.SubmitType;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.change.ChangeJson.ChangeInfo;
import com.google.gerrit.server.change.ChangeJson.LabelInfo;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.google.gwtjsonrpc.server.SqlTimestampDeserializer;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
@@ -56,6 +64,7 @@ import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.sql.Timestamp;
public abstract class AbstractSubmit extends AbstractDaemonTest {
@@ -167,7 +176,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
assertEquals(expectedStatus, r.getStatusCode());
if (expectedStatus == HttpStatus.SC_OK) {
ChangeInfo change =
(new Gson()).fromJson(r.getReader(),
newGson().fromJson(r.getReader(),
new TypeToken<ChangeInfo>() {}.getType());
assertEquals(Change.Status.MERGED, change.status);
}
@@ -182,6 +191,21 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
r.consume();
}
protected void assertCurrentRevision(String changeId, int expectedNum,
ObjectId expectedId) throws IOException {
ChangeInfo c = getChange(changeId, CURRENT_REVISION);
assertEquals(expectedId.name(), c.current_revision);
assertEquals(expectedNum, c.revisions.get(expectedId.name())._number);
}
protected void assertApproved(String changeId) throws IOException {
ChangeInfo c = getChange(changeId, DETAILED_LABELS);
LabelInfo cr = c.labels.get("Code-Review");
assertEquals(1, cr.all.size());
assertEquals(2, cr.all.get(0).value.intValue());
assertEquals("Administrator", cr.all.get(0).name);
}
protected void assertCherryPick(Git localGit, boolean contentMerge) throws IOException {
assertRebase(localGit, contentMerge);
RevCommit remoteHead = getRemoteHead();
@@ -201,6 +225,14 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
assertEquals(localHead.getShortMessage(), remoteHead.getShortMessage());
}
protected ChangeInfo getChange(String changeId, ListChangesOption... options)
throws IOException {
String q = options.length > 0 ? "?o=" + Joiner.on("&o=").join(options) : "";
RestResponse r = session.get("/changes/" + changeId + q);
assertEquals(HttpStatus.SC_OK, r.getStatusCode());
return newGson().fromJson(r.getReader(), ChangeInfo.class);
}
private RevCommit getHead(Repository repo) throws IOException {
return getHead(repo, "HEAD");
}
@@ -258,4 +290,10 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
fmt.flush();
return out.toString();
}
private static Gson newGson() {
return new GsonBuilder()
.registerTypeAdapter(Timestamp.class, new SqlTimestampDeserializer())
.create();
}
}

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUCK
View File

@@ -41,6 +41,7 @@ java_library(
deps = [
':util',
'//gerrit-acceptance-tests:lib',
'//lib:gwtjsonrpc',
],
)

18
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
View File

@@ -62,7 +62,11 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
createChange(git, "Change 2", "b.txt", "other content");
submit(change2.getChangeId());
assertCherryPick(git, false);
assertEquals(oldHead, getRemoteHead().getParent(0));
RevCommit newHead = getRemoteHead();
assertEquals(1, newHead.getParentCount());
assertEquals(oldHead, newHead.getParent(0));
assertApproved(change2.getChangeId());
assertCurrentRevision(change2.getChangeId(), 2, newHead);
}
@Test
@@ -83,7 +87,10 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
createChange(git, "Change 3", "a.txt", "bbb\nccc\n");
submit(change3.getChangeId());
assertCherryPick(git, true);
assertEquals(oldHead, getRemoteHead().getParent(0));
RevCommit newHead = getRemoteHead();
assertEquals(oldHead, newHead.getParent(0));
assertApproved(change3.getChangeId());
assertCurrentRevision(change3.getChangeId(), 2, newHead);
}
@Test
@@ -102,6 +109,7 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
createChange(git, "Change 2", "a.txt", "other content");
submitWithConflict(change2.getChangeId());
assertEquals(oldHead, getRemoteHead());
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommitId());
}
@Test
@@ -120,7 +128,10 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
createChange(git, "Change 3", "c.txt", "different content");
submit(change3.getChangeId());
assertCherryPick(git, false);
assertEquals(oldHead, getRemoteHead().getParent(0));
RevCommit newHead = getRemoteHead();
assertEquals(oldHead, newHead.getParent(0));
assertApproved(change3.getChangeId());
assertCurrentRevision(change3.getChangeId(), 2, newHead);
}
@Test
@@ -139,5 +150,6 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
createChange(git, "Change 3", "b.txt", "different content");
submitWithConflict(change3.getChangeId());
assertEquals(oldHead, getRemoteHead());
assertCurrentRevision(change3.getChangeId(), 1, change3.getCommitId());
}
}

13
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseIfNecessaryIT.java
View File

@@ -46,6 +46,8 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
RevCommit head = getRemoteHead();
assertEquals(change.getCommitId(), head.getId());
assertEquals(oldHead, head.getParent(0));
assertApproved(change.getChangeId());
assertCurrentRevision(change.getChangeId(), 1, head);
}
@Test
@@ -63,7 +65,10 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
createChange(git, "Change 2", "b.txt", "other content");
submit(change2.getChangeId());
assertRebase(git, false);
assertEquals(oldHead, getRemoteHead().getParent(0));
RevCommit head = getRemoteHead();
assertEquals(oldHead, head.getParent(0));
assertApproved(change2.getChangeId());
assertCurrentRevision(change2.getChangeId(), 2, head);
}
@Test
@@ -84,7 +89,10 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
createChange(git, "Change 3", "a.txt", "bbb\nccc\n");
submit(change3.getChangeId());
assertRebase(git, true);
assertEquals(oldHead, getRemoteHead().getParent(0));
RevCommit head = getRemoteHead();
assertEquals(oldHead, head.getParent(0));
assertApproved(change3.getChangeId());
assertCurrentRevision(change3.getChangeId(), 2, head);
}
@Test
@@ -104,5 +112,6 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
submitWithConflict(change2.getChangeId());
RevCommit head = getRemoteHead();
assertEquals(oldHead, head);
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommitId());
}
}