Search in sources :

Example 11 with MergeableInfo

use of com.google.gerrit.extensions.common.MergeableInfo in project gerrit by GerritCodeReview.

the class CheckMergeabilityIT method assertContentMerged.

private void assertContentMerged(String targetBranch, String source, String strategy) throws Exception {
    MergeableInfo mergeableInfo = getMergeableInfo(targetBranch, source, strategy);
    assertThat(mergeableInfo.mergeable).isTrue();
    assertThat(mergeableInfo.contentMerged).isTrue();
}
Also used : MergeableInfo(com.google.gerrit.extensions.common.MergeableInfo)

Aggregations

MergeableInfo (com.google.gerrit.extensions.common.MergeableInfo)11 Ref (org.eclipse.jgit.lib.Ref)4 Repository (org.eclipse.jgit.lib.Repository)4 ResourceConflictException (com.google.gerrit.extensions.restapi.ResourceConflictException)3 BadRequestException (com.google.gerrit.extensions.restapi.BadRequestException)2 ResourceNotFoundException (com.google.gerrit.extensions.restapi.ResourceNotFoundException)2 InMemoryInserter (com.google.gerrit.server.git.InMemoryInserter)2 ProjectState (com.google.gerrit.server.project.ProjectState)2 ChangeData (com.google.gerrit.server.query.change.ChangeData)2 ObjectId (org.eclipse.jgit.lib.ObjectId)2 ObjectInserter (org.eclipse.jgit.lib.ObjectInserter)2 Merger (org.eclipse.jgit.merge.Merger)2 ResolveMerger (org.eclipse.jgit.merge.ResolveMerger)2 RevCommit (org.eclipse.jgit.revwalk.RevCommit)2 RevWalk (org.eclipse.jgit.revwalk.RevWalk)2 AbstractDaemonTest (com.google.gerrit.acceptance.AbstractDaemonTest)1 PushOneCommit (com.google.gerrit.acceptance.PushOneCommit)1 RestResponse (com.google.gerrit.acceptance.RestResponse)1 BranchOrderSection (com.google.gerrit.entities.BranchOrderSection)1 Change (com.google.gerrit.entities.Change)1