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 <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/51534
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

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 f89bd504b6f3c87d3c99f1a637200f4a9f90e2c8..71bc101c27152163d1bf51898f729a7a0dc79162 100644 (file)
--- 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 a070b9100c8f50b15fdba2759cfddd52eed16e22..e962e797ba603b7333ae5cdb595141f02aee17f0 100644 (file)
--- 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 */