[staging view ] commit button enablement

The commit button should be enabled only if there is something to
commit.

Bug: 525685
Change-Id: Ib5915668a0e96786c01e431f685fb4bce13aa613
Signed-off-by: Alexander Nittka <alex@nittka.de>

2 files changed, 46 insertions, 0 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/StagingViewTester.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/StagingViewTester.java
index f08691bcef..f224061fad 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/StagingViewTester.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/StagingViewTester.java
@@ -108,6 +108,24 @@ public class StagingViewTester {
 		jobJoiner.join();
 	}
 
+	public void unStageFile(String path) {
+		SWTBotTree stagedTree = stagingView.bot().tree(1);
+
+		TestUtil.waitUntilTreeHasNodeContainsText(stagingView.bot(), stagedTree,
+				path, 10000);
+
+		TestUtil.getNode(stagedTree.getAllItems(), path).select();
+
+		JobJoiner jobJoiner = JobJoiner.startListening(
+				org.eclipse.egit.core.JobFamilies.INDEX_DIFF_CACHE_UPDATE, 30,
+				TimeUnit.SECONDS);
+
+		ContextMenuHelper.clickContextMenu(stagedTree,
+				UIText.StagingView_UnstageItemMenuLabel);
+
+		jobJoiner.join();
+	}
+
 	public void commit() throws Exception {
 		JobJoiner jobJoiner = JobJoiner.startListening(JobFamilies.COMMIT, 30,
 				TimeUnit.SECONDS);
@@ -166,6 +184,10 @@ public class StagingViewTester {
 		return button.isChecked();
 	}
 
+	public boolean isCommitEnabled() {
+		return stagingView.bot().button(UIText.StagingView_Commit).isEnabled();
+	}
+
 	private void selectToolbarToggle(SWTBotToolbarToggleButton button,
 			boolean select) {
 		if (select) {
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java
index 186b283553..a006ee944c 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java
@@ -50,6 +50,8 @@ public class StagingViewTest extends AbstractStagingViewTestCase {
 		stagingViewTester.commit();
 		TestUtil.checkHeadCommit(repository, TestUtil.TESTAUTHOR,
 				TestUtil.TESTCOMMITTER, "The new commit");
+		assertFalse("Commit Button should be disabled",
+				stagingViewTester.isCommitEnabled());
 	}
 
 	@Test
@@ -387,4 +389,26 @@ public class StagingViewTest extends AbstractStagingViewTestCase {
 						&& commitMessage.contains(expectedCommitter)
 						&& !commitMessage.contains(TestUtil.TESTCOMMITTER));
 	}
+
+	@Test
+	public void testButtonEnablement() throws Exception {
+		StagingViewTester stagingViewTester = StagingViewTester
+				.openStagingView();
+		stagingViewTester.assertCommitEnabled(false);
+
+		setContent("I have changed this");
+		stagingViewTester.assertCommitEnabled(false);
+
+		stagingViewTester.stageFile(FILE1_PATH);
+		stagingViewTester.assertCommitEnabled(true);
+
+		stagingViewTester.unStageFile(FILE1_PATH);
+		stagingViewTester.assertCommitEnabled(false);
+
+		stagingViewTester.setAmend(true);
+		stagingViewTester.assertCommitEnabled(true);
+
+		stagingViewTester.setAmend(false);
+		stagingViewTester.assertCommitEnabled(false);
+	}
 }