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
|
/*******************************************************************************
* 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
*******************************************************************************/
package org.eclipse.egit.ui.view.repositories;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.concurrent.TimeUnit;
import org.eclipse.egit.core.op.CloneOperation;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.JobFamilies;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.push.PushOperationUI;
import org.eclipse.egit.ui.test.ContextMenuHelper;
import org.eclipse.egit.ui.test.JobJoiner;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* SWTBot Tests for the Git Repositories View (mainly fetch and push)
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class GitRepositoriesViewFetchAndPushTest extends
GitRepositoriesViewTestBase {
private File repositoryFile;
private File remoteRepositoryFile;
private File clonedRepositoryFile;
private File clonedRepositoryFile2;
@Before
public void before() throws Exception {
repositoryFile = createProjectAndCommitToRepository();
remoteRepositoryFile = createRemoteRepository(repositoryFile);
// now let's clone the remote repository
URIish uri = new URIish("file:///" + remoteRepositoryFile.getPath());
File workdir = new File(getTestDirectory(), "ClonedRepo");
CloneOperation op = new CloneOperation(uri, true, null, workdir,
"refs/heads/master", "origin", 0);
op.run(null);
clonedRepositoryFile = new File(workdir, Constants.DOT_GIT);
// now let's clone the remote repository
uri = new URIish(remoteRepositoryFile.getPath());
workdir = new File(getTestDirectory(), "ClonedRepo2");
op = new CloneOperation(uri, true, null, workdir, "refs/heads/master",
"origin", 0);
op.run(null);
clonedRepositoryFile2 = new File(workdir, Constants.DOT_GIT);
clearView();
deleteAllProjects();
}
@Test
public void testPushToOriginPushNode() throws Exception {
testPushToOrigin(false);
}
@Test
public void testPushToOriginRemoteNode() throws Exception {
testPushToOrigin(true);
}
private void testPushToOrigin(boolean useRemote) throws Exception {
Activator.getDefault().getRepositoryUtil().addConfiguredRepository(
clonedRepositoryFile);
shareProjects(clonedRepositoryFile);
SWTBotTree tree = getOrOpenView().bot().tree();
tree.select(0);
Repository repository = lookupRepository(clonedRepositoryFile);
// add the configuration for push
repository.getConfig().setString("remote", "origin", "push",
"refs/heads/*:refs/remotes/origin/*");
repository.getConfig().save();
// make sure to have a "new" branch name so that the
// dialog will return with a corresponding message
String currentBranch = repository.getBranch();
new Git(repository).branchRename().setOldName(currentBranch)
.setNewName("" + System.currentTimeMillis()).call();
TestUtil.waitForJobs(50, 5000);
selectNode(tree, useRemote, false);
runPush(tree);
String destinationString = clonedRepositoryFile.getParentFile()
.getName()
+ " - " + "origin";
String dialogTitle = NLS.bind(UIText.PushResultDialog_title,
destinationString);
// first time: expect new branch
SWTBotShell confirmed = bot.shell(dialogTitle);
SWTBotTreeItem[] treeItems = confirmed.bot().tree().getAllItems();
boolean newBranch = false;
for (SWTBotTreeItem item : treeItems) {
newBranch = item.getText().contains(
UIText.PushResultTable_statusOkNewBranch);
if (newBranch)
break;
}
confirmed.close();
assertTrue("New branch expected", newBranch);
// second time: expect up to date
selectNode(tree, useRemote, false);
runPush(tree);
confirmed = bot.shell(dialogTitle);
treeItems = confirmed.bot().tree().getAllItems();
boolean uptodate = false;
for (SWTBotTreeItem item : treeItems) {
uptodate = item.getText().contains(
UIText.PushResultTable_statusUpToDate);
if (uptodate)
break;
}
confirmed.close();
assertTrue("Up to date expected", uptodate);
// touch and run again: expect new branch
String objectIdBefore = repository.getRef(repository.getFullBranch())
.getLeaf().getObjectId().name();
objectIdBefore = objectIdBefore.substring(0, 7);
touchAndSubmit(null);
selectNode(tree, useRemote, false);
runPush(tree);
confirmed = bot.shell(dialogTitle);
treeItems = confirmed.bot().tree().getAllItems();
newBranch = false;
for (SWTBotTreeItem item : treeItems) {
newBranch = item.getText().contains(objectIdBefore);
if (newBranch)
break;
}
confirmed.close();
assertTrue("New branch expected", newBranch);
}
@Test
public void testFetchFromOriginFetchNode() throws Exception {
testFetchFromOrigin(false);
}
@Test
public void testFetchFromOriginRemoteNode() throws Exception {
testFetchFromOrigin(true);
}
private void testFetchFromOrigin(boolean useRemote) throws Exception {
Activator.getDefault().getRepositoryUtil().addConfiguredRepository(
clonedRepositoryFile);
Activator.getDefault().getRepositoryUtil().addConfiguredRepository(
clonedRepositoryFile2);
Repository repository = lookupRepository(clonedRepositoryFile2);
// add the configuration for push from cloned2
repository.getConfig().setString("remote", "origin", "push",
"refs/heads/*:refs/heads/*");
repository.getConfig().save();
SWTBotTree tree = getOrOpenView().bot().tree();
String destinationString = clonedRepositoryFile.getParentFile()
.getName()
+ " - " + "origin";
String dialogTitle = NLS.bind(UIText.FetchResultDialog_title,
destinationString);
selectNode(tree, useRemote, true);
runFetch(tree);
SWTBotShell confirm = bot.shell(dialogTitle);
assertEquals("Wrong result tree row count", 0, confirm.bot().tree()
.rowCount());
confirm.close();
deleteAllProjects();
shareProjects(clonedRepositoryFile2);
String objid = repository.getRef("refs/heads/master").getTarget()
.getObjectId().name();
objid = objid.substring(0, 7);
touchAndSubmit(null);
// push from other repository
PushOperationUI op =new PushOperationUI(repository, "origin", false);
op.start();
String pushdialogTitle = NLS.bind(UIText.PushResultDialog_title,
op.getDestinationString());
bot.shell(pushdialogTitle).close();
deleteAllProjects();
refreshAndWait();
selectNode(tree, useRemote, true);
runFetch(tree);
confirm = bot.shell(dialogTitle);
SWTBotTreeItem[] treeItems = confirm.bot().tree().getAllItems();
boolean found = false;
for (SWTBotTreeItem item : treeItems) {
found = item.getText().contains(objid);
if (found)
break;
}
assertTrue(found);
confirm.close();
selectNode(tree, useRemote, true);
runFetch(tree);
confirm = bot.shell(dialogTitle);
assertEquals("Wrong result tree row count", 0, confirm.bot().tree()
.rowCount());
}
private void selectNode(SWTBotTree tree, boolean useRemote, boolean fetchMode)
throws Exception {
if (useRemote)
myRepoViewUtil.getRemotesItem(tree, clonedRepositoryFile).expand()
.getNode("origin").select();
else
myRepoViewUtil.getRemotesItem(tree, clonedRepositoryFile).expand()
.getNode("origin").expand().getNode(fetchMode ? 0 : 1)
.select();
}
private void runPush(SWTBotTree tree) {
JobJoiner jobJoiner = JobJoiner.startListening(JobFamilies.PUSH, 60, TimeUnit.SECONDS);
ContextMenuHelper.clickContextMenuSync(tree, myUtil
.getPluginLocalizedValue("SimplePushCommand"));
jobJoiner.join();
}
private void runFetch(SWTBotTree tree) {
JobJoiner jobJoiner = JobJoiner.startListening(JobFamilies.FETCH, 60, TimeUnit.SECONDS);
ContextMenuHelper.clickContextMenuSync(tree, myUtil
.getPluginLocalizedValue("SimpleFetchCommand"));
jobJoiner.join();
}
}
|
