| // 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.truth.Truth.assertThat; |
| import static com.google.gerrit.acceptance.GitUtil.checkout; |
| |
| import com.google.gerrit.acceptance.PushOneCommit; |
| import com.google.gerrit.extensions.client.SubmitType; |
| |
| import org.eclipse.jgit.api.Git; |
| import org.eclipse.jgit.revwalk.RevCommit; |
| import org.junit.Test; |
| |
| import java.util.List; |
| |
| public class SubmitByMergeAlwaysIT extends AbstractSubmitByMerge { |
| |
| @Override |
| protected SubmitType getSubmitType() { |
| return SubmitType.MERGE_ALWAYS; |
| } |
| |
| @Test |
| public void submitWithMergeIfFastForwardPossible() throws Exception { |
| Git git = createProject(); |
| RevCommit oldHead = getRemoteHead(); |
| PushOneCommit.Result change = createChange(git); |
| submit(change.getChangeId()); |
| RevCommit head = getRemoteHead(); |
| assertThat(head.getParentCount()).isEqualTo(2); |
| assertThat(head.getParent(0)).isEqualTo(oldHead); |
| assertThat(head.getParent(1)).isEqualTo(change.getCommitId()); |
| assertSubmitter(change.getChangeId(), 1); |
| } |
| |
| @Test |
| public void submitMultipleChanges() throws Exception { |
| Git git = createProject(); |
| RevCommit initialHead = getRemoteHead(); |
| |
| checkout(git, initialHead.getId().getName()); |
| PushOneCommit.Result change2 = createChange(git, "Change 2", "b", "b"); |
| |
| checkout(git, initialHead.getId().getName()); |
| PushOneCommit.Result change3 = createChange(git, "Change 3", "c", "c"); |
| |
| checkout(git, initialHead.getId().getName()); |
| PushOneCommit.Result change4 = createChange(git, "Change 4", "d", "d"); |
| |
| submitStatusOnly(change2.getChangeId()); |
| submitStatusOnly(change3.getChangeId()); |
| submit(change4.getChangeId()); |
| |
| List<RevCommit> log = getRemoteLog(); |
| RevCommit tip = log.get(0); |
| assertThat(tip.getParent(1).getShortMessage()).isEqualTo( |
| change4.getCommit().getShortMessage()); |
| |
| tip = tip.getParent(0); |
| assertThat(tip.getParent(1).getShortMessage()).isEqualTo( |
| change3.getCommit().getShortMessage()); |
| |
| tip = tip.getParent(0); |
| assertThat(tip.getParent(1).getShortMessage()).isEqualTo( |
| change2.getCommit().getShortMessage()); |
| |
| assertThat(tip.getParent(0).getId()).isEqualTo(initialHead.getId()); |
| } |
| } |