Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-07-07 22:30:48 +0000
committerAndrey Loskutov2015-07-07 22:30:48 +0000
commitd459570fcb527de78697ec19b027aeaf00c08717 (patch)
tree4d3df5dcb266637afee0739bfc7fb23466a38acf /org.eclipse.egit.ui.test
parent46c8482afb0a71c69d261239bd4e04806a31b094 (diff)
downloadegit-d459570fcb527de78697ec19b027aeaf00c08717.tar.gz
egit-d459570fcb527de78697ec19b027aeaf00c08717.tar.xz
egit-d459570fcb527de78697ec19b027aeaf00c08717.zip
Test stability: GlobalConfigurationPageTest swtbot workarounds
Check result from the editor component, which might cause sporadic NPE's because of swt bot bug 472110. Change-Id: Ieacda0d11493e065ead0040078c506ee0ae016ad Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/prefpages/configuration/GlobalConfigurationPageTest.java5
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/Eclipse.java1
2 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/prefpages/configuration/GlobalConfigurationPageTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/prefpages/configuration/GlobalConfigurationPageTest.java
index 988179ba60..590109903a 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/prefpages/configuration/GlobalConfigurationPageTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/prefpages/configuration/GlobalConfigurationPageTest.java
@@ -83,8 +83,10 @@ public class GlobalConfigurationPageTest {
@After
public void after() throws Exception {
- if (preferencePage != null)
+ if (preferencePage != null) {
preferencePage.close();
+ }
+ TestUtil.processUIEvents();
}
@AfterClass
@@ -93,6 +95,7 @@ public class GlobalConfigurationPageTest {
SWTBotShell preferencePage = new Eclipse().openPreferencePage(null);
preferencePage.bot().tree(0).getTreeItem("General").select();
preferencePage.bot().button(IDialogConstants.OK_LABEL).click();
+ TestUtil.processUIEvents();
}
@Test
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/Eclipse.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/Eclipse.java
index e383a1b7c0..669a330410 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/Eclipse.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/Eclipse.java
@@ -91,6 +91,7 @@ public class Eclipse {
}
});
+ TestUtil.processUIEvents();
return bot.shell("Preferences").activate();
}

Back to the top