lttng: fix property display of function probe event Bug 419454
[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng2.ui.tests / src / org / eclipse / linuxtools / lttng2 / ui / tests / control / model / component / TraceControlKernelSessionTests.java
index 4843b4f9f984fe94964a254fba5096172293f889..ac42ca11de676f8695779ff83e602987fd9a8822 100644 (file)
@@ -1,86 +1,80 @@
 /**********************************************************************
- * Copyright (c) 2012 Ericsson
- * 
+ * Copyright (c) 2012, 2013 Ericsson
+ *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
+ *
+ * Contributors:
  *   Bernd Hufmann - Initial API and implementation
+ *   Alexandre Montplaisir - Port to JUnit4
  **********************************************************************/
+
 package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement;
+import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType;
+import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel;
+import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState;
+import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo;
 import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.AddContextDialogStub;
-import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub;
 import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub;
 import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub;
+import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub;
 import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableEventsDialogStub;
 import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub;
 import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
-import org.eclipse.rse.core.model.Host;
+import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.internal.core.model.SystemProfile;
+import org.eclipse.rse.core.model.ISystemProfile;
+import org.eclipse.rse.core.model.ISystemRegistry;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Test;
 import org.osgi.framework.FrameworkUtil;
 
 /**
- * The class <code>TraceControlKernelSessionTests</code> contains Kernel session/channel/event
- * handling test cases.
+ * The class <code>TraceControlKernelSessionTests</code> contains Kernel
+ * session/channel/event handling test cases.
  */
+public class TraceControlKernelSessionTests {
 
-@SuppressWarnings("nls")
-public class TraceControlKernelSessionTests extends TestCase {
-    
     // ------------------------------------------------------------------------
     // Constants
     // ------------------------------------------------------------------------
+
     private static final String TEST_STREAM = "CreateTreeTest.cfg";
     private static final String SCEN_SCENARIO3_TEST = "Scenario3";
 
     // ------------------------------------------------------------------------
     // Test data
     // ------------------------------------------------------------------------
+
     private TraceControlTestFacility fFacility;
     private TestRemoteSystemProxy fProxy;
-    private String fTestFile; 
-    
-    // ------------------------------------------------------------------------
-    // Static methods
-    // ------------------------------------------------------------------------
-
-    /**
-     * Returns test setup used when executing test case stand-alone.
-     * @return Test setup class 
-     */
-    public static Test suite() {
-        return new ModelImplTestSetup(new TestSuite(TraceControlKernelSessionTests.class));
-    }
+    private String fTestFile;
 
     // ------------------------------------------------------------------------
     // Housekeeping
@@ -91,12 +85,11 @@ public class TraceControlKernelSessionTests extends TestCase {
      *
      * @throws Exception
      *         if the initialization fails for some reason
-     *
      */
-    @Override
     @Before
     public void setUp() throws Exception {
         fFacility = TraceControlTestFacility.getInstance();
+        fFacility.init();
         fProxy = new TestRemoteSystemProxy();
         URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
@@ -105,30 +98,30 @@ public class TraceControlKernelSessionTests extends TestCase {
 
     /**
      * Perform post-test clean-up.
-     *
-     * @throws Exception
-     *         if the clean-up fails for some reason
-     *
      */
-    @Override
     @After
-    public void tearDown()  throws Exception {
+    public void tearDown() {
         fFacility.waitForJobs();
+        fFacility.dispose();
     }
-    
+
     /**
      * Run the TraceControlComponent.
+     *
+     * @throws Exception
+     *             Would fail the test
      */
+    @Test
     public void testTraceSessionTree() throws Exception {
-        
+
         fProxy.setTestFile(fTestFile);
         fProxy.setScenario(TraceControlTestFacility.SCEN_INIT_TEST);
-        
-        ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot();
 
-        @SuppressWarnings("restriction")
-        IHost host = new Host(new SystemProfile("myProfile", true));
-        host.setHostName("127.0.0.1");
+        ITraceControlComponent root = fFacility.getControlView().getTraceControlRoot();
+
+        ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
+        ISystemProfile profile =  registry.createSystemProfile("myProfile", true);
+        IHost host = registry.createLocalHost(profile, "myProfile", "user");
 
         TargetNodeComponent node = new TargetNodeComponent("myNode", root, host, fProxy);
 
@@ -154,15 +147,15 @@ public class TraceControlKernelSessionTests extends TestCase {
         TraceControlDialogFactory.getInstance().setCreateSessionDialog(new CreateSessionDialogStub());
         TraceControlDialogFactory.getInstance().setGetEventInfoDialog(new GetEventInfoDialogStub());
         TraceControlDialogFactory.getInstance().setConfirmDialog(new DestroyConfirmDialogStub());
-        
+
         // Initialize session handling scenario
         fProxy.setScenario(TraceControlTestFacility.SCEN_SCENARIO_SESSION_HANDLING);
+
         // ------------------------------------------------------------------------
         // Create session
         // ------------------------------------------------------------------------
         TraceSessionComponent session = fFacility.createSession(groups[1]);
-        
+
         // Verify that session was created
         assertNotNull(session);
         assertEquals("mysession", session.getName());
@@ -171,7 +164,7 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Initialize scenario
         fProxy.setScenario(SCEN_SCENARIO3_TEST);
-        
+
         // ------------------------------------------------------------------------
         // Enable channel on session
         // ------------------------------------------------------------------------
@@ -180,21 +173,21 @@ public class TraceControlKernelSessionTests extends TestCase {
         TraceControlDialogFactory.getInstance().setEnableChannelDialog(channelStub);
 
         fFacility.executeCommand(session, "enableChannelOnSession");
-        
+
         // Verify that Kernel domain was created
         ITraceControlComponent[] domains = session.getChildren();
         assertNotNull(domains);
         assertEquals(1, domains.length);
 
         assertEquals("Kernel", domains[0].getName());
-        
+
         // Verify that channel was created with correct data
         ITraceControlComponent[] channels =  domains[0].getChildren();
         assertNotNull(channels);
         assertEquals(1, channels.length);
 
         assertTrue(channels[0] instanceof TraceChannelComponent);
-        TraceChannelComponent channel = (TraceChannelComponent) channels[0]; 
+        TraceChannelComponent channel = (TraceChannelComponent) channels[0];
         assertEquals("mychannel", channel.getName());
         assertEquals(4, channel.getNumberOfSubBuffers());
         assertEquals("splice()", channel.getOutputType());
@@ -215,9 +208,9 @@ public class TraceControlKernelSessionTests extends TestCase {
         info.setSwitchTimer(100);
         info.setReadTimer(200);
         channelStub.setChannelInfo(info);
-        
+
         fFacility.executeCommand(domains[0], "enableChannelOnDomain");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -229,7 +222,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(2, channels.length);
 
         assertTrue(channels[1] instanceof TraceChannelComponent);
-        channel = (TraceChannelComponent) channels[1]; 
+        channel = (TraceChannelComponent) channels[1];
         assertEquals("mychannel2", channel.getName());
         assertEquals(2, channel.getNumberOfSubBuffers());
         assertEquals("splice()", channel.getOutputType());
@@ -247,9 +240,9 @@ public class TraceControlKernelSessionTests extends TestCase {
         eventsDialogStub.setNames(events);
         eventsDialogStub.setIsKernel(true);
         TraceControlDialogFactory.getInstance().setEnableEventsDialog(eventsDialogStub);
-        
+
         // ------------------------------------------------------------------------
-        // disable channels 
+        // disable channels
         // ------------------------------------------------------------------------
         // Get Kernel domain component instance
         domains = session.getChildren();
@@ -262,12 +255,12 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(2, channels.length);
 
         fFacility.executeCommand(channels, "disableChannel");
-        
+
         assertEquals(TraceEnablement.DISABLED, ((TraceChannelComponent)channels[0]).getState());
         assertEquals(TraceEnablement.DISABLED, ((TraceChannelComponent)channels[1]).getState());
 
         // ------------------------------------------------------------------------
-        // enable channels 
+        // enable channels
         // ------------------------------------------------------------------------
         // Get Kernel domain component instance
         domains = session.getChildren();
@@ -278,14 +271,14 @@ public class TraceControlKernelSessionTests extends TestCase {
         channels =  domains[0].getChildren();
         assertNotNull(channels);
         assertEquals(2, channels.length);
-        
+
         fFacility.executeCommand(channels, "enableChannel");
-        
+
         assertEquals(TraceEnablement.ENABLED, ((TraceChannelComponent)channels[0]).getState());
         assertEquals(TraceEnablement.ENABLED, ((TraceChannelComponent)channels[1]).getState());
 
         // ------------------------------------------------------------------------
-        // enable event (tracepoints) on session 
+        // enable event (tracepoints) on session
         // ------------------------------------------------------------------------
         fFacility.executeCommand(session, "enableEventOnSession");
 
@@ -300,13 +293,13 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(3, channels.length);
 
         assertTrue(channels[2] instanceof TraceChannelComponent);
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         assertEquals("channel0", channel.getName());
         // No need to check parameters of default channel because that has been done in other tests
 
         ITraceControlComponent[] channel0Events = channel.getChildren();
         assertEquals(2, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceEventComponent);
         assertTrue(channel0Events[1] instanceof TraceEventComponent);
 
@@ -323,7 +316,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(TraceEnablement.ENABLED, event.getState());
 
         // ------------------------------------------------------------------------
-        // enable event (tracepoints) on domain 
+        // enable event (tracepoints) on domain
         // ------------------------------------------------------------------------
         events.clear();
         events.add("sched_wakeup_new");
@@ -338,14 +331,14 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel = (TraceChannelComponent) channels[2];
-        
+
         channel0Events = channel.getChildren();
         assertEquals(3, channel0Events.length);
-        
+
         assertTrue(channel0Events[2] instanceof TraceEventComponent);
 
         event = (TraceEventComponent) channel0Events[2];
@@ -355,14 +348,14 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(TraceEnablement.ENABLED, event.getState());
 
         // ------------------------------------------------------------------------
-        // enable event (tracepoints) on channel 
+        // enable event (tracepoints) on channel
         // ------------------------------------------------------------------------
         events.clear();
         eventsDialogStub.setNames(events);
         eventsDialogStub.setIsAllTracePoints(true);
 
         fFacility.executeCommand(channels[1], "enableEventOnChannel");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -372,10 +365,10 @@ public class TraceControlKernelSessionTests extends TestCase {
         channels =  domains[0].getChildren();
         // No need to check parameters of default channel because that has been done in other tests
         channel = (TraceChannelComponent) channels[1];
-        
+
         channel0Events = channel.getChildren();
         assertEquals(3, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceEventComponent);
         assertTrue(channel0Events[1] instanceof TraceEventComponent);
         assertTrue(channel0Events[2] instanceof TraceEventComponent);
@@ -391,7 +384,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(TraceLogLevel.TRACE_EMERG, event.getLogLevel());
         assertEquals(TraceEventType.TRACEPOINT, event.getEventType());
         assertEquals(TraceEnablement.ENABLED, event.getState());
-        
+
         event = (TraceEventComponent) channel0Events[2];
         assertEquals("sched_wakeup_new", event.getName());
         assertEquals(TraceLogLevel.TRACE_EMERG, event.getLogLevel());
@@ -399,15 +392,15 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(TraceEnablement.ENABLED, event.getState());
 
         // ------------------------------------------------------------------------
-        // enable event (syscall) on channel 
+        // enable event (syscall) on channel
         // ------------------------------------------------------------------------
         events.clear();
-        eventsDialogStub.setIsTracePoints(false);        
+        eventsDialogStub.setIsTracePoints(false);
         eventsDialogStub.setIsAllTracePoints(false);
         eventsDialogStub.setIsSysCalls(true);
 
         fFacility.executeCommand(channels[0], "enableEventOnChannel");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -415,16 +408,16 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[0]; 
+        channel = (TraceChannelComponent) channels[0];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel = (TraceChannelComponent) channels[0];
-        
+
         channel0Events = channel.getChildren();
         assertEquals(1, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceEventComponent);
-        
+
         event = (TraceEventComponent) channel0Events[0];
         assertEquals("syscalls", event.getName());
         assertEquals(TraceLogLevel.LEVEL_UNKNOWN, event.getLogLevel());
@@ -432,7 +425,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(TraceEnablement.ENABLED, event.getState());
 
         // ------------------------------------------------------------------------
-        // enable event (syscall) on domain 
+        // enable event (syscall) on domain
         // ------------------------------------------------------------------------
         fFacility.executeCommand(domains[0], "enableEventOnDomain");
 
@@ -443,16 +436,16 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[0]; 
+        channel = (TraceChannelComponent) channels[0];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel = (TraceChannelComponent) channels[2];
-        
+
         channel0Events = channel.getChildren();
         assertEquals(4, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceEventComponent);
-        
+
         event = (TraceEventComponent) channel0Events[0];
         assertEquals("syscalls", event.getName());
         assertEquals(TraceLogLevel.LEVEL_UNKNOWN, event.getLogLevel());
@@ -460,7 +453,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(TraceEnablement.ENABLED, event.getState());
 
         // ------------------------------------------------------------------------
-        // enable event (syscall) on session 
+        // enable event (syscall) on session
         // ------------------------------------------------------------------------
         fFacility.executeCommand(session, "enableEventOnSession");
 
@@ -471,34 +464,34 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[0]; 
+        channel = (TraceChannelComponent) channels[0];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel = (TraceChannelComponent) channels[2];
-        
+
         channel0Events = channel.getChildren();
         assertEquals(4, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceEventComponent);
-        
+
         event = (TraceEventComponent) channel0Events[0];
         assertEquals("syscalls", event.getName());
         assertEquals(TraceLogLevel.LEVEL_UNKNOWN, event.getLogLevel());
         assertEquals(TraceEventType.SYSCALL, event.getEventType());
         assertEquals(TraceEnablement.ENABLED, event.getState());
 
-        
+
         // ------------------------------------------------------------------------
-        // enable event (dynamic probe) on domain 
+        // enable event (dynamic probe) on domain
         // ------------------------------------------------------------------------
         events.clear();
         eventsDialogStub.setIsSysCalls(false);
         eventsDialogStub.setIsDynamicProbe(true);
         eventsDialogStub.setDynamicProbe("0xc0101280");
         eventsDialogStub.setProbeEventName("myevent1");
-        
+
         fFacility.executeCommand(domains[0], "enableEventOnDomain");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -506,14 +499,14 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel0Events = channel.getChildren();
         assertEquals(5, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceProbeEventComponent);
-        
+
         TraceProbeEventComponent probeEvent = (TraceProbeEventComponent) channel0Events[0];
         assertEquals("myevent1", probeEvent.getName());
         assertEquals(TraceLogLevel.LEVEL_UNKNOWN, probeEvent.getLogLevel());
@@ -524,14 +517,14 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertNull(probeEvent.getSymbol());
 
         // ------------------------------------------------------------------------
-        // enable event (dynamic probe) on channel 
+        // enable event (dynamic probe) on channel
         // ------------------------------------------------------------------------
         eventsDialogStub.setIsDynamicProbe(true);
         eventsDialogStub.setDynamicProbe("init_post");
         eventsDialogStub.setProbeEventName("myevent2");
 
         fFacility.executeCommand(channels[2], "enableEventOnChannel");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -539,14 +532,14 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel0Events = channel.getChildren();
         assertEquals(6, channel0Events.length);
-        
+
         assertTrue(channel0Events[0] instanceof TraceProbeEventComponent);
-        
+
         probeEvent = (TraceProbeEventComponent) channel0Events[0];
         assertEquals("myevent2", probeEvent.getName());
         assertEquals(TraceLogLevel.LEVEL_UNKNOWN, probeEvent.getLogLevel());
@@ -557,14 +550,14 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals("init_post", probeEvent.getSymbol());
 
         // ------------------------------------------------------------------------
-        // enable event (dynamic probe) on session 
+        // enable event (dynamic probe) on session
         // ------------------------------------------------------------------------
         eventsDialogStub.setIsDynamicProbe(true);
         eventsDialogStub.setDynamicProbe("init_post:0x1000");
         eventsDialogStub.setProbeEventName("myevent3");
 
         fFacility.executeCommand(session, "enableEventOnSession");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -572,7 +565,7 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel0Events = channel.getChildren();
@@ -588,7 +581,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals("0x1000", probeEvent.getOffset());
         assertNull(null, probeEvent.getAddress());
         assertEquals("init_post", probeEvent.getSymbol());
-        
+
         // ------------------------------------------------------------------------
         // enable event (dynamic function probe) on session
         // ------------------------------------------------------------------------
@@ -600,7 +593,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         eventsDialogStub.setFunctionProbe("create_dev");
 
         fFacility.executeCommand(session, "enableEventOnSession");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -608,7 +601,7 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel0Events = channel.getChildren();
@@ -619,12 +612,13 @@ public class TraceControlKernelSessionTests extends TestCase {
         probeEvent = (TraceProbeEventComponent) channel0Events[0];
         assertEquals("myevent4", probeEvent.getName());
         assertEquals(TraceLogLevel.LEVEL_UNKNOWN, probeEvent.getLogLevel());
-        assertEquals(TraceEventType.PROBE, probeEvent.getEventType());
+        // Changed for Bug fix 419454 to function event which was introduced by LTTng 2.2
+        assertEquals(TraceEventType.FUNCTION, probeEvent.getEventType());
         assertEquals(TraceEnablement.ENABLED, probeEvent.getState());
         assertEquals("0x0", probeEvent.getOffset());
         assertNull(null, probeEvent.getAddress());
         assertEquals("create_dev", probeEvent.getSymbol());
-  
+
         // ------------------------------------------------------------------------
         // enable event (dynamic function probe) on domain
         // ------------------------------------------------------------------------
@@ -633,7 +627,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         eventsDialogStub.setFunctionProbe("create_dev:0x2000");
 
         fFacility.executeCommand(domains[0], "enableEventOnDomain");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -641,7 +635,7 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
+        channel = (TraceChannelComponent) channels[2];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel0Events = channel.getChildren();
@@ -666,7 +660,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         eventsDialogStub.setFunctionProbe("create_dev:0x2000");
 
         fFacility.executeCommand(channels[0], "enableEventOnChannel");
-        
+
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
@@ -674,7 +668,7 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         // Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[0]; 
+        channel = (TraceChannelComponent) channels[0];
         // No need to check parameters of default channel because that has been done in other tests
 
         channel0Events = channel.getChildren();
@@ -692,7 +686,7 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals("create_dev", probeEvent.getSymbol());
 
         // ------------------------------------------------------------------------
-        // Add Context on domain  
+        // Add Context on domain
         // ------------------------------------------------------------------------
         // Get Kernel domain component instance
         domains = session.getChildren();
@@ -706,13 +700,13 @@ public class TraceControlKernelSessionTests extends TestCase {
         contexts.add("perf:cache-misses");
         addContextStub.setContexts(contexts);
         TraceControlDialogFactory.getInstance().setAddContextDialog(addContextStub);
-        
+
         fFacility.executeCommand(domains[0], "addContextOnDomain");
         // Currently there is nothing to verify because the list commands don't show any context information
         // However, the execution of the command make sure that the correct service command line is build and executed.
 
         // ------------------------------------------------------------------------
-        // Add Context on channel  
+        // Add Context on channel
         // ------------------------------------------------------------------------
 
         // Get Kernel domain component instance
@@ -722,8 +716,8 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         //Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[0]; 
-        
+        channel = (TraceChannelComponent) channels[0];
+
         try {
             // The setContext() verifies that the contexts set are part of the available contexts
             // The available contexts are set by the command handler addContextOnDomain above.
@@ -737,9 +731,9 @@ public class TraceControlKernelSessionTests extends TestCase {
         fFacility.executeCommand(channel, "addContextOnChannel");
         // Currently there is nothing to verify because the list commands don't show any context information
         // However, the execution of the command make sure that the correct service command line is build and executed.
-        
+
         // ------------------------------------------------------------------------
-        // Add Context on event  
+        // Add Context on event
         // ------------------------------------------------------------------------
         // Get Kernel domain component instance
         domains = session.getChildren();
@@ -748,30 +742,30 @@ public class TraceControlKernelSessionTests extends TestCase {
 
         //Verify that channel was created with correct data
         channels =  domains[0].getChildren();
-        channel = (TraceChannelComponent) channels[2]; 
-        
+        channel = (TraceChannelComponent) channels[2];
+
         channel0Events = channel.getChildren();
 
         event = (TraceEventComponent) channel0Events[6];
-        
+
         fFacility.executeCommand(event, "addContextOnEvent");
         // Currently there is nothing to verify because the list commands don't show any context information
-        // However, the execution of the command make sure that the correct service command line is build and executed.        
+        // However, the execution of the command make sure that the correct service command line is build and executed.
 
         // ------------------------------------------------------------------------
-        // Calibrate  
+        // Calibrate
         // ------------------------------------------------------------------------
         // Get Kernel domain component instance
         domains = session.getChildren();
         assertNotNull(domains);
         assertEquals(1, domains.length);
-        
+
         fFacility.executeCommand(domains[0], "calibrate");
-        // There is nothing to verify here. 
+        // There is nothing to verify here.
         // However, the execution of the command make sure that the correct service command line is build and executed.
-        
+
         // ------------------------------------------------------------------------
-        // refresh 
+        // refresh
         // ------------------------------------------------------------------------
         fFacility.executeCommand(node, "refresh");
         groups = node.getChildren();
@@ -782,30 +776,30 @@ public class TraceControlKernelSessionTests extends TestCase {
         assertEquals(1, groups[1].getChildren()[0].getChildren().length); // domains
         assertEquals(3, groups[1].getChildren()[0].getChildren()[0].getChildren().length); // channels
         assertEquals(2, groups[1].getChildren()[0].getChildren()[0].getChildren()[0].getChildren().length); // events (of channel[0])
-        
+
         // Initialize session handling scenario
         fProxy.setScenario(TraceControlTestFacility.SCEN_SCENARIO_SESSION_HANDLING);
-        
+
         session = (TraceSessionComponent)groups[1].getChildren()[0];
 
         // ------------------------------------------------------------------------
-        // start session 
+        // start session
         // ------------------------------------------------------------------------
         fFacility.startSession(session);
         assertEquals(TraceSessionState.ACTIVE, session.getSessionState());
-        
+
         // ------------------------------------------------------------------------
-        // stop session 
+        // stop session
         // ------------------------------------------------------------------------
         fFacility.stopSession(session);
         assertEquals(TraceSessionState.INACTIVE, session.getSessionState());
-        
+
         // ------------------------------------------------------------------------
-        // Destroy session 
+        // Destroy session
         // ------------------------------------------------------------------------
 
         fFacility.destroySession(session);
-        
+
         // Verify that no more session components exist
         assertEquals(0, groups[1].getChildren().length);
 
@@ -814,13 +808,13 @@ public class TraceControlKernelSessionTests extends TestCase {
         //-------------------------------------------------------------------------
         fFacility.executeCommand(node, "disconnect");
         assertEquals(TargetNodeState.DISCONNECTED, node.getTargetNodeState());
-       
+
         //-------------------------------------------------------------------------
         // Delete node
         //-------------------------------------------------------------------------
-         
+
         fFacility.executeCommand(node, "delete");
         assertEquals(0,fFacility.getControlView().getTraceControlRoot().getChildren().length);
     }
-    
+
 }
\ No newline at end of file
This page took 0.03532 seconds and 5 git commands to generate.