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
|
/*******************************************************************************
* Copyright (C) 2011, 2013 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.team.actions;
import static org.junit.Assert.assertEquals;
import java.io.File;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.egit.ui.Activator;
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.internal.repository.RepositoriesView;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.lib.Repository;
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.SWTBotToolbarToggleButton;
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;
/**
* Tests for the Team->Commit action
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class CommitNonWSChangesTest extends LocalRepositoryTestCase {
private File repositoryFile;
private Repository repository;
@Before
public void setup() throws Exception {
repositoryFile = createProjectAndCommitToRepository();
Activator.getDefault().getRepositoryUtil()
.addConfiguredRepository(repositoryFile);
repository = org.eclipse.egit.core.Activator.getDefault()
.getRepositoryCache().lookupRepository(repositoryFile);
}
@Test
public void testCommitDeletedProject() throws Exception {
IProject project = ResourcesPlugin.getWorkspace().getRoot()
.getProject(PROJ1);
project.delete(true, false, null);
clickOnCommit();
SWTBotShell commitDialog = bot.shell(UIText.CommitDialog_CommitChanges);
SWTBotToolbarToggleButton showUntracked = commitDialog.bot()
.toolbarToggleButtonWithTooltip(
UIText.CommitDialog_ShowUntrackedFiles);
if (!showUntracked.isChecked())
showUntracked.select();
SWTBotTree tree = commitDialog.bot().tree();
assertEquals("Wrong row count", 4, tree.rowCount());
assertTreeLineContent(tree, 0, "GeneralProject/.project");
assertTreeLineContent(tree, 1, "GeneralProject/folder/test.txt");
assertTreeLineContent(tree, 2, "GeneralProject/folder/test2.txt");
assertTreeLineContent(tree, 3, "ProjectWithoutDotProject/.project");
commitDialog.bot().textWithLabel(UIText.CommitDialog_Author)
.setText(TestUtil.TESTAUTHOR);
commitDialog.bot().textWithLabel(UIText.CommitDialog_Committer)
.setText(TestUtil.TESTCOMMITTER);
commitDialog.bot()
.styledTextWithLabel(UIText.CommitDialog_CommitMessage)
.setText("Delete Project GeneralProject");
selectAllCheckboxes(tree);
commitDialog.bot().button(UIText.CommitDialog_Commit).click();
// wait until commit is completed
Job.getJobManager().join(JobFamilies.COMMIT, null);
String[] paths = { "ProjectWithoutDotProject/.project",
"ProjectWithoutDotProject/folder/test.txt",
"ProjectWithoutDotProject/folder/test2.txt" };
TestUtil.assertRepositoryContainsFiles(repository, paths);
// check there is nothing to commit
clickOnCommit();
bot.shell(UIText.CommitAction_noFilesToCommit).bot()
.button(IDialogConstants.NO_LABEL).click();
}
private void assertTreeLineContent(SWTBotTree tree, int rowIndex,
String file) {
SWTBotTreeItem treeItem = tree.getAllItems()[rowIndex];
assertEquals(file, treeItem.cell(1));
}
private void selectAllCheckboxes(SWTBotTree tree) {
for (int i = 0; i < tree.rowCount(); i++) {
tree.getAllItems()[i].check();
}
}
private void clickOnCommit() throws Exception {
SWTBotView repoView = TestUtil.showView(RepositoriesView.VIEW_ID);
SWTBotTree tree = repoView.bot().tree();
TestUtil.waitUntilTreeHasNodeContainsText(bot, tree, REPO1, 10000);
tree.getAllItems()[0].contextMenu("Commit...").click();
}
}
|
