Make test plugins fragments.

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

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 677e3d3ce08444d71ec8bf2efbffe3a9f1e8ce1b..dcb50f90f8ec2ee738e3af6bd2193c84392ad2c0 100644 (file)
--- 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
@@ -39,22 +39,24 @@ 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.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.eclipse.swt.graphics.Image;
 import org.junit.After;
 import org.junit.Before;
-
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * The class <code>TraceControlTreeModelTest</code> contains tests for the tree component classes.
  */
 @SuppressWarnings("nls")
 public class TraceControlTreeModelTest extends TestCase {
-    
-    private static final String DIRECTORY   = "testfiles";
+ 
+    // ------------------------------------------------------------------------
+    // Constants
+    // ------------------------------------------------------------------------
+
     private static final String TEST_STREAM = "ListInfoTest.cfg";
     private static final String SCEN_LIST_INFO_TEST = "ListInfoTest";
     
@@ -92,7 +94,7 @@ public class TraceControlTreeModelTest extends TestCase {
     @Before
     public void setUp() throws Exception {
         fProxy = new TestRemoteSystemProxy();
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null);
+        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());
         fTestFile = testfile.getAbsolutePath();
     }
@@ -107,6 +109,7 @@ public class TraceControlTreeModelTest extends TestCase {
     @Override
     @After
     public void tearDown()  throws Exception {
+        TraceControlTestFacility.getInstance().waitForJobs();
     }
     
     /**
@@ -440,6 +443,8 @@ public class TraceControlTreeModelTest extends TestCase {
         assertEquals(TargetNodeState.DISCONNECTED, node.getTargetNodeState());
         assertNotNull(node.getImage());
         assertNotSame(connectedImage, node.getImage());
+        
+        node.getParent().removeChild(node);
     }
     
     private void verifySessionGetterSetters(TraceSessionComponent session) {