aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java5
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java
index 656f390..5a919c1 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java
@@ -251,7 +251,10 @@ public abstract class AbstractSynchronizeViewTest extends
SWTBotTreeItem folderNode = waitForNodeWithText(projNode, FOLDER);
waitForNodeWithText(folderNode, fileName).doubleClick();
- return bot.editorByTitle(fileName);
+ SWTBotEditor editor = bot.editorByTitle(fileName);
+ // Ensure that both StyledText widgets are enabled
+ editor.toTextEditor().setFocus();
+ return editor;
}
protected SWTBotTreeItem waitForNodeWithText(SWTBotTree tree, String name) {
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java
index 6f810c4..e3a4474 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java
@@ -195,6 +195,8 @@ public class SynchronizeViewGitChangeSetModelTest extends
String outgoingRight = outgoingCompareBot.styledText(1).getText();
outgoingCompare.close();
+ assertNotSame("Text from SWTBot widgets was the same", outgoingLeft, outgoingRight);
+
// when
// compare tag against HEAD
launchSynchronization(SynchronizeWithAction_tagsName, INITIAL_TAG,