From 13e9acb6da3433da3a8c319041afb8f8486ba3b2 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 28 Jan 2016 23:10:52 -0500 Subject: [PATCH] ctf: Fix StandardImportAndReadSmokeTest on Eclipse 4.6M5 The export dialog changed and doesn't include linked resources anymore. However, there is a checkbox that displays them again. See bug 355049 Change-Id: Ibbdf33839653127f15efd07ad72f887b6ba21697 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/65424 Reviewed-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- .../META-INF/MANIFEST.MF | 1 + .../ctf/ui/swtbot/tests/StandardImportAndReadSmokeTest.java | 6 ++++++ 2 files changed, 7 insertions(+) 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 92940048fe..078b84bd12 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 @@ -24,6 +24,7 @@ Import-Package: org.apache.log4j, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.widgets, org.eclipse.swtbot.swt.finder, + org.eclipse.swtbot.swt.finder.exceptions, org.eclipse.swtbot.swt.finder.finders, org.eclipse.swtbot.swt.finder.junit, org.eclipse.swtbot.swt.finder.results, 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 44c8c34885..8aabb21db3 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 @@ -40,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; @@ -519,6 +520,11 @@ public class StandardImportAndReadSmokeTest extends AbstractImportAndReadSmokeTe treeItem.select(); fBot.button("Next >").click(); fBot.button("&Deselect All").click(); + try { + fBot.checkBox("Resolve and export linked resources").select(); + } catch (WidgetNotFoundException e) { + // Ignore, doesn't exist pre-4.6M5 + } if (sourceResource instanceof IFile) { String[] folderPath = exportedPath.removeLastSegments(1).segments(); -- 2.34.1