Merge branch 'master' into lttng_2_0_control_dev

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui.tests / src / org / eclipse / linuxtools / lttng / ui / tests / control / model / component / TraceControlComponentTest.java

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java
index 7b2fb70a3b28dfa7666db2a1ce15ab94a45a53cc..97b9fd031a954321d162f3065ff06b8e74a52939 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java
+++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java
@@ -18,16 +18,16 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlRoot;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService;
+import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.LTTngControlService;
 import org.eclipse.linuxtools.lttng.stubs.service.TestRemoteSystemProxy;
 import org.eclipse.linuxtools.lttng.ui.tests.control.model.impl.ListenerValidator;
-import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceControlComponentChangedListener;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.TargetNodeState;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlComponent;
-import org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceControlRoot;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.ILttngControlService;
-import org.eclipse.linuxtools.lttng.ui.views.control.service.LTTngControlService;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -180,7 +180,7 @@ public class TraceControlComponentTest extends TestCase {
         fixture.removeChild(root);
         assertTrue(validator.isRemovedCalled());
 
-        fixture.fireCompenentChanged(fixture);
+        fixture.fireComponentChanged(fixture);
         assertTrue(validator.isChangedCalled());
     }
 
@@ -240,20 +240,20 @@ public class TraceControlComponentTest extends TestCase {
         ListenerValidator validator = new ListenerValidator();
         fixture.addComponentListener(validator);
 
-        fixture.fireCompenentAdded(parent, component);
+        fixture.fireComponentAdded(parent, component);
         assertTrue(validator.isAddedCalled());
         assertEquals(parent.getName(), validator.getSavedParent().getName());
         assertEquals(component.getName(), validator.getSavedChild().getName());
         
         validator.initialize();
         
-        fixture.fireCompenentRemoved(parent, component);
+        fixture.fireComponentRemoved(parent, component);
         assertTrue(validator.isRemovedCalled());
         assertEquals(parent.getName(), validator.getSavedParent().getName());
         assertEquals(component.getName(), validator.getSavedChild().getName());
 
         validator.initialize();
-        fixture.fireCompenentChanged(fixture);
+        fixture.fireComponentChanged(fixture);
         assertTrue(validator.isChangedCalled());
         assertEquals(fixture.getName(), validator.getSavedComponent().getName());
     }
@@ -475,7 +475,7 @@ public class TraceControlComponentTest extends TestCase {
         fixture.removeChild(root);
         assertFalse(validator.isRemovedCalled());
 
-        fixture.fireCompenentChanged(fixture);
+        fixture.fireComponentChanged(fixture);
         assertFalse(validator.isChangedCalled());
     }