xml: Use the base trace for provider's invalid tests

This should fix the Hudson job failing sometimes

Change-Id: I72b3fd76d1a4d09c633a7bf79c934787c240eeb6
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/91159
Reviewed-by: Hudson CI
Reviewed-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Tested-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/PatternProvidersTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/PatternProvidersTest.java
index 50aadae5ee0752899b9dd793f18c4af7569462ca..361c09748a872ab5ee18d7f7019d670fde041852 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/PatternProvidersTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/PatternProvidersTest.java
@@ -22,7 +22,7 @@ import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
 import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.tests.common.TmfXmlTestFiles;
-import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.junit.Test;
 
 /**
@@ -38,11 +38,13 @@ public class PatternProvidersTest extends XmlProviderTestBase {
      */
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidInput() {
-        assertNotNull(new XmlPatternStateProvider(CtfTmfTestTraceUtils.getTrace(getTrace()), "Bla", Path.fromOSString(""), (@NonNull ISegment segment) -> { }));
+        ITmfTrace trace = getTrace();
+        assertNotNull(trace);
+        assertNotNull(new XmlPatternStateProvider(trace, "Bla", Path.fromOSString(""), (@NonNull ISegment segment) -> { }));
     }
 
     @Override
-    protected CtfTestTrace getTrace() {
+    protected CtfTestTrace getTestTrace() {
         return CtfTestTrace.ARM_64_BIT_HEADER;
     }
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderTest.java
index 7027d88479d79e326739d31489f7207b80022378..c4caaab6d64b1cfa71ec336e000280ca837c12cf 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/StateProviderTest.java
@@ -19,7 +19,7 @@ import org.eclipse.tracecompass.internal.tmf.analysis.xml.core.stateprovider.Tmf
 import org.eclipse.tracecompass.internal.tmf.analysis.xml.core.stateprovider.XmlStateProvider;
 import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.tests.common.TmfXmlTestFiles;
-import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.junit.Test;
 
 /**
@@ -37,7 +37,9 @@ public class StateProviderTest extends XmlProviderTestBase {
      */
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidInput() {
-        assertNotNull(new XmlStateProvider(CtfTmfTestTraceUtils.getTrace(getTrace()), "Bla", Path.fromOSString("")));
+        ITmfTrace trace = getTrace();
+        assertNotNull(trace);
+        assertNotNull(new XmlStateProvider(trace, "Bla", Path.fromOSString("")));
     }
 
     @Override
@@ -51,7 +53,7 @@ public class StateProviderTest extends XmlProviderTestBase {
     }
 
     @Override
-    protected @NonNull CtfTestTrace getTrace() {
+    protected @NonNull CtfTestTrace getTestTrace() {
         return CtfTestTrace.KERNEL;
     }
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/XmlProviderTestBase.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/XmlProviderTestBase.java
index 4655bf356b8c314ba37bcfa035ee2a51d0d0e3b7..c84bde062db93c96255af79c2c287eaa9ec6edcf 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/XmlProviderTestBase.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/stateprovider/XmlProviderTestBase.java
@@ -52,7 +52,7 @@ public abstract class XmlProviderTestBase {
     @Before
     public void setupTest() {
         /* Initialize the trace */
-        ITmfTrace trace = CtfTmfTestTraceUtils.getTrace(getTrace());
+        ITmfTrace trace = CtfTmfTestTraceUtils.getTrace(getTestTrace());
         fTrace = trace;
 
         /* Initialize the state provider module */
@@ -94,7 +94,7 @@ public abstract class XmlProviderTestBase {
     @After
     public void cleanup() {
         fModule.dispose();
-        CtfTmfTestTraceUtils.dispose(getTrace());
+        CtfTmfTestTraceUtils.dispose(getTestTrace());
     }
 
     /**
@@ -116,7 +116,16 @@ public abstract class XmlProviderTestBase {
      *
      * @return The trace
      */
-    protected abstract @NonNull CtfTestTrace getTrace();
+    protected abstract @NonNull CtfTestTrace getTestTrace();
+
+    /**
+     * Get the trace to use for the tests
+     *
+     * @return The instance of the the test trace
+     */
+    protected ITmfTrace getTrace() {
+        return fTrace;
+    }
 
     /**
      * Cleanup after the test