lttng: Avoid exposing internal class in shared tests

The VirtualMachineExperiment is internal, the shared test
utilities, which are made public, should not expose this
concept. Use a TmfExperiment, which is a public TMF concept
instead.

Change-Id: Id02891b77abf45ffc95e3c212ce62f759178e493
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/46961

diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/shared/org/eclipse/tracecompass/lttng2/lttng/kernel/core/tests/shared/vm/VmTestExperiment.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/shared/org/eclipse/tracecompass/lttng2/lttng/kernel/core/tests/shared/vm/VmTestExperiment.java
index cad3099a4149648cf8df42daeb7dd73cd9501304..8fe186971cf5629f098a52dd254499677f4027ff 100644 (file)
--- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/shared/org/eclipse/tracecompass/lttng2/lttng/kernel/core/tests/shared/vm/VmTestExperiment.java
+++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/shared/org/eclipse/tracecompass/lttng2/lttng/kernel/core/tests/shared/vm/VmTestExperiment.java
@@ -20,6 +20,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.trace.VirtualMachineExperiment;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager;
+import org.eclipse.tracecompass.tmf.core.trace.experiment.TmfExperiment;
 
 /**
  * List virtual machine experiments that can be used in unit tests
@@ -57,7 +58,7 @@ public enum VmTestExperiment {
      * @return A VirtualMachineExperiment object corresponding to this
      *         experiment
      */
-    public synchronized VirtualMachineExperiment getExperiment(boolean deleteSuppFiles) {
+    public synchronized TmfExperiment getExperiment(boolean deleteSuppFiles) {
         Set<ITmfTrace> traces = new HashSet<>();
         for (VmTraces trace : fTraces) {
             traces.add(trace.getTrace());

diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/vm/VirtualMachineAnalysisTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/vm/VirtualMachineAnalysisTest.java
index 499b14e0e5ed96eeb348e078f9acd09fb6fac334..e5cd79b54271006348d2900efd94e348e29f2faa 100644 (file)
--- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/vm/VirtualMachineAnalysisTest.java
+++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/vm/VirtualMachineAnalysisTest.java
@@ -26,7 +26,6 @@ import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.KernelAnal
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.VcpuStateValues;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.VmAttributes;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.module.VirtualMachineCpuAnalysis;
-import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.trace.VirtualMachineExperiment;
 import org.eclipse.tracecompass.lttng2.lttng.kernel.core.tests.shared.vm.VmTestExperiment;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.StateSystemUtils;
@@ -39,6 +38,7 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
+import org.eclipse.tracecompass.tmf.core.trace.experiment.TmfExperiment;
 import org.junit.Test;
 
 import com.google.common.collect.Multimap;
@@ -84,7 +84,7 @@ public class VirtualMachineAnalysisTest {
     public void testStubTracesOneQemuKvm() {
 
         assumeTrue(VmTestExperiment.ONE_QEMUKVM.exists());
-        VirtualMachineExperiment experiment = VmTestExperiment.ONE_QEMUKVM.getExperiment(true);
+        TmfExperiment experiment = VmTestExperiment.ONE_QEMUKVM.getExperiment(true);
 
         /* Open the traces */
         for (ITmfTrace trace : experiment.getTraces()) {