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
|
/*******************************************************************************
* Copyright (C) 2012, IBM Corporation 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
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
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.core.CoreText;
import org.eclipse.egit.core.op.CommitOperation;
import org.eclipse.egit.core.op.ResetOperation;
import org.eclipse.egit.core.op.ResetOperation.ResetType;
import org.eclipse.egit.core.op.TagOperation;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.common.CreatePatchWizard;
import org.eclipse.egit.ui.common.CreatePatchWizard.NoChangesPopup;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.TagBuilder;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotPerspective;
import org.eclipse.swtbot.swt.finder.waits.Conditions;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* Tests for the Team->Create Patch action
*/
public class CreatePatchActionTest extends LocalRepositoryTestCase {
private static SWTBotPerspective perspective;
private static Repository repo;
private static final String TAG_NAME = "savepoint";
private static final String PATCH_FILE = "test.patch";
private static final String EXPECTED_PATCH_CONTENT = //
"diff --git a/GeneralProject/folder/test.txt b/GeneralProject/folder/test.txt\n"
+ "index e256dbb..d070357 100644\n"
+ "--- a/GeneralProject/folder/test.txt\n"
+ "+++ b/GeneralProject/folder/test.txt\n"
+ "@@ -1 +1 @@\n"
+ "-oldContent\n"
+ "\\ No newline at end of file\n"
+ "+newContent\n" //
+ "\\ No newline at end of file";
private static final String EXPECTED_WORKSPACE_PATCH_CONTENT = //
"### Eclipse Workspace Patch 1.0\n" //
+ "#P " + PROJ1 + "\n"
+ "diff --git folder/test.txt folder/test.txt\n" //
+ "index e256dbb..d070357 100644\n" //
+ "--- folder/test.txt\n" //
+ "+++ folder/test.txt\n" //
+ "@@ -1 +1 @@\n" //
+ "-oldContent\n" //
+ "\\ No newline at end of file\n" //
+ "+newContent\n" //
+ "\\ No newline at end of file\n"
+ "diff --git folder/test2.txt folder/test2.txt\n"
+ "deleted file mode 100644\n" //
+ "index 8f4e8d3..0000000\n" //
+ "--- folder/test2.txt\n" //
+ "+++ /dev/null\n" //
+ "@@ -1 +0,0 @@\n" //
+ "-Some more content\n" //
+ "\\ No newline at end of file\n" //
+ "#P " + PROJ2 + "\n" //
+ "diff --git test.txt test.txt\n" //
+ "new file mode 100644\n" //
+ "index 0000000..dbe9dba\n" //
+ "--- /dev/null\n" //
+ "+++ test.txt\n" //
+ "@@ -0,0 +1 @@\n" //
+ "+Hello, world\n" //
+ "\\ No newline at end of file";
@BeforeClass
public static void setup() throws Exception {
perspective = bot.activePerspective();
bot.perspectiveById("org.eclipse.pde.ui.PDEPerspective").activate();
File gitDir = createProjectAndCommitToRepository();
repo = new FileRepository(gitDir);
IFile[] commitables = getAllFiles();
ArrayList<IFile> untracked = new ArrayList<IFile>();
untracked.addAll(Arrays.asList(commitables));
CommitOperation cop = new CommitOperation(commitables, untracked,
TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER, "Initial commit");
cop.setAmending(true);
cop.execute(null);
TagBuilder tag = new TagBuilder();
tag.setTag(TAG_NAME);
tag.setTagger(RawParseUtils.parsePersonIdent(TestUtil.TESTAUTHOR));
tag.setMessage("I'm a savepoint");
tag.setObjectId(repo.resolve(repo.getFullBranch()),
Constants.OBJ_COMMIT);
TagOperation top = new TagOperation(repo, tag, false);
top.execute(null);
waitInUI();
}
private static IFile[] getAllFiles() {
IProject firstProject = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1);
IProject secondProject = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ2);
IFolder folder = firstProject.getFolder(FOLDER);
IFile textFile = folder.getFile(FILE1);
IFile textFile2 = folder.getFile(FILE2);
IFolder secondfolder = secondProject.getFolder(FOLDER);
IFile secondtextFile = secondfolder.getFile(FILE1);
IFile secondtextFile2 = secondfolder.getFile(FILE2);
return new IFile[] { firstProject.getFile(".project"), textFile,
textFile2, secondProject.getFile(".project"), secondtextFile,
secondtextFile2 };
}
@AfterClass
public static void shutdown() {
perspective.activate();
}
@After
public void rollback() throws Exception {
ResetOperation rop = new ResetOperation(repo, TAG_NAME, ResetType.HARD);
rop.execute(null);
IProject project = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1);
project.getFile(PATCH_FILE).delete(true, null);
}
@Test
public void testNoChanges() throws Exception {
CreatePatchWizard.openWizard(PROJ1);
NoChangesPopup popup = new NoChangesPopup(
bot.shell(UIText.GitCreatePatchAction_cannotCreatePatch));
popup.cancelPopup();
}
@Test
public void testClipboard() throws Exception {
touchAndSubmit("oldContent", null);
touch("newContent");
waitInUI();
CreatePatchWizard createPatchWizard = openCreatePatchWizard();
createPatchWizard.finish();
bot.waitUntil(Conditions.shellCloses(createPatchWizard.getShell()));
assertClipboard(EXPECTED_PATCH_CONTENT);
}
@Test
public void testFilesystem() throws Exception {
touchAndSubmit("oldContent", null);
touch("newContent");
waitInUI();
CreatePatchWizard createPatchWizard = openCreatePatchWizard();
LocationPage locationPage = createPatchWizard.getLocationPage();
IProject project = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1);
File patch = new File(project.getLocation().toFile(), PATCH_FILE);
locationPage.selectFilesystem(patch.toString());
createPatchWizard.finish();
bot.waitUntil(Conditions.shellCloses(createPatchWizard.getShell()));
byte[] bytes = IO.readFully(patch);
String patchContent = new String(bytes, "UTF-8");
assertEquals(EXPECTED_PATCH_CONTENT, patchContent);
}
@Test
public void testWorkspace() throws Exception {
touchAndSubmit("oldContent", null);
touch("newContent");
waitInUI();
CreatePatchWizard createPatchWizard = openCreatePatchWizard();
LocationPage locationPage = createPatchWizard.getLocationPage();
locationPage.selectWorkspace("/" + PROJ1 + "/" + PATCH_FILE);
createPatchWizard.finish();
bot.waitUntil(Conditions.shellCloses(createPatchWizard.getShell()));
IFile patch = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1).getFile(PATCH_FILE);
byte[] bytes = IO.readFully(patch.getLocation().toFile());
String patchContent = new String(bytes, patch.getCharset());
assertEquals(EXPECTED_PATCH_CONTENT, patchContent);
}
@Test
public void testWorkspaceHeader() throws Exception {
touchAndSubmit("oldContent", null);
touch("newContent");
URI fileLocationUri = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1).getFolder(FOLDER).getFile(FILE2)
.getLocationURI();
FileUtils.delete(new File(fileLocationUri));
IProject secondProject = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ2);
IFile newFile = secondProject.getFile(FILE1);
newFile.create(
new ByteArrayInputStream("Hello, world".getBytes(secondProject
.getDefaultCharset())), false, null);
waitInUI();
CreatePatchWizard createPatchWizard = openCreatePatchWizard();
LocationPage locationPage = createPatchWizard.getLocationPage();
locationPage.selectWorkspace("/" + PROJ1 + "/" + PATCH_FILE);
OptionsPage optionsPage = locationPage.nextToOptionsPage();
optionsPage.setFormat(CoreText.DiffHeaderFormat_Workspace);
createPatchWizard.finish();
bot.waitUntil(Conditions.shellCloses(createPatchWizard.getShell()));
IFile patch = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1).getFile(PATCH_FILE);
byte[] bytes = IO.readFully(patch.getLocation().toFile());
String patchContent = new String(bytes, patch.getCharset());
assertEquals(EXPECTED_WORKSPACE_PATCH_CONTENT, patchContent);
}
private CreatePatchWizard openCreatePatchWizard() throws Exception {
CreatePatchWizard.openWizard(PROJ1, PROJ2);
SWTBotShell shell = bot
.shell(UIText.GitCreatePatchWizard_CreatePatchTitle);
return new CreatePatchWizard(shell);
}
private static void assertClipboard(final String expected) {
final String[] value = { null };
Display.getDefault().syncExec(new Runnable() {
public void run() {
Clipboard clp = new Clipboard(Display.getCurrent());
value[0] = (String) clp.getContents(TextTransfer.getInstance());
clp.dispose();
}
});
assertEquals(expected, value[0]);
}
}
|
