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
|
/*******************************************************************************
* Copyright (C) 2011, 2014 Jens Baumgart <jens.baumgart@sap.com> 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.stagview;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import org.eclipse.egit.core.JobFamilies;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.common.StagingViewTester;
import org.eclipse.egit.ui.internal.repository.RepositoriesView;
import org.eclipse.egit.ui.internal.staging.StagingView;
import org.eclipse.egit.ui.test.CommitMessageUtil;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.egit.ui.view.repositories.GitRepositoriesViewTestUtils;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryState;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class StagingViewTest extends LocalRepositoryTestCase {
private static final GitRepositoriesViewTestUtils repoViewUtil = new GitRepositoriesViewTestUtils();
private File repositoryFile;
private Repository repository;
@Before
public void before() throws Exception {
repositoryFile = createProjectAndCommitToRepository();
repository = lookupRepository(repositoryFile);
TestUtil.configureTestCommitterAsUser(repository);
Activator.getDefault().getRepositoryUtil()
.addConfiguredRepository(repositoryFile);
selectRepositoryNode();
}
@After
public void after() {
TestUtil.hideView(RepositoriesView.VIEW_ID);
TestUtil.hideView(StagingView.VIEW_ID);
Activator.getDefault().getRepositoryUtil().removeDir(repositoryFile);
}
@Test
public void testCommitSingleFile() throws Exception {
setContent("I have changed this");
StagingViewTester stagingViewTester = StagingViewTester
.openStagingView();
stagingViewTester.stageFile(FILE1_PATH);
stagingViewTester.setAuthor(TestUtil.TESTAUTHOR);
stagingViewTester.setCommitter(TestUtil.TESTCOMMITTER);
stagingViewTester.setCommitMessage("The new commit");
stagingViewTester.commit();
TestUtil.checkHeadCommit(repository, TestUtil.TESTAUTHOR,
TestUtil.TESTCOMMITTER, "The new commit");
}
@Test
public void testAmend() throws Exception {
RevCommit oldHeadCommit = TestUtil.getHeadCommit(repository);
commitOneFileChange("Yet another Change");
RevCommit headCommit = TestUtil.getHeadCommit(repository);
ObjectId headCommitId = headCommit.getId();
String changeId = CommitMessageUtil.extractChangeId(headCommit
.getFullMessage());
setContent("Changes over changes");
StagingViewTester stagingViewTester = StagingViewTester
.openStagingView();
stagingViewTester.stageFile(FILE1_PATH);
stagingViewTester.setAmend(true);
assertTrue(stagingViewTester.getCommitMessage().indexOf("Change-Id") > 0);
assertTrue(stagingViewTester.getCommitMessage()
.indexOf("Signed-off-by") > 0);
assertTrue(stagingViewTester.getSignedOff());
assertTrue(stagingViewTester.getInsertChangeId());
stagingViewTester.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 testMergeConflict() throws Exception {
try (Git git = new Git(repository)) {
git.checkout().setCreateBranch(true).setName("side").call();
commitOneFileChange("on side");
git.checkout().setName("master").call();
commitOneFileChange("on master");
git.merge().include(repository.findRef("side")).call();
}
assertEquals(RepositoryState.MERGING, repository.getRepositoryState());
StagingViewTester stagingView = StagingViewTester
.openStagingView();
assertEquals("", stagingView.getCommitMessage());
stagingView.assertCommitEnabled(false);
setContent("resolved");
stagingView.stageFile(FILE1_PATH);
assertEquals(RepositoryState.MERGING_RESOLVED,
repository.getRepositoryState());
String expectedMessage = "Merge branch 'side'";
assertThat(stagingView.getCommitMessage(), startsWith(expectedMessage));
stagingView.commit();
assertEquals(RepositoryState.SAFE, repository.getRepositoryState());
assertEquals(expectedMessage, TestUtil.getHeadCommit(repository)
.getShortMessage());
}
private void commitOneFileChange(String fileContent) throws Exception {
setContent(fileContent);
StagingViewTester stagingViewTester = StagingViewTester
.openStagingView();
stagingViewTester.stageFile(FILE1_PATH);
stagingViewTester.setAuthor(TestUtil.TESTAUTHOR);
stagingViewTester.setCommitter(TestUtil.TESTCOMMITTER);
stagingViewTester.setCommitMessage("Commit message");
stagingViewTester.setInsertChangeId(true);
stagingViewTester.setSignedOff(true);
String commitMessage = stagingViewTester.getCommitMessage();
assertTrue(commitMessage.indexOf("Change-Id") > 0);
assertTrue(commitMessage.indexOf("Signed-off-by") > 0);
stagingViewTester.commit();
}
private void setContent(String content) throws Exception {
setTestFileContent(content);
TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
}
private void selectRepositoryNode() throws Exception {
SWTBotView repositoriesView = TestUtil
.showView(RepositoriesView.VIEW_ID);
SWTBotTree tree = repositoriesView.bot().tree();
SWTBotTreeItem repoNode = repoViewUtil
.getRootItem(tree, repositoryFile);
repoNode.select();
}
}
|
