1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
/*******************************************************************************
* Copyright (C) 2013, Tomasz Zarna <tomasz.zarna@gmail.com>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.egit.core.test.op;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.egit.core.op.MergeOperation;
import org.eclipse.egit.core.test.GitTestCase;
import org.eclipse.egit.core.test.TestRepository;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.LogCommand;
import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class MergeOperationTest extends GitTestCase {
private static final String MASTER = Constants.R_HEADS + Constants.MASTER;
private static final String SIDE = Constants.R_HEADS + "side";
private TestRepository testRepository;
private RevCommit secondCommit;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
gitDir = new File(project.getProject()
.getLocationURI().getPath(), Constants.DOT_GIT);
testRepository = new TestRepository(gitDir);
testRepository.connect(project.getProject());
File file1 = testRepository.createFile(project.getProject(), "file1-1");
testRepository.addAndCommit(project.getProject(), file1,
"master commit 1");
testRepository.createBranch(MASTER, SIDE);
testRepository.appendFileContent(file1, "file1-2");
secondCommit = testRepository.addAndCommit(project.getProject(), file1,
"master commit 2");
testRepository.checkoutBranch(SIDE);
}
@Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
super.tearDown();
}
@Test
public void testMergeFF() throws Exception {
MergeOperation operation = new MergeOperation(
testRepository.getRepository(), MASTER);
operation.execute(new NullProgressMonitor());
assertTrue(testRepository.getRepository().resolve(SIDE).equals(secondCommit));
assertEquals(2, countCommitsInHead());
}
@Test
public void testMergeoptionsNoFF() throws Exception {
setMergeOptions("side", FastForwardMode.NO_FF);
MergeOperation operation = new MergeOperation(
testRepository.getRepository(), MASTER);
operation.execute(new NullProgressMonitor());
assertEquals(3, countCommitsInHead());
}
@Test
public void testMergeoptionsFFOnly() throws Exception {
setMergeOptions("side", FastForwardMode.FF_ONLY);
File file2 = testRepository.createFile(project.getProject(), "file2");
testRepository.appendFileContent(file2, "file2-1");
RevCommit commit = testRepository.addAndCommit(project.getProject(), file2,
"side commit 1");
MergeOperation operation = new MergeOperation(
testRepository.getRepository(), MASTER);
operation.execute(new NullProgressMonitor());
assertTrue(testRepository.getRepository().resolve(SIDE).equals(commit));
}
private void setMergeOptions(String branch, FastForwardMode ffMode)
throws IOException {
StoredConfig config = testRepository.getRepository().getConfig();
config.setEnum(ConfigConstants.CONFIG_BRANCH_SECTION, branch,
ConfigConstants.CONFIG_KEY_MERGEOPTIONS, ffMode);
config.save();
}
@Test
public void testMergeNoFF() throws Exception {
setMerge(FastForwardMode.NO_FF);
MergeOperation operation = new MergeOperation(
testRepository.getRepository(), MASTER);
operation.execute(new NullProgressMonitor());
assertEquals(3, countCommitsInHead());
}
@Test
public void testMergeFFOnly() throws Exception {
setMerge(FastForwardMode.FF_ONLY);
File file2 = testRepository.createFile(project.getProject(), "file2");
testRepository.appendFileContent(file2, "file2-1");
RevCommit commit = testRepository.addAndCommit(project.getProject(), file2,
"side commit 1");
MergeOperation operation = new MergeOperation(
testRepository.getRepository(), MASTER);
operation.execute(new NullProgressMonitor());
assertTrue(testRepository.getRepository().resolve(SIDE).equals(commit));
}
private void setMerge(FastForwardMode ffMode) throws IOException {
StoredConfig config = testRepository.getRepository().getConfig();
config.setEnum(ConfigConstants.CONFIG_KEY_MERGE, null,
ConfigConstants.CONFIG_KEY_FF,
FastForwardMode.Merge.valueOf(ffMode));
config.save();
}
private int countCommitsInHead() throws GitAPIException {
LogCommand log;
try (Git git = new Git(testRepository.getRepository())) {
log = git.log();
}
Iterable<RevCommit> commits = log.call();
int result = 0;
for (Iterator i = commits.iterator(); i.hasNext();) {
i.next();
result++;
}
return result;
}
}
|
