From: Bernd Hufmann Date: Wed, 25 Apr 2012 19:46:10 +0000 (-0400) Subject: Update DeleteHandler (LTTng 2.0 tracer control) and JUnit tests X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=8577ed1e2699cde8ff106705c935e96b4be62e3e;p=deliverable%2Ftracecompass.git Update DeleteHandler (LTTng 2.0 tracer control) and JUnit tests --- diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java index 2f0bf7465e..2157fbdc46 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java @@ -37,9 +37,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.Target 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.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.osgi.framework.FrameworkUtil; @@ -121,9 +122,9 @@ public class TraceControlKernelProviderTests extends TestCase { ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot(); - @SuppressWarnings("restriction") - IHost host = new Host(new SystemProfile("myProfile", true)); - host.setHostName("127.0.0.1"); + 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); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java index 4843b4f9f9..f8d710ae86 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java @@ -23,9 +23,9 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; 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; @@ -42,9 +42,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceC 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.osgi.framework.FrameworkUtil; @@ -126,9 +127,9 @@ public class TraceControlKernelSessionTests extends TestCase { ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot(); - @SuppressWarnings("restriction") - IHost host = new Host(new SystemProfile("myProfile", true)); - host.setHostName("127.0.0.1"); + 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); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java index bf0687e984..42f741d456 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java @@ -46,9 +46,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceEve import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceProbeEventPropertySource; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceSessionPropertySource; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.UstProviderPropertySource; -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.eclipse.ui.views.properties.IPropertySource; import org.junit.After; import org.junit.Before; @@ -129,9 +130,9 @@ public class TraceControlPropertiesTest extends TestCase { ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot(); - @SuppressWarnings("restriction") - IHost host = new Host(new SystemProfile("myProfile", true)); - host.setHostName("127.0.0.1"); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); + ISystemProfile profile = registry.createSystemProfile("myProfile", true); + IHost host = registry.createLocalHost(profile, "myProfile", "user"); TargetNodeComponent node = new TargetNodeComponent("myNode", root, host, proxy); @@ -154,7 +155,7 @@ public class TraceControlPropertiesTest extends TestCase { assertNotNull(source.getPropertyDescriptors()); assertEquals("myNode", source.getPropertyValue(TargetNodePropertySource.TARGET_NODE_NAME_PROPERTY_ID)); - assertEquals("127.0.0.1", source.getPropertyValue(TargetNodePropertySource.TARGET_NODE_ADDRESS_PROPERTY_ID)); + assertEquals("LOCALHOST", source.getPropertyValue(TargetNodePropertySource.TARGET_NODE_ADDRESS_PROPERTY_ID)); assertEquals(TargetNodeState.CONNECTED.name(), source.getPropertyValue(TargetNodePropertySource.TARGET_NODE_STATE_PROPERTY_ID)); assertNull(source.getPropertyValue("test")); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java index 2b51940800..673210041c 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java @@ -40,9 +40,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService; -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.eclipse.swt.graphics.Image; import org.junit.After; import org.junit.Before; @@ -125,9 +126,9 @@ public class TraceControlTreeModelTest extends TestCase { ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot(); - @SuppressWarnings("restriction") - IHost host = new Host(new SystemProfile("myProfile", true)); - host.setHostName("127.0.0.1"); + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); + ISystemProfile profile = registry.createSystemProfile("myProfile", true); + IHost host = registry.createLocalHost(profile, "myProfile", "user"); TargetNodeComponent node = new TargetNodeComponent(TARGET_NODE_NAME, root, host, fProxy); @@ -139,8 +140,8 @@ public class TraceControlTreeModelTest extends TestCase { // ------------------------------------------------------------------------ // Verify Parameters of TargetNodeComponent // ------------------------------------------------------------------------ - assertEquals("127.0.0.1", node.getHostName()); - assertEquals("127.0.0.1", node.getToolTip()); + assertEquals("LOCALHOST", node.getHostName()); // assigned in createLocalHost() above + assertEquals("LOCALHOST", node.getToolTip()); // assigned in createLocalHost() above Image connectedImage = node.getImage(); assertNotNull(connectedImage); assertEquals(TargetNodeState.CONNECTED, node.getTargetNodeState()); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java index 3aeba2ab39..1cd0feb76a 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java @@ -20,9 +20,9 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -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.GetEventInfoDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; @@ -39,9 +39,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceC import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; -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.osgi.framework.FrameworkUtil; @@ -122,9 +123,9 @@ public class TraceControlUstProviderTests extends TestCase { ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot(); - @SuppressWarnings("restriction") - IHost host = new Host(new SystemProfile("myProfile", true)); - host.setHostName("127.0.0.1"); + 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); root.addChild(node); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java index d5189bddd3..a056d2fc92 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java @@ -22,9 +22,9 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -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; @@ -41,9 +41,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.Target 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.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.osgi.framework.FrameworkUtil; @@ -124,9 +125,9 @@ public class TraceControlUstSessionTests extends TestCase { ITraceControlComponent root = TraceControlTestFacility.getInstance().getControlView().getTraceControlRoot(); - @SuppressWarnings("restriction") - IHost host = new Host(new SystemProfile("myProfile", true)); - host.setHostName("127.0.0.1"); + 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); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java index 8d10fe2973..022087f6e5 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java @@ -17,7 +17,6 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEvent 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.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ProbeEventInfo; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java index 34cbe18791..b694d83719 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java @@ -37,6 +37,7 @@ public class DeleteHandler extends BaseNodeHandler { try { ITraceControlComponent root = fTargetNode.getParent(); fTargetNode.removeAllChildren(); + fTargetNode.deregister(); root.removeChild(fTargetNode); } finally { fLock.unlock(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java index 7e546901a6..3f1639f6c9 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java @@ -28,8 +28,10 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.RemoteSyst import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlServiceFactory; +import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IRSECallback; +import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.swt.graphics.Image; @@ -314,10 +316,21 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu job.schedule(); } + /** + * Refresh the node configuration + */ public void refresh() { removeAllChildren(); getConfigurationFromNode(); } + + /** + * Deregisters host from registry. + */ + public void deregister() { + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); + registry.deleteHost(fHost); + } // ------------------------------------------------------------------------ // Helper function