From fa74050c5feaefdcdb3353511f7130feef964a68 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 3 Mar 2016 18:25:58 -0500 Subject: [PATCH] Revert "Revert "ctf: Fix slow test due to expected timeout"" This reverts commit 1ae81c23b427deeec3266e4755e9122ddcd0cf81. This almost worked before but it needed to use withMnemonic not withLabel! Original message: The test was looking for a possible checkbox (in 4.6) but when it it was not there (4.5) it had to wait 50 secs for it to time out. Instead we can set a very short timeout because it will instantly either be there or not. Change-Id: I84f6db70a323611b1adb93c6d9b55801bbeb7444 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/67782 Reviewed-by: Hudson CI Reviewed-by: Patrick Tasse Tested-by: Patrick Tasse --- .../META-INF/MANIFEST.MF | 1 + .../ui/swtbot/tests/StandardImportAndReadSmokeTest.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF index 078b84bd12..27f6e4acc8 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -27,6 +27,7 @@ Import-Package: org.apache.log4j, org.eclipse.swtbot.swt.finder.exceptions, org.eclipse.swtbot.swt.finder.finders, org.eclipse.swtbot.swt.finder.junit, + org.eclipse.swtbot.swt.finder.matchers, org.eclipse.swtbot.swt.finder.results, org.eclipse.swtbot.swt.finder.utils, org.eclipse.swtbot.swt.finder.waits, diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/StandardImportAndReadSmokeTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/StandardImportAndReadSmokeTest.java index 8aabb21db3..7e6275e912 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/StandardImportAndReadSmokeTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/StandardImportAndReadSmokeTest.java @@ -13,6 +13,7 @@ package org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -40,7 +41,6 @@ import org.eclipse.core.runtime.URIUtil; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.results.VoidResult; @@ -54,6 +54,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.eclipse.swtbot.swt.finder.widgets.TimeoutException; import org.eclipse.tracecompass.internal.tmf.ui.project.wizards.importtrace.ImportTraceWizard; import org.eclipse.tracecompass.internal.tmf.ui.project.wizards.importtrace.ImportTraceWizardPage; import org.eclipse.tracecompass.internal.tmf.ui.project.wizards.importtrace.Messages; @@ -521,8 +522,10 @@ public class StandardImportAndReadSmokeTest extends AbstractImportAndReadSmokeTe fBot.button("Next >").click(); fBot.button("&Deselect All").click(); try { - fBot.checkBox("Resolve and export linked resources").select(); - } catch (WidgetNotFoundException e) { + String resolveLinkedResLabel = "Resolve and export linked resources"; + fBot.waitUntil(Conditions.waitForWidget(withMnemonic(resolveLinkedResLabel)), 100); + fBot.checkBox(resolveLinkedResLabel).select(); + } catch (TimeoutException e) { // Ignore, doesn't exist pre-4.6M5 } -- 2.34.1