lttng: fix JUnit tests failures introduced by commit 44908fc1

Change-Id: I3b9e71360e53c4e1f3df2a8d78d53b3a240b50b2
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/15682
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

3 files changed, 5 insertions, 5 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java b/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java
index b37357aa70..8c85058eec 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java
@@ -80,7 +80,7 @@ public class ChannelInfoTest {
         assertEquals(0, result.getSwitchTimer());
         assertEquals(0, result.getMaxSizeTraceFiles());
         assertEquals(0, result.getMaxNumberTraceFiles());
-        assertEquals(false, result.getBufferType());
+        assertEquals(BufferType.BUFFER_TYPE_UNKNOWN, result.getBufferType());
     }
 
     /**
diff --git a/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java b/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
index 1afcbfa587..b0d0299fe9 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
@@ -76,7 +76,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     /**
      * The value of buffer type
      */
-    private BufferType fBufferType;
+    private BufferType fBufferType = BufferType.BUFFER_TYPE_UNKNOWN;
 
 
     // ------------------------------------------------------------------------
@@ -301,7 +301,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
             output.append(fReadTimer);
             output.append(",output=");
             output.append(fOutputType);
-            if (!fBufferType.equals(BufferType.BUFFER_TYPE_UNKNOWN) && !fBufferType.equals(BufferType.BUFFER_SHARED)) {
+            if ((fBufferType != null) && !fBufferType.equals(BufferType.BUFFER_TYPE_UNKNOWN) && !fBufferType.equals(BufferType.BUFFER_SHARED)) {
                 output.append(",BufferType=");
                 output.append(fBufferType);
             }
diff --git a/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java b/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
index 45e89952a9..fda529fc2b 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
@@ -36,7 +36,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
      */
     private final List<IChannelInfo> fChannels = new ArrayList<IChannelInfo>();
     private boolean fIsKernel = false;
-    private BufferType fBufferType = null;
+    private BufferType fBufferType = BufferType.BUFFER_TYPE_UNKNOWN;
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -163,7 +163,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
             }
             output.append(",isKernel=");
             output.append(String.valueOf(fIsKernel));
-            if (!fBufferType.equals(BufferType.BUFFER_TYPE_UNKNOWN) && !fBufferType.equals(BufferType.BUFFER_SHARED)) {
+            if ((fBufferType != null) && !fBufferType.equals(BufferType.BUFFER_TYPE_UNKNOWN) && !fBufferType.equals(BufferType.BUFFER_SHARED)) {
                 output.append(",BufferType=");
                 output.append(fBufferType);
             }