// 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.gerrit.acceptance.GitUtil.checkout; import static org.junit.Assert.assertEquals; import com.google.gerrit.acceptance.PushOneCommit; import com.jcraft.jsch.JSchException; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Test; import java.io.IOException; public abstract class AbstractSubmitByMerge extends AbstractSubmit { @Test public void submitWithMerge() throws JSchException, IOException, GitAPIException { Git git = createProject(); RevCommit initialHead = getRemoteHead(); PushOneCommit.Result change = createChange(git, "Change 1", "a.txt", "content"); submit(change.getChangeId()); RevCommit oldHead = getRemoteHead(); checkout(git, initialHead.getId().getName()); PushOneCommit.Result change2 = createChange(git, "Change 2", "b.txt", "other content"); submit(change2.getChangeId()); RevCommit head = getRemoteHead(); assertEquals(2, head.getParentCount()); assertEquals(oldHead, head.getParent(0)); assertEquals(change2.getCommitId(), head.getParent(1)); } @Test public void submitWithContentMerge() throws JSchException, IOException, GitAPIException { Git git = createProject(); setUseContentMerge(); PushOneCommit.Result change = createChange(git, "Change 1", "a.txt", "aaa\nbbb\nccc\n"); submit(change.getChangeId()); PushOneCommit.Result change2 = createChange(git, "Change 2", "a.txt", "aaa\nbbb\nccc\nddd\n"); submit(change2.getChangeId()); RevCommit oldHead = getRemoteHead(); checkout(git, change.getCommitId().getName()); PushOneCommit.Result change3 = createChange(git, "Change 3", "a.txt", "bbb\nccc\n"); submit(change3.getChangeId()); RevCommit head = getRemoteHead(); assertEquals(2, head.getParentCount()); assertEquals(oldHead, head.getParent(0)); assertEquals(change3.getCommitId(), head.getParent(1)); } @Test public void submitWithContentMerge_Conflict() throws JSchException, IOException, GitAPIException { Git git = createProject(); setUseContentMerge(); RevCommit initialHead = getRemoteHead(); PushOneCommit.Result change = createChange(git, "Change 1", "a.txt", "content"); submit(change.getChangeId()); RevCommit oldHead = getRemoteHead(); checkout(git, initialHead.getId().getName()); PushOneCommit.Result change2 = createChange(git, "Change 2", "a.txt", "other content"); submitWithConflict(change2.getChangeId()); assertEquals(oldHead, getRemoteHead()); } }