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
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
|
/*******************************************************************************
* Copyright (c) 2010, 2013 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Mathias Kinzler (SAP AG) - initial implementation
* Chris Aniszczyk <caniszczyk@gmail.com> - tag API changes
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.File;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.egit.core.project.RepositoryMapping;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.UIPreferences;
import org.eclipse.egit.ui.common.CommitDialogTester;
import org.eclipse.egit.ui.common.CommitDialogTester.NoFilesToCommitPopup;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.test.CommitMessageUtil;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Tests for the Team->Commit action
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class CommitActionTest extends LocalRepositoryTestCase {
private File repositoryFile;
@Before
public void setup() throws Exception {
Activator.getDefault().getPreferenceStore()
.setValue(UIPreferences.ALWAYS_USE_STAGING_VIEW, false);
repositoryFile = createProjectAndCommitToRepository();
Repository repo = lookupRepository(repositoryFile);
TestUtil.configureTestCommitterAsUser(repo);
// TODO delete the second project for the time being (.gitignore is
// currently not hiding the .project file from commit)
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJ2);
File dotProject = new File(project.getLocation().toOSString(), ".project");
project.delete(false, false, null);
assertTrue(dotProject.delete());
}
@After
public void tearDown() {
Activator.getDefault().getPreferenceStore()
.setValue(UIPreferences.ALWAYS_USE_STAGING_VIEW, true);
}
@Test
public void testOpenCommitWithoutChanged() throws Exception {
NoFilesToCommitPopup popup = CommitDialogTester
.openCommitDialogExpectNoFilesToCommit(PROJ1);
popup.cancelPopup();
}
@Test
public void testCommitSingleFile() throws Exception {
setTestFileContent("I have changed this");
CommitDialogTester commitDialogTester = CommitDialogTester
.openCommitDialog(PROJ1);
assertEquals("Wrong row count", 1, commitDialogTester.getRowCount());
assertTrue("Wrong file",
commitDialogTester.getEntryText(0).endsWith("test.txt"));
commitDialogTester.setAuthor(TestUtil.TESTAUTHOR);
commitDialogTester.setCommitter(TestUtil.TESTCOMMITTER);
commitDialogTester.setCommitMessage("The new commit");
commitDialogTester.commit();
TestUtil.checkHeadCommit(lookupRepository(repositoryFile),
TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER, "The new commit");
NoFilesToCommitPopup popup = CommitDialogTester
.openCommitDialogExpectNoFilesToCommit(PROJ1);
popup.cancelPopup();
}
@Test
public void testAmendWithChangeIdPreferenceOff() throws Exception {
Repository repo = lookupRepository(repositoryFile);
repo.getConfig().setBoolean(ConfigConstants.CONFIG_GERRIT_SECTION,
null, ConfigConstants.CONFIG_KEY_CREATECHANGEID, true);
setTestFileContent("Another Change");
CommitDialogTester commitDialogTester = CommitDialogTester
.openCommitDialog(PROJ1);
assertEquals("Wrong row count", 1, commitDialogTester.getRowCount());
assertTrue("Wrong file",
commitDialogTester.getEntryText(0).endsWith("test.txt"));
commitDialogTester.setAuthor(TestUtil.TESTAUTHOR);
commitDialogTester.setCommitter(TestUtil.TESTCOMMITTER);
String commitMessage = commitDialogTester.getCommitMessage();
assertTrue(commitMessage.indexOf("Change-Id") > 0);
String newCommitMessage = "Change to be amended \n\n" + commitMessage;
commitDialogTester.setCommitMessage(newCommitMessage);
commitDialogTester.commit();
NoFilesToCommitPopup noFilesToCommitPopup = CommitDialogTester
.openCommitDialogExpectNoFilesToCommit(PROJ1);
repo.getConfig().setBoolean(ConfigConstants.CONFIG_GERRIT_SECTION,
null, ConfigConstants.CONFIG_KEY_CREATECHANGEID, false);
commitDialogTester = noFilesToCommitPopup.confirmPopup();
assertTrue(commitDialogTester.getCommitMessage().indexOf("Change-Id") > 0);
}
@Test
public void testLaunchedWithAmend() throws Exception {
Repository repository = lookupRepository(repositoryFile);
RevCommit oldHeadCommit = TestUtil.getHeadCommit(repository);
commitOneFileChange("Again another Change");
ObjectId headCommitId = TestUtil.getHeadCommit(repository).getId();
NoFilesToCommitPopup noFilesToCommitPopup = CommitDialogTester
.openCommitDialogExpectNoFilesToCommit(PROJ1);
CommitDialogTester commitDialogTester = noFilesToCommitPopup.confirmPopup();
assertTrue(commitDialogTester.getCommitMessage().indexOf("Change-Id") > 0);
assertTrue(commitDialogTester.getCommitMessage().indexOf("Signed-off-by") > 0);
assertTrue(commitDialogTester.getAmend());
assertTrue(commitDialogTester.getSignedOff());
assertTrue(commitDialogTester.getInsertChangeId());
// change commit message to get a different SHA1 for the commit
commitDialogTester.setCommitMessage("Changed "
+ commitDialogTester.getCommitMessage());
commitDialogTester.commit();
RevCommit headCommit = TestUtil.getHeadCommit(repository);
if(headCommitId.equals(headCommit.getId()))
fail("There is no new commit");
assertEquals(oldHeadCommit, headCommit.getParent(0));
}
private void commitOneFileChange(String fileContent) throws Exception {
setTestFileContent(fileContent);
CommitDialogTester commitDialogTester = CommitDialogTester
.openCommitDialog(PROJ1);
commitDialogTester.setShowUntracked(false);
assertEquals("Wrong row count", 1, commitDialogTester.getRowCount());
assertTrue("Wrong file",
commitDialogTester.getEntryText(0).endsWith("test.txt"));
commitDialogTester.setAuthor(TestUtil.TESTAUTHOR);
commitDialogTester.setCommitter(TestUtil.TESTCOMMITTER);
commitDialogTester.setCommitMessage("Commit message");
commitDialogTester.setInsertChangeId(true);
commitDialogTester.setSignedOff(true);
String commitMessage = commitDialogTester.getCommitMessage();
assertTrue(commitMessage.indexOf("Change-Id") > 0);
assertTrue(commitMessage.indexOf("Signed-off-by") > 0);
commitDialogTester.commit();
}
@Test
public void testAmend() throws Exception {
Repository repository = lookupRepository(repositoryFile);
RevCommit oldHeadCommit = TestUtil.getHeadCommit(repository);
commitOneFileChange("Yet another Change");
RevCommit headCommit = TestUtil.getHeadCommit(repository);
ObjectId headCommitId = headCommit.getId();
String changeId = CommitMessageUtil.extractChangeId(headCommit
.getFullMessage());
setTestFileContent("Changes over changes");
CommitDialogTester commitDialogTester = CommitDialogTester
.openCommitDialog(PROJ1);
commitDialogTester.setAmend(true);
assertTrue(commitDialogTester.getCommitMessage().indexOf("Change-Id") > 0);
assertTrue(commitDialogTester.getCommitMessage().indexOf(
"Signed-off-by") > 0);
assertTrue(commitDialogTester.getSignedOff());
assertTrue(commitDialogTester.getInsertChangeId());
commitDialogTester.commit();
headCommit = TestUtil.getHeadCommit(repository);
if(headCommitId.equals(headCommit.getId()))
fail("There is no new commit");
assertEquals(oldHeadCommit, headCommit.getParent(0));
assertTrue(headCommit.getFullMessage().indexOf(changeId) > 0);
}
@Test
public void testIncludeUntracked() throws Exception {
boolean include = Activator.getDefault().getPreferenceStore()
.getBoolean(UIPreferences.COMMIT_DIALOG_INCLUDE_UNTRACKED);
try {
Activator
.getDefault()
.getPreferenceStore()
.setValue(UIPreferences.COMMIT_DIALOG_INCLUDE_UNTRACKED,
true);
IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJ1);
if (!prj.isAccessible())
throw new IllegalStateException("No project found");
IFile file = prj.getFile("untracked.txt");
assertFalse(file.exists());
file.create(
new ByteArrayInputStream("new file".getBytes(prj
.getDefaultCharset())), 0, null);
assertTrue(file.exists());
CommitDialogTester commitDialogTester = CommitDialogTester
.openCommitDialog(PROJ1);
assertEquals(1, commitDialogTester.getRowCount());
assertTrue(commitDialogTester.isEntryChecked(0));
String path = RepositoryMapping.getMapping(file)
.getRepoRelativePath(file);
assertEquals(path, commitDialogTester.getEntryText(0));
commitDialogTester.setCommitMessage("Add new file");
commitDialogTester.commit();
file.delete(false, null);
} finally {
Activator
.getDefault()
.getPreferenceStore()
.setValue(UIPreferences.COMMIT_DIALOG_INCLUDE_UNTRACKED,
include);
}
}
@Test
public void testSortingByName() throws Exception {
IFile fileA = touch(PROJ1, "a", "a");
IFile fileB = touch(PROJ1, "b", "b");
CommitDialogTester commitDialogTester = CommitDialogTester
.openCommitDialog(PROJ1);
commitDialogTester.setShowUntracked(true);
assertEquals(2, commitDialogTester.getRowCount());
assertEquals(PROJ1 + "/a", commitDialogTester.getEntryText(0));
assertEquals(PROJ1 + "/b", commitDialogTester.getEntryText(1));
// Sort ascending (first click changes default sort order)
commitDialogTester.sortByName();
// Sort descending (now the sort order should be reversed)
commitDialogTester.sortByName();
assertEquals(PROJ1 + "/b", commitDialogTester.getEntryText(0));
assertEquals(PROJ1 + "/a", commitDialogTester.getEntryText(1));
commitDialogTester.cancel();
fileA.delete(false, null);
fileB.delete(false, null);
}
}
|
