[sync] Fixes for UI test after change #2276

Change-Id: I4901cc7575988a1c6417473c75b97f3ccd695a96
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>

1 files changed, 17 insertions, 8 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewTest.java
index 68ac15341a..51c2d08537 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewTest.java
@@ -48,6 +48,11 @@ public class SynchronizeViewTest extends LocalRepositoryTestCase {
 		bot.shell("Synchronize repository: " + REPO1 + File.separator + ".git")
 				.activate();
 
+		// we need to disable 'Include local changes'
+		bot.checkBox(
+				UIText.SelectSynchronizeResourceDialog_includeUncommitedChanges)
+				.click();
+
 		bot.comboBox(0)
 				.setSelection(UIText.SynchronizeWithAction_localRepoName);
 		bot.comboBox(1).setSelection(HEAD);
@@ -56,8 +61,6 @@ public class SynchronizeViewTest extends LocalRepositoryTestCase {
 				.setSelection(UIText.SynchronizeWithAction_localRepoName);
 		bot.comboBox(3).setSelection(MASTER);
 
-		// do not check 'Include local changes'
-
 		// fire action
 		bot.button(IDialogConstants.OK_LABEL).click();
 
@@ -78,17 +81,12 @@ public class SynchronizeViewTest extends LocalRepositoryTestCase {
 		bot.shell("Synchronize repository: " + REPO1 + File.separator + ".git")
 				.activate();
 
-		bot.comboBox(0)
-				.setSelection(UIText.SynchronizeWithAction_localRepoName);
-		bot.comboBox(1).setSelection(HEAD);
+		// include local changes are enabled by default
 
 		bot.comboBox(2)
 				.setSelection(UIText.SynchronizeWithAction_localRepoName);
 		bot.comboBox(3).setSelection(MASTER);
 
-		// include local changes
-		bot.checkBox("Include local uncommited changes in comparison").click();
-
 		// fire action
 		bot.button(IDialogConstants.OK_LABEL).click();
 		bot.sleep(1000);
@@ -114,6 +112,11 @@ public class SynchronizeViewTest extends LocalRepositoryTestCase {
 		bot.shell("Synchronize repository: " + REPO1 + File.separator + ".git")
 				.activate();
 
+		// we need to disable 'Include local changes'
+		bot.checkBox(
+				UIText.SelectSynchronizeResourceDialog_includeUncommitedChanges)
+				.click();
+
 		bot.comboBox(0)
 				.setSelection(UIText.SynchronizeWithAction_localRepoName);
 		bot.comboBox(1).setSelection("v0.0");
@@ -148,6 +151,11 @@ public class SynchronizeViewTest extends LocalRepositoryTestCase {
 		bot.shell("Synchronize repository: " + REPO1 + File.separator + ".git")
 				.activate();
 
+		// we need to disable 'Include local changes'
+		bot.checkBox(
+				UIText.SelectSynchronizeResourceDialog_includeUncommitedChanges)
+				.click();
+
 		bot.comboBox(0)
 				.setSelection(UIText.SynchronizeWithAction_localRepoName);
 		bot.comboBox(1).setSelection("v0.1");
@@ -310,6 +318,7 @@ public class SynchronizeViewTest extends LocalRepositoryTestCase {
 	}
 
 	private void showDialog(String projectName, String... cmd) {
+		bot.activeView();
 		SWTBot packageExplorerBot = bot.viewByTitle("Package Explorer").bot();
 		packageExplorerBot.activeShell();
 		SWTBotTree tree = packageExplorerBot.tree();