Revert "ctf: Fix slow test due to expected timeout"

This reverts commit 55d0eb8e748bcf27d4afc39f5553d419d9b2922a.

This commit broke the staging build. This will need a different
solution.

Change-Id: I53235d4155e680f6400f4e91212234812a9c5dc0
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/65752
Reviewed-by: Hudson CI

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 27f6e4acc8c239e55f9db4f572201dc795dab124..078b84bd12cddb912247f69e4a70caa270338358 100644 (file)
--- 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,7 +27,6 @@ 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 63e8406cb8171180a46ddf90b2de6d214d76e448..8aabb21db37d62e49ac8627dc6ec8c1b7b8a4c4f 100644 (file)
--- 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,7 +13,6 @@
 
 package org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests;
 
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withLabel;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -41,6 +40,7 @@ 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,7 +54,6 @@ 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;
@@ -522,10 +521,8 @@ public class StandardImportAndReadSmokeTest extends AbstractImportAndReadSmokeTe
         fBot.button("Next >").click();
         fBot.button("&Deselect All").click();
         try {
-            String resolveLinkedResLabel = "Resolve and export linked resources";
-            fBot.waitUntil(Conditions.waitForWidget(withLabel(resolveLinkedResLabel)), 100);
-            fBot.checkBox(resolveLinkedResLabel).select();
-        } catch (TimeoutException e) {
+            fBot.checkBox("Resolve and export linked resources").select();
+        } catch (WidgetNotFoundException e) {
             // Ignore, doesn't exist pre-4.6M5
         }