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
|
/*******************************************************************************
* Copyright (c) 2012, 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 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mathias Kinzler (SAP AG) - initial implementation
*******************************************************************************/
package org.eclipse.egit.ui.test.team.actions;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import java.io.File;
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
import org.eclipse.egit.ui.JobFamilies;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.test.ContextMenuHelper;
import org.eclipse.egit.ui.test.JobJoiner;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
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.SWTBotTree;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Tests for the Replace With actions
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class ReplaceActionsTest extends LocalRepositoryTestCase {
private File repositoryFile;
@Before
public void setup() throws Exception {
repositoryFile = createProjectAndCommitToRepository();
}
@Test
public void testReplaceWithPrevious() throws Exception {
touchAndSubmit(null);
String initialContent = getTestFileContent();
String menuLabel = util
.getPluginLocalizedValue(
"ReplaceWithPreviousVersionAction.label");
clickReplaceWith(menuLabel);
SWTBotShell confirm = bot
.shell(UIText.DiscardChangesAction_confirmActionTitle);
executeReplace(confirm,
UIText.DiscardChangesAction_discardChangesButtonText);
String replacedContent = getTestFileContent();
assertThat(replacedContent, not(initialContent));
}
@Test
public void testReplaceWithPreviousWithMerge() throws Exception {
Repository repo = lookupRepository(repositoryFile);
try (Git git = new Git(repo)) {
Calendar cal = Calendar.getInstance();
long time = cal.getTime().getTime();
PersonIdent sideCommitter = new PersonIdent("Side Committer",
"side@example.org", time, 0);
// Make sure commit time stamps are different, otherwise the order
// in the dialog is not stable
time += 5000;
PersonIdent masterCommitter = new PersonIdent("Master Committer",
"master@example.org", time, 0);
git.checkout().setCreateBranch(true).setName("side").call();
touch(PROJ1, "folder/test.txt", "side");
RevCommit sideCommit = git.commit().setAll(true)
.setMessage("Side commit").setCommitter(sideCommitter)
.call();
git.checkout().setName("master").call();
touch(PROJ1, "folder/test2.txt", "master");
git.commit().setAll(true).setMessage("Master commit")
.setCommitter(masterCommitter).call();
git.merge().include(sideCommit).call();
}
TestUtil.waitForJobs(100, 5000);
String contentAfterMerge = getTestFileContent();
assertEquals("side", contentAfterMerge);
String menuLabel = util
.getPluginLocalizedValue(
"ReplaceWithPreviousVersionAction.label");
clickReplaceWith(menuLabel);
bot.shell(UIText.DiscardChangesAction_confirmActionTitle).bot()
.button(UIText.DiscardChangesAction_discardChangesButtonText)
.click();
SWTBotShell selectDialog = bot
.shell(UIText.CommitSelectDialog_WindowTitle);
assertEquals(2, selectDialog.bot().table().rowCount());
selectDialog.close();
TestUtil.processUIEvents();
// we have closed, so nothing should have changed
String contentAfterClose = getTestFileContent();
assertEquals(contentAfterMerge, contentAfterClose);
clickReplaceWith(menuLabel);
bot.shell(UIText.DiscardChangesAction_confirmActionTitle).bot()
.button(UIText.DiscardChangesAction_discardChangesButtonText)
.click();
TestUtil.waitForJobs(100, 5000);
selectDialog = bot.shell(UIText.CommitSelectDialog_WindowTitle);
// Select first parent, which should be the master commit
SWTBotTable table = selectDialog.bot().table();
assertEquals("Master commit", table.cell(0, 1));
table.select(0);
executeReplace(selectDialog, IDialogConstants.OK_LABEL);
TestUtil.waitForJobs(100, 5000);
String replacedContent = getTestFileContent();
assertThat(replacedContent, not(contentAfterMerge));
}
private void clickReplaceWith(String menuLabel) {
SWTBotTree projectExplorerTree = TestUtil.getExplorerTree();
getProjectItem(projectExplorerTree, PROJ1).select();
ContextMenuHelper.clickContextMenu(projectExplorerTree, "Replace With",
menuLabel);
}
private void executeReplace(SWTBotShell dialog, String buttonLabel) {
JobJoiner jobJoiner = JobJoiner.startListening(
JobFamilies.DISCARD_CHANGES, 30, TimeUnit.SECONDS);
dialog.bot()
.button(buttonLabel)
.click();
jobJoiner.join();
}
}
|
