tmf: Make CtfTmfTestTrace null-friendly

Change-Id: I1450151fa8562ea52f66e7f1ad67c66c4bd354f9
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/27307
Tested-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

4 files changed, 16 insertions, 14 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java
index d49c8e8da1..497ede6967 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java
@@ -98,6 +98,7 @@ public class LttngKernelAnalysisTest {
     @Test
     public void testCanExecute() {
         /* Test with a valid kernel trace */
+        assertNotNull(fTrace);
         assertTrue(fKernelAnalysisModule.canExecute(fTrace));
 
         /* Test with a CTF trace that does not have required events */
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
index aa45b0d3e8..5a10fc162f 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
@@ -235,9 +235,6 @@ public class ImportAndReadKernelSmokeTest {
 
     private static CtfTmfEvent getEvent(int rank) {
         CtfTmfTrace trace = CtfTmfTestTrace.SYNTHETIC_TRACE.getTrace();
-        if (trace == null) {
-            return null;
-        }
         ITmfContext ctx = trace.seekEvent(0);
         for (int i = 0; i < rank; i++) {
             trace.getNext(ctx);
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/shared/org/eclipse/linuxtools/tmf/ctf/core/tests/shared/CtfTmfTestTrace.java b/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/shared/org/eclipse/linuxtools/tmf/ctf/core/tests/shared/CtfTmfTestTrace.java
index fbf58b091d..658c42b19c 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/shared/org/eclipse/linuxtools/tmf/ctf/core/tests/shared/CtfTmfTestTrace.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/shared/org/eclipse/linuxtools/tmf/ctf/core/tests/shared/CtfTmfTestTrace.java
@@ -12,6 +12,9 @@
 
 package org.eclipse.linuxtools.tmf.ctf.core.tests.shared;
 
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.linuxtools.ctf.core.tests.shared.CtfTestTrace;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.ctf.core.CtfTmfEvent;
@@ -26,6 +29,7 @@ import org.eclipse.linuxtools.tmf.ctf.core.tests.stubs.CtfTmfTraceStub;
  *
  * @author Alexandre Montplaisir
  */
+@NonNullByDefault
 public enum CtfTmfTestTrace {
     /** Example kernel trace */
     KERNEL,
@@ -50,11 +54,12 @@ public enum CtfTmfTestTrace {
 
 
     private final String fPath;
-    private CtfTmfTraceStub fTrace = null;
+    private @Nullable CtfTmfTraceStub fTrace = null;
 
     private CtfTmfTestTrace() {
-        /* This makes my head spin */
-        fPath = CtfTestTrace.valueOf(this.name()).getPath();
+        @SuppressWarnings("null")
+        @NonNull String path = CtfTestTrace.valueOf(this.name()).getPath();
+        fPath = path;
     }
 
     /**
@@ -76,17 +81,19 @@ public enum CtfTmfTestTrace {
      * @return A CtfTmfTrace reference to this trace
      */
     public synchronized CtfTmfTrace getTrace() {
-        if (fTrace != null) {
-            fTrace.close();
+        CtfTmfTraceStub trace = fTrace;
+        if (trace != null) {
+            trace.close();
         }
-        fTrace = new CtfTmfTraceStub();
+        trace = new CtfTmfTraceStub();
         try {
-            fTrace.initTrace(null, fPath, CtfTmfEvent.class);
+            trace.initTrace(null, fPath, CtfTmfEvent.class);
         } catch (TmfTraceException e) {
             /* Should not happen if tracesExist() passed */
             throw new RuntimeException(e);
         }
-        return fTrace;
+        fTrace = trace;
+        return trace;
     }
 
     /**
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/src/org/eclipse/linuxtools/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java b/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/src/org/eclipse/linuxtools/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
index a9c6054186..a23b8f4941 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/src/org/eclipse/linuxtools/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/src/org/eclipse/linuxtools/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
@@ -311,9 +311,6 @@ public abstract class AbstractImportAndReadSmokeTest {
      */
     protected CtfTmfEvent getEvent(int rank) {
         CtfTmfTrace trace = fTrace.getTrace();
-        if (trace == null) {
-            return null;
-        }
         ITmfContext ctx = trace.seekEvent(0);
         for (int i = 0; i < rank; i++) {
             trace.getNext(ctx);