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
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
|
/*******************************************************************************
* Copyright (c) 2010 SAP AG.
* 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
*******************************************************************************/
package org.eclipse.egit.ui.test.history;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.test.ContextMenuHelper;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotPerspective;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Tests for the Team->Branch action
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class HistoryViewTest extends LocalRepositoryTestCase {
private static final String SECONDFOLDER = "secondFolder";
private static final String ADDEDFILE = "another.txt";
private static final String ADDEDMESSAGE = "A new file in a new folder";
private static SWTBotPerspective perspective;
private static int commitCount;
private static File repoFile;
@BeforeClass
public static void setup() throws Exception {
// File repoFile =
repoFile = createProjectAndCommitToRepository();
perspective = bot.activePerspective();
bot.perspectiveById("org.eclipse.pde.ui.PDEPerspective").activate();
IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject(
PROJ1);
IFolder folder2 = prj.getFolder(SECONDFOLDER);
folder2.create(false, true, null);
IFile addedFile = folder2.getFile(ADDEDFILE);
addedFile.create(new ByteArrayInputStream("More content".getBytes(prj
.getDefaultCharset())), false, null);
addAndCommit(addedFile, ADDEDMESSAGE);
// TODO count the commits
commitCount = 3;
waitInUI();
}
@AfterClass
public static void shutdown() {
perspective.activate();
}
@Test
public void testOpenHistoryOnFileNoFilter() throws Exception {
initFilter(0);
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1).rowCount());
assertEquals("Wrong number of commits", commitCount - 1,
getHistoryViewTable(PROJ1, FOLDER).rowCount());
assertEquals("Wrong number of commits", commitCount - 1,
getHistoryViewTable(PROJ1, FOLDER, FILE1).rowCount());
assertEquals("Wrong number of commits", 1, getHistoryViewTable(PROJ1,
FOLDER, FILE2).rowCount());
assertEquals("Wrong number of commits", 1, getHistoryViewTable(PROJ1,
SECONDFOLDER).rowCount());
assertEquals("Wrong number of commits", 1, getHistoryViewTable(PROJ1,
SECONDFOLDER, ADDEDFILE).rowCount());
assertEquals("Wrong number of commits", 1, getHistoryViewTable(PROJ2)
.rowCount());
assertEquals("Wrong commit message", ADDEDMESSAGE, getHistoryViewTable(
PROJ1, SECONDFOLDER, ADDEDFILE).getTableItem(0).getText(0));
assertEquals("Wrong commit message", "Initial commit",
getHistoryViewTable(PROJ1, FOLDER, FILE2).getTableItem(0)
.getText(0));
}
@Test
public void testOpenHistoryOnFileRepoFilter() throws Exception {
initFilter(1);
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER, FILE1).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER, FILE2).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, SECONDFOLDER).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, SECONDFOLDER, ADDEDFILE).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ2).rowCount());
}
@Test
public void testOpenHistoryOnFileProjectFilter() throws Exception {
initFilter(2);
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER, FILE1).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER, FILE2).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, SECONDFOLDER).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, SECONDFOLDER, ADDEDFILE).rowCount());
assertEquals("Wrong number of commits", 1, getHistoryViewTable(PROJ2)
.rowCount());
}
@Test
public void testOpenHistoryOnFileFolderFilter() throws Exception {
initFilter(3);
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, FOLDER).rowCount());
assertEquals("Wrong number of commits", commitCount - 1,
getHistoryViewTable(PROJ1, FOLDER, FILE1).rowCount());
assertEquals("Wrong number of commits", commitCount - 1,
getHistoryViewTable(PROJ1, FOLDER, FILE2).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ1, SECONDFOLDER).rowCount());
assertEquals("Wrong number of commits", 1, getHistoryViewTable(PROJ1,
SECONDFOLDER, ADDEDFILE).rowCount());
assertEquals("Wrong number of commits", commitCount,
getHistoryViewTable(PROJ2).rowCount());
}
/**
* @param filter
* 0: none, 1: repository, 2: project, 3: folder
*/
private void initFilter(int filter) {
getHistoryViewTable(PROJ1);
SWTBotView view = bot
.viewById("org.eclipse.team.ui.GenericHistoryView");
SWTBotToolbarToggleButton folder = (SWTBotToolbarToggleButton) view
.toolbarButton(UIText.HistoryPage_ShowAllVersionsForFolder);
SWTBotToolbarToggleButton project = (SWTBotToolbarToggleButton) view
.toolbarButton(UIText.HistoryPage_ShowAllVersionsForProject);
SWTBotToolbarToggleButton repo = (SWTBotToolbarToggleButton) view
.toolbarButton(UIText.HistoryPage_ShowAllVersionsForRepo);
switch (filter) {
case 0:
if (folder.isChecked())
folder.click();
if (project.isChecked())
project.click();
if (repo.isChecked())
repo.click();
break;
case 1:
if (!repo.isChecked())
repo.click();
break;
case 2:
if (!project.isChecked())
project.click();
break;
case 3:
if (!folder.isChecked())
folder.click();
break;
default:
break;
}
}
@Test
public void testOpenHistoryOnProject() throws Exception {
SWTBotTable table = getHistoryViewTable(PROJ1);
int rowCount = table.rowCount();
assertTrue(table.rowCount() > 0);
assertEquals(table.getTableItem(rowCount - 1).getText(0),
"Initial commit");
}
@Test
public void testAddCommit() throws Exception {
String commitMessage = "The special commit";
int countBefore = getHistoryViewTable(PROJ1).rowCount();
touchAndSubmit(commitMessage);
waitInUI();
int countAfter = getHistoryViewTable(PROJ1).rowCount();
assertEquals("Wrong number of entries", countBefore + 1, countAfter);
assertEquals("Wrong comit message", commitMessage, getHistoryViewTable(
PROJ1).getTableItem(0).getText(0));
}
/**
* @param path
* must be length 2 or three (folder or file)
* @return the bale
*/
private SWTBotTable getHistoryViewTable(String... path) {
SWTBotTree projectExplorerTree = bot.viewById(
"org.eclipse.jdt.ui.PackageExplorer").bot().tree();
if (path.length == 1)
getProjectItem(projectExplorerTree, path[0]).select();
else if (path.length == 2)
getProjectItem(projectExplorerTree, path[0]).expand().getNode(
path[1]).select();
else
getProjectItem(projectExplorerTree, path[0]).expand().getNode(
path[1]).expand().getNode(path[2]).select();
ContextMenuHelper.clickContextMenu(projectExplorerTree, "Show In",
"History");
return bot.viewById("org.eclipse.team.ui.GenericHistoryView").bot()
.table();
}
@Test
public void testAddBranch() throws Exception {
Repository repo = lookupRepository(repoFile);
assertNull(repo.resolve(Constants.R_HEADS + "NewBranch"));
SWTBotTable table = getHistoryViewTable(PROJ1);
table.getTableItem(0).select();
ContextMenuHelper.clickContextMenu(table, util
.getPluginLocalizedValue("CreateBranchOnCommitActionLabel"));
SWTBotShell dialog = bot
.shell(UIText.BranchSelectionDialog_QuestionNewBranchTitle);
dialog.bot().text().setText("NewBranch");
dialog.bot().button(IDialogConstants.OK_LABEL).click();
waitInUI();
assertNotNull(repo.resolve(Constants.R_HEADS + "NewBranch"));
}
@Test
public void testAddTag() throws Exception {
Repository repo = lookupRepository(repoFile);
assertNull(repo.resolve(Constants.R_TAGS + "NewTag"));
final SWTBotTable table = getHistoryViewTable(PROJ1);
table.getTableItem(0).select();
final RevCommit[] commit = new RevCommit[1];
Display.getDefault().syncExec(new Runnable() {
public void run() {
commit[0] = (RevCommit) table.widget.getSelection()[0]
.getData();
}
});
ContextMenuHelper.clickContextMenu(table, util
.getPluginLocalizedValue("CreateTagOnCommitActionLabel"));
SWTBotShell dialog = bot.shell(NLS.bind(
UIText.CreateTagDialog_CreateTagOnCommitTitle, commit[0]
.getId().name()));
dialog.bot().textWithLabel(UIText.CreateTagDialog_tagName).setText(
"NewTag");
dialog.bot().textWithLabel(UIText.CreateTagDialog_tagMessage).setText(
"New Tag message");
dialog.bot().button(IDialogConstants.OK_LABEL).click();
waitInUI();
assertNotNull(repo.resolve(Constants.R_TAGS + "NewTag"));
}
@Test
public void testCheckOut() throws Exception {
Repository repo = lookupRepository(repoFile);
assertEquals(Constants.MASTER, repo.getBranch());
final SWTBotTable table = getHistoryViewTable(PROJ1);
// check out the second line
table.getTableItem(1).select();
final RevCommit[] commit = new RevCommit[1];
Display.getDefault().syncExec(new Runnable() {
public void run() {
commit[0] = (RevCommit) table.widget.getSelection()[0]
.getData();
}
});
ContextMenuHelper.clickContextMenu(table, util
.getPluginLocalizedValue("CheckoutCommand"));
waitInUI();
assertEquals(commit[0].getId().name(), repo.getBranch());
}
}
|
