From 642f1a8ec1cb0252451ed4bc7019a06d51403548 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 7 Jul 2015 19:11:39 -0400 Subject: [PATCH] tmf: Fix StandardImportGzipTraceTest failing when running from RunAllSWTBotTests StandardImportGzipTraceTest should delete its test project. Otherwise, other tests using the same project name "Tracing" will fail to run. Also fix path in TmfTestTrace for the test to work. Change-Id: I908e9aaded2b47762ee07b36384257545d680300 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/51534 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Matthew Khouzam --- .../tracecompass/tmf/core/tests/shared/TmfTestTrace.java | 2 +- .../tests/wizards/StandardImportGzipTraceTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/shared/org/eclipse/tracecompass/tmf/core/tests/shared/TmfTestTrace.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/shared/org/eclipse/tracecompass/tmf/core/tests/shared/TmfTestTrace.java index f89bd504b6..71bc101c27 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/shared/org/eclipse/tracecompass/tmf/core/tests/shared/TmfTestTrace.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/shared/org/eclipse/tracecompass/tmf/core/tests/shared/TmfTestTrace.java @@ -45,7 +45,7 @@ public enum TmfTestTrace { R_TEST_10K("R-Test-10K"); private final @NonNull String fPath; - private final String fDirectory = "../org.eclipse.tracecompass.tmf.core.tests/testfiles"; + private final String fDirectory = "../../tmf/org.eclipse.tracecompass.tmf.core.tests/testfiles"; private ITmfTrace fTrace = null; private TmfTestTrace(@NonNull String file) { diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java index a070b9100c..e962e797ba 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java @@ -54,6 +54,7 @@ import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; +import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -104,6 +105,14 @@ public class StandardImportGzipTraceTest { fLogger.removeAllAppenders(); } + /** + * Tear down the test + */ + @After + public void tearDown() { + SWTBotUtils.deleteProject(PROJECT_NAME, fBot); + } + private void createProject() { fBot = new SWTWorkbenchBot(); /* Close welcome view */ -- 2.34.1