| // Copyright (C) 2013 The Android Open Source Project |
| // |
| // Licensed under the Apache License, Version 2.0 (the "License"); |
| // you may not use this file except in compliance with the License. |
| // You may obtain a copy of the License at |
| // |
| // http://www.apache.org/licenses/LICENSE-2.0 |
| // |
| // Unless required by applicable law or agreed to in writing, software |
| // distributed under the License is distributed on an "AS IS" BASIS, |
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| // See the License for the specific language governing permissions and |
| // limitations under the License. |
| |
| package com.google.gerrit.acceptance.rest.change; |
| |
| import static com.google.common.collect.Iterables.getOnlyElement; |
| import static com.google.common.truth.Truth.assertThat; |
| import static com.google.common.truth.Truth.assert_; |
| import static com.google.common.truth.TruthJUnit.assume; |
| import static com.google.gerrit.acceptance.GitUtil.cloneProject; |
| import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION; |
| import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS; |
| |
| import com.google.common.collect.Lists; |
| import com.google.common.collect.Maps; |
| import com.google.gerrit.acceptance.AbstractDaemonTest; |
| import com.google.gerrit.acceptance.GitUtil; |
| import com.google.gerrit.acceptance.PushOneCommit; |
| import com.google.gerrit.acceptance.RestResponse; |
| import com.google.gerrit.acceptance.SshSession; |
| import com.google.gerrit.common.EventListener; |
| import com.google.gerrit.common.EventSource; |
| import com.google.gerrit.extensions.api.changes.ReviewInput; |
| import com.google.gerrit.extensions.api.changes.SubmitInput; |
| import com.google.gerrit.extensions.client.ChangeStatus; |
| import com.google.gerrit.extensions.client.InheritableBoolean; |
| import com.google.gerrit.extensions.client.SubmitType; |
| import com.google.gerrit.extensions.common.ChangeInfo; |
| import com.google.gerrit.extensions.common.LabelInfo; |
| import com.google.gerrit.reviewdb.client.Account; |
| import com.google.gerrit.reviewdb.client.Change; |
| import com.google.gerrit.reviewdb.client.LabelId; |
| import com.google.gerrit.reviewdb.client.PatchSet; |
| import com.google.gerrit.reviewdb.client.PatchSetApproval; |
| import com.google.gerrit.reviewdb.client.Project; |
| import com.google.gerrit.server.ApprovalsUtil; |
| import com.google.gerrit.server.CurrentUser; |
| import com.google.gerrit.server.IdentifiedUser; |
| import com.google.gerrit.server.events.ChangeMergedEvent; |
| import com.google.gerrit.server.events.Event; |
| import com.google.gerrit.server.notedb.ChangeNotes; |
| import com.google.gerrit.server.project.ListBranches.BranchInfo; |
| import com.google.gerrit.server.project.PutConfig; |
| import com.google.gson.reflect.TypeToken; |
| import com.google.gwtorm.server.OrmException; |
| import com.google.inject.Inject; |
| |
| import com.jcraft.jsch.JSchException; |
| |
| import org.apache.http.HttpStatus; |
| import org.eclipse.jgit.api.Git; |
| import org.eclipse.jgit.api.errors.GitAPIException; |
| import org.eclipse.jgit.diff.DiffFormatter; |
| import org.eclipse.jgit.lib.ObjectId; |
| import org.eclipse.jgit.lib.Ref; |
| import org.eclipse.jgit.lib.Repository; |
| import org.eclipse.jgit.revwalk.RevCommit; |
| import org.eclipse.jgit.revwalk.RevWalk; |
| import org.junit.After; |
| import org.junit.Before; |
| import org.junit.Test; |
| |
| import java.io.ByteArrayOutputStream; |
| import java.io.IOException; |
| import java.sql.Timestamp; |
| import java.util.Collections; |
| import java.util.List; |
| import java.util.Map; |
| |
| public abstract class AbstractSubmit extends AbstractDaemonTest { |
| private Map<String, String> mergeResults; |
| |
| @Inject |
| private ChangeNotes.Factory notesFactory; |
| |
| @Inject |
| private ApprovalsUtil approvalsUtil; |
| |
| @Inject |
| private IdentifiedUser.GenericFactory factory; |
| |
| @Inject |
| EventSource source; |
| |
| @Before |
| public void setUp() throws Exception { |
| mergeResults = Maps.newHashMap(); |
| CurrentUser listenerUser = factory.create(user.id); |
| source.addEventListener(new EventListener() { |
| |
| @Override |
| public void onEvent(Event event) { |
| if (event instanceof ChangeMergedEvent) { |
| ChangeMergedEvent changeMergedEvent = (ChangeMergedEvent) event; |
| mergeResults.put(changeMergedEvent.change.number, |
| changeMergedEvent.newRev); |
| } |
| } |
| |
| }, listenerUser); |
| project = new Project.NameKey("p2"); |
| } |
| |
| @After |
| public void cleanup() { |
| db.close(); |
| } |
| |
| protected abstract SubmitType getSubmitType(); |
| |
| @Test |
| public void submitToEmptyRepo() throws JSchException, IOException, |
| GitAPIException { |
| Git git = createProject(false); |
| PushOneCommit.Result change = createChange(git); |
| submit(change.getChangeId()); |
| assertThat(getRemoteHead().getId()).isEqualTo(change.getCommitId()); |
| } |
| |
| @Test |
| public void submitWholeTopic() throws Exception { |
| assume().that(isSubmitWholeTopicEnabled()).isTrue(); |
| Git git = createProject(); |
| PushOneCommit.Result change1 = |
| createChange(git, "Change 1", "a.txt", "content", "test-topic"); |
| PushOneCommit.Result change2 = |
| createChange(git, "Change 2", "b.txt", "content", "test-topic"); |
| approve(change1.getChangeId()); |
| approve(change2.getChangeId()); |
| submit(change2.getChangeId()); |
| change1.assertChange(Change.Status.MERGED, "test-topic", admin); |
| change2.assertChange(Change.Status.MERGED, "test-topic", admin); |
| } |
| |
| protected Git createProject() throws JSchException, IOException, |
| GitAPIException { |
| return createProject(true); |
| } |
| |
| private Git createProject(boolean emptyCommit) |
| throws JSchException, IOException, GitAPIException { |
| SshSession sshSession = new SshSession(server, admin); |
| try { |
| GitUtil.createProject(sshSession, project.get(), null, emptyCommit); |
| setSubmitType(getSubmitType()); |
| return cloneProject(sshSession.getUrl() + "/" + project.get()); |
| } finally { |
| sshSession.close(); |
| } |
| } |
| |
| private void setSubmitType(SubmitType submitType) throws IOException { |
| PutConfig.Input in = new PutConfig.Input(); |
| in.submitType = submitType; |
| in.useContentMerge = InheritableBoolean.FALSE; |
| RestResponse r = |
| adminSession.put("/projects/" + project.get() + "/config", in); |
| assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK); |
| r.consume(); |
| } |
| |
| protected void setUseContentMerge() throws IOException { |
| PutConfig.Input in = new PutConfig.Input(); |
| in.useContentMerge = InheritableBoolean.TRUE; |
| RestResponse r = |
| adminSession.put("/projects/" + project.get() + "/config", in); |
| assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK); |
| r.consume(); |
| } |
| |
| protected PushOneCommit.Result createChange(Git git) throws GitAPIException, |
| IOException { |
| PushOneCommit push = pushFactory.create(db, admin.getIdent()); |
| return push.to(git, "refs/for/master"); |
| } |
| |
| protected PushOneCommit.Result createChange(Git git, String subject, |
| String fileName, String content) throws GitAPIException, IOException { |
| PushOneCommit push = |
| pushFactory.create(db, admin.getIdent(), subject, fileName, content); |
| return push.to(git, "refs/for/master"); |
| } |
| |
| protected PushOneCommit.Result createChange(Git git, String subject, |
| String fileName, String content, String topic) |
| throws GitAPIException, IOException { |
| PushOneCommit push = |
| pushFactory.create(db, admin.getIdent(), subject, fileName, content); |
| return push.to(git, "refs/for/master/" + topic); |
| } |
| |
| protected void submit(String changeId) throws IOException { |
| submit(changeId, HttpStatus.SC_OK); |
| } |
| |
| protected void submitWithConflict(String changeId) throws IOException { |
| submit(changeId, HttpStatus.SC_CONFLICT); |
| } |
| |
| protected void submitStatusOnly(String changeId) |
| throws IOException, OrmException { |
| approve(changeId); |
| Change c = queryProvider.get().byKeyPrefix(changeId).get(0).change(); |
| c.setStatus(Change.Status.SUBMITTED); |
| db.changes().update(Collections.singleton(c)); |
| db.patchSetApprovals().insert(Collections.singleton( |
| new PatchSetApproval( |
| new PatchSetApproval.Key( |
| c.currentPatchSetId(), |
| admin.id, |
| LabelId.SUBMIT), |
| (short) 1, |
| new Timestamp(System.currentTimeMillis())))); |
| indexer.index(db, c); |
| } |
| |
| private void submit(String changeId, int expectedStatus) throws IOException { |
| approve(changeId); |
| SubmitInput subm = new SubmitInput(); |
| subm.waitForMerge = true; |
| RestResponse r = |
| adminSession.post("/changes/" + changeId + "/submit", subm); |
| assertThat(r.getStatusCode()).isEqualTo(expectedStatus); |
| if (expectedStatus == HttpStatus.SC_OK) { |
| ChangeInfo change = |
| newGson().fromJson(r.getReader(), |
| new TypeToken<ChangeInfo>() {}.getType()); |
| assertThat(change.status).isEqualTo(ChangeStatus.MERGED); |
| |
| checkMergeResult(change); |
| } |
| r.consume(); |
| } |
| |
| private void checkMergeResult(ChangeInfo change) throws IOException { |
| // Get the revision of the branch after the submit to compare with the |
| // newRev of the ChangeMergedEvent. |
| RestResponse b = |
| adminSession.get("/projects/" + project.get() + "/branches/" |
| + change.branch); |
| if (b.getStatusCode() == HttpStatus.SC_OK) { |
| BranchInfo branch = |
| newGson().fromJson(b.getReader(), |
| new TypeToken<BranchInfo>() {}.getType()); |
| assertThat(branch.revision).isEqualTo( |
| mergeResults.get(Integer.toString(change._number))); |
| } |
| b.consume(); |
| } |
| |
| private void approve(String changeId) throws IOException { |
| RestResponse r = adminSession.post( |
| "/changes/" + changeId + "/revisions/current/review", |
| new ReviewInput().label("Code-Review", 2)); |
| assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK); |
| r.consume(); |
| } |
| |
| protected void assertCurrentRevision(String changeId, int expectedNum, |
| ObjectId expectedId) throws IOException { |
| ChangeInfo c = getChange(changeId, CURRENT_REVISION); |
| assertThat(c.currentRevision).isEqualTo(expectedId.name()); |
| assertThat(c.revisions.get(expectedId.name())._number).isEqualTo(expectedNum); |
| Repository repo = |
| repoManager.openRepository(new Project.NameKey(c.project)); |
| try { |
| Ref ref = repo.getRef( |
| new PatchSet.Id(new Change.Id(c._number), expectedNum).toRefName()); |
| assertThat(ref).isNotNull(); |
| assertThat(ref.getObjectId()).isEqualTo(expectedId); |
| } finally { |
| repo.close(); |
| } |
| } |
| |
| protected void assertApproved(String changeId) throws IOException { |
| ChangeInfo c = getChange(changeId, DETAILED_LABELS); |
| LabelInfo cr = c.labels.get("Code-Review"); |
| assertThat(cr.all).hasSize(1); |
| assertThat(cr.all.get(0).value.intValue()).isEqualTo(2); |
| assertThat(new Account.Id(cr.all.get(0)._accountId)).isEqualTo(admin.getId()); |
| } |
| |
| protected void assertSubmitter(String changeId, int psId) |
| throws OrmException { |
| ChangeNotes cn = notesFactory.create( |
| getOnlyElement(queryProvider.get().byKeyPrefix(changeId)).change()); |
| PatchSetApproval submitter = approvalsUtil.getSubmitter( |
| db, cn, new PatchSet.Id(cn.getChangeId(), psId)); |
| assertThat(submitter.isSubmit()).isTrue(); |
| assertThat(submitter.getAccountId()).isEqualTo(admin.getId()); |
| } |
| |
| protected void assertCherryPick(Git localGit, boolean contentMerge) |
| throws IOException { |
| assertRebase(localGit, contentMerge); |
| RevCommit remoteHead = getRemoteHead(); |
| assertThat(remoteHead.getFooterLines("Reviewed-On")).isNotEmpty(); |
| assertThat(remoteHead.getFooterLines("Reviewed-By")).isNotEmpty(); |
| } |
| |
| protected void assertRebase(Git localGit, boolean contentMerge) |
| throws IOException { |
| Repository repo = localGit.getRepository(); |
| RevCommit localHead = getHead(repo); |
| RevCommit remoteHead = getRemoteHead(); |
| assert_().withFailureMessage( |
| String.format("%s not equal %s", localHead.name(), remoteHead.name())) |
| .that(localHead.getId()).isNotEqualTo(remoteHead.getId()); |
| assertThat(remoteHead.getParentCount()).isEqualTo(1); |
| if (!contentMerge) { |
| assertThat(getLatestRemoteDiff()).isEqualTo(getLatestDiff(repo)); |
| } |
| assertThat(remoteHead.getShortMessage()).isEqualTo(localHead.getShortMessage()); |
| } |
| |
| private RevCommit getHead(Repository repo) throws IOException { |
| return getHead(repo, "HEAD"); |
| } |
| |
| protected RevCommit getRemoteHead() throws IOException { |
| try (Repository repo = repoManager.openRepository(project)) { |
| return getHead(repo, "refs/heads/master"); |
| } |
| } |
| |
| protected List<RevCommit> getRemoteLog() throws IOException { |
| try (Repository repo = repoManager.openRepository(project); |
| RevWalk rw = new RevWalk(repo)) { |
| rw.markStart(rw.parseCommit( |
| repo.getRef("refs/heads/master").getObjectId())); |
| return Lists.newArrayList(rw); |
| } |
| } |
| |
| private RevCommit getHead(Repository repo, String name) throws IOException { |
| try (RevWalk rw = new RevWalk(repo)) { |
| return rw.parseCommit(repo.getRef(name).getObjectId()); |
| } |
| } |
| |
| private String getLatestDiff(Repository repo) throws IOException { |
| ObjectId oldTreeId = repo.resolve("HEAD~1^{tree}"); |
| ObjectId newTreeId = repo.resolve("HEAD^{tree}"); |
| return getLatestDiff(repo, oldTreeId, newTreeId); |
| } |
| |
| private String getLatestRemoteDiff() throws IOException { |
| try (Repository repo = repoManager.openRepository(project); |
| RevWalk rw = new RevWalk(repo)) { |
| ObjectId oldTreeId = repo.resolve("refs/heads/master~1^{tree}"); |
| ObjectId newTreeId = repo.resolve("refs/heads/master^{tree}"); |
| return getLatestDiff(repo, oldTreeId, newTreeId); |
| } |
| } |
| |
| private String getLatestDiff(Repository repo, ObjectId oldTreeId, |
| ObjectId newTreeId) throws IOException { |
| ByteArrayOutputStream out = new ByteArrayOutputStream(); |
| try (DiffFormatter fmt = new DiffFormatter(out)) { |
| fmt.setRepository(repo); |
| fmt.format(oldTreeId, newTreeId); |
| fmt.flush(); |
| return out.toString(); |
| } |
| } |
| } |