lttng: Move createSession parameters into SessionInfo class

Change-Id: Iaa45647fcfa69fd3e62fdb56baf68070b27cad27
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/23591
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>

1 files changed, 14 insertions, 5 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java b/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java
index 6a6b164e3b..5112069991 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java
@@ -81,6 +81,10 @@ public class SessionInfoTest {
         assertEquals("INACTIVE", state.toString());
         assertEquals(0, state.ordinal());
         assertEquals(0, result.getDomains().length);
+        assertFalse(result.isSnapshotSession());
+        assertNull(result.getNetworkUrl());
+        assertNull(result.getControlUrl());
+        assertNull(result.getDataUrl());
     }
 
     /**
@@ -99,6 +103,10 @@ public class SessionInfoTest {
         for (int i = 0; i < orignalDomains.length; i++) {
             assertEquals(orignalDomains[i], resultDomains[i]);
         }
+
+        assertEquals(sessionInfo.getNetworkUrl(), fSessionInfo1.getNetworkUrl());
+        assertEquals(sessionInfo.getControlUrl(), fSessionInfo1.getControlUrl());
+        assertEquals(sessionInfo.getDataUrl(), fSessionInfo1.getDataUrl());
     }
 
     /**
@@ -189,7 +197,7 @@ public class SessionInfoTest {
         String result = fixture.toString();
 
         // add additional test code here
-        assertEquals("[SessionInfo([TraceInfo(Name=sessionName)],Path=,State=INACTIVE,isStreamedTrace=false,Domains=)]", result);
+        assertEquals("[SessionInfo([TraceInfo(Name=sessionName)],Path=,State=INACTIVE,isStreamedTrace=false,isSnapshot=false,Domains=,NetworkUrl=null,ControlUrl=null,DataUrl=null)]", result);
     }
 
     /**
@@ -200,12 +208,12 @@ public class SessionInfoTest {
         String result = fSessionInfo1.toString();
 
         // add additional test code here
-        assertEquals("[SessionInfo([TraceInfo(Name=session1)],Path=/home/user/lttng-trace/mysession/,State=ACTIVE,isStreamedTrace=false,snapshotInfo="
+        assertEquals("[SessionInfo([TraceInfo(Name=session1)],Path=/home/user/lttng-trace/mysession/,State=ACTIVE,isStreamedTrace=false,isSnapshot=false,snapshotInfo="
                 + "[SnapshotInfo([TraceInfo(Name=snapshot-1)],snapshotPath=/home/user/lttng-trace/mysession/,ID=1,isStreamedSnapshot=false)],"
                     + "Domains=[DomainInfo([TraceInfo(Name=test1)],"
                         + "Channels=[ChannelInfo([TraceInfo(Name=channel1)],State=DISABLED,OverwriteMode=true,SubBuffersSize=13,NumberOfSubBuffers=12,SwitchTimer=10,ReadTimer=11,output=splice(),"
                             + "Events=[EventInfo([BaseEventInfo([TraceInfo(Name=event1)],type=TRACEPOINT,level=TRACE_DEBUG)],State=ENABLED)])],"
-                + "isKernel=false)])]", result);
+                + "isKernel=false)],NetworkUrl=null,ControlUrl=null,DataUrl=null)]", result);
     }
 
     /**
@@ -214,17 +222,18 @@ public class SessionInfoTest {
     @Test
     public void testToString_3() {
         SessionInfo info = new SessionInfo((SessionInfo)fSessionInfo1);
+        info.setSnapshot(false);
         info.setSnapshotInfo(null);
         info.setSessionPath("/home/user/lttng-trace/mysession/");
 
         String result = info.toString();
 
         // add additional test code here
-        assertEquals("[SessionInfo([TraceInfo(Name=session1)],Path=/home/user/lttng-trace/mysession/,State=ACTIVE,isStreamedTrace=false,"
+        assertEquals("[SessionInfo([TraceInfo(Name=session1)],Path=/home/user/lttng-trace/mysession/,State=ACTIVE,isStreamedTrace=false,isSnapshot=false,"
                     + "Domains=[DomainInfo([TraceInfo(Name=test1)],"
                         + "Channels=[ChannelInfo([TraceInfo(Name=channel1)],State=DISABLED,OverwriteMode=true,SubBuffersSize=13,NumberOfSubBuffers=12,SwitchTimer=10,ReadTimer=11,output=splice(),"
                             + "Events=[EventInfo([BaseEventInfo([TraceInfo(Name=event1)],type=TRACEPOINT,level=TRACE_DEBUG)],State=ENABLED)])],"
-                + "isKernel=false)])]", result);
+                + "isKernel=false)],NetworkUrl=null,ControlUrl=null,DataUrl=null)]", result);
     }
 
     // ------------------------------------------------------------------------