Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF3
-rw-r--r--lttng/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java68
-rw-r--r--lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java69
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java5
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF44
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java60
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF30
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java86
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF1
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java86
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java82
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF13
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java82
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF9
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF1
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java78
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java4
39 files changed, 67 insertions, 734 deletions
diff --git a/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
index f4639b19ad..476751309a 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
@@ -5,9 +5,8 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.1.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core.tests
-Bundle-Activator: org.eclipse.linuxtools.ctf.core.tests.CtfCoreTestPlugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.ctf.core
Require-Bundle: org.junit4;bundle-version="4.8.1",
org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.ctf.core,
org.antlr.runtime;bundle-version="3.2.0"
diff --git a/lttng/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java b/lttng/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java
deleted file mode 100644
index 388a9dcd23..0000000000
--- a/lttng/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.ctf.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>TmfCoreTestPlugin</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class CtfCoreTestPlugin extends Plugin {
-
- // ========================================================================
- // Attributes
- // ========================================================================
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.ctf.core.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static CtfCoreTestPlugin plugin;
-
- // ========================================================================
- // Constructors
- // ========================================================================
-
- /**
- * The constructor
- */
- public CtfCoreTestPlugin() {
- plugin = this;
- }
-
- // ========================================================================
- // Accessors
- // ========================================================================
-
- /**
- * @return the shared instance
- */
- public static CtfCoreTestPlugin getPlugin() {
- return plugin;
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-}
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
index f0d2a34643..1bd574c12a 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
@@ -16,5 +16,4 @@ Export-Package: org.eclipse.linuxtools.ctf.core.event,
org.eclipse.linuxtools.ctf.core.event.metadata,
org.eclipse.linuxtools.ctf.core.event.metadata.exceptions,
org.eclipse.linuxtools.ctf.core.event.types,
- org.eclipse.linuxtools.ctf.core.trace,
- org.eclipse.linuxtools.internal.ctf.core
+ org.eclipse.linuxtools.ctf.core.trace
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
index 0ed93cd2c2..df97ffa2d9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
@@ -5,13 +5,12 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.5.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.linuxtools.lttng.jni
+Fragment-Host: org.eclipse.linuxtools.lttng.core
Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0",
org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0"
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java
deleted file mode 100644
index 56daa84eb2..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>TmfCoreTestPlugin</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-@SuppressWarnings("nls")
-public class LTTngCoreTestPlugin extends Plugin {
-
- // ========================================================================
- // Attributes
- // ========================================================================
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.tests";
-
- // The shared instance
- private static LTTngCoreTestPlugin plugin;
-
- // ========================================================================
- // Constructors
- // ========================================================================
-
- /**
- * The constructor
- */
- public LTTngCoreTestPlugin() {
- plugin = this;
- }
-
- // ========================================================================
- // Accessors
- // ========================================================================
-
- /**
- * @return the shared instance
- */
- public static LTTngCoreTestPlugin getPlugin() {
- return plugin;
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-}
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java
index 55b4c8ed29..0cf3ad1dab 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java
@@ -24,6 +24,7 @@ import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.osgi.framework.FrameworkUtil;
@SuppressWarnings("nls")
public abstract class LttngTestPreparation extends TestCase {
@@ -120,7 +121,7 @@ public abstract class LttngTestPreparation extends TestCase {
protected LTTngTrace prepareStreamToTest() {
if (frealStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(ftracepath_T1),
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(ftracepath_T1),
null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTrace tmpStream = new LTTngTrace(testfile.getName(), testfile.getPath(), false);
@@ -139,7 +140,7 @@ public abstract class LttngTestPreparation extends TestCase {
protected LTTngTextTrace prepareTextStreamToTest() {
if (ftextStream_T1 == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(),
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()),
new Path(fTextTracepath_T1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath());
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
index fc2e9c6719..c69a91021e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
@@ -14,10 +14,10 @@ import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventField;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventType;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -63,7 +63,7 @@ public class LttngEventContentTest extends TestCase {
private LTTngTextTrace initializeEventStream() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath());
testStream = tmpStream;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java
index 126f2be4bc..248cd6dc7b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java
@@ -11,9 +11,9 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventField;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -35,7 +35,7 @@ public class LttngEventFieldTest extends TestCase {
private LTTngTextTrace initializeEventStream() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
testStream = tmpStream;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java
index 31254386cb..57e9c2561f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java
@@ -13,10 +13,10 @@ import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventType;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -57,7 +57,7 @@ public class LttngEventTest extends TestCase {
private LTTngTextTrace initializeEventStream() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
testStream = tmpStream;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
index 6abd6a8be1..49000a680a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
@@ -9,8 +9,8 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventType;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -38,7 +38,7 @@ public class LttngEventTypeTest extends TestCase {
private LTTngTextTrace initializeEventStream() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
testStream = tmpStream;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java
index 5b027f2398..59107e2c53 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java
@@ -9,8 +9,8 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -41,7 +41,7 @@ public class LttngTimestampTest extends TestCase {
private LTTngTextTrace initializeEventStream() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
testStream = tmpStream;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
index dae0e9ef69..b39a69b7e8 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
@@ -23,11 +23,11 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.osgi.framework.FrameworkUtil;
/**
* <b><u>TmfExperimentTest</u></b>
@@ -58,7 +58,7 @@ public class LTTngExperimentTest extends TestCase {
if (fTraces == null) {
fTraces = new ITmfTrace[1];
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(LTTngExperimentTest.class), new Path(path), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTrace trace = new LTTngTrace(testfile.getName(), testfile.getPath(), false);
fTraces[0] = trace;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java
index 4f9957ef2f..7ce28057bf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java
@@ -8,12 +8,12 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -70,7 +70,7 @@ public class LTTngTextTraceTest extends TestCase {
private synchronized LTTngTextTrace prepareStreamToTest() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath());
testStream = tmpStream;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
index 977a337867..1e8dbe1029 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
@@ -9,10 +9,10 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.linuxtools.internal.lttng.core.event.LttngLocation;
import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.osgi.framework.FrameworkUtil;
/*
Functions tested here :
@@ -72,7 +72,7 @@ public class LTTngTraceTest extends TestCase {
private LTTngTrace prepareStreamToTest() {
if (testStream == null) {
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
LTTngTrace tmpStream = new LTTngTrace(testfile.getName(), testfile.getPath(), false);
testStream = tmpStream;
@@ -102,7 +102,7 @@ public class LTTngTraceTest extends TestCase {
// Test constructor with argument on a correct tracepath, skipping indexing
try {
- URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
new LTTngTrace(testfile.getName(), testfile.getPath(), skipIndexing);
}
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
index 17d1251468..dd546bd597 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
@@ -14,25 +14,25 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.rse.core;bundle-version="3.2.0",
org.eclipse.tm.tcf.core;bundle-version="0.4.0",
org.eclipse.core.resources;bundle-version="3.7.100"
-Export-Package: org.eclipse.linuxtools.internal.lttng.core;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.control;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.event;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.exceptions;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.latency.analyzer;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.model;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.request;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.signal;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.state;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.experiment;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.model;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.resource;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.trace;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.trace;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.util;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests"
+Export-Package: org.eclipse.linuxtools.internal.lttng.core;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.control;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.event;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.exceptions;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.latency.analyzer;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.model;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.request;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.signal;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.state;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.experiment;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.model;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.resource;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.trace;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.trace;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.util;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests"
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
index 392c603f4f..ca5e9c6561 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
@@ -5,12 +5,11 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.5.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng.ui
Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.lttng.ui;bundle-version="0.4.0",
org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.0",
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java
deleted file mode 100644
index 60f587b031..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class LTTngUITestPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static LTTngUITestPlugin plugin;
-
- // ------------------------------------------------------------------------
- // Constructor
- // ------------------------------------------------------------------------
-
- public LTTngUITestPlugin() {
- }
-
- // ------------------------------------------------------------------------
- // AbstractUIPlugin
- // ------------------------------------------------------------------------
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- // ------------------------------------------------------------------------
- // Accessors
- // ------------------------------------------------------------------------
-
- public static LTTngUITestPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
index 47b83ddee5..b5b5c92c3a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -21,33 +21,3 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
org.eclipse.rse.ui;bundle-version="3.2.0",
org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng.ui;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.model.trange;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.common;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.events;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.resources.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.statistics;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.timeframe;x-friends:="org.eclipse.linuxtools.lttng.ui.tests"
-
diff --git a/lttng/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
index 66210b1922..7142736037 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.1.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.core.tests.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng2.core
Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.100"
diff --git a/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java b/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java
deleted file mode 100644
index 229e6c2d1a..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>Activator</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // ------------------------------------------------------------------------
- // Attributes
- // ------------------------------------------------------------------------
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core.tests"; //$NON-NLS-1$
-
- /**
- * The shared instance
- */
- private static Activator plugin;
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- // ------------------------------------------------------------------------
- // Accessors
- // ------------------------------------------------------------------------
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- // ------------------------------------------------------------------------
- // Operators
- // ------------------------------------------------------------------------
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
-}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
index 893cd64275..279fea1e8d 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
@@ -9,4 +9,3 @@ Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.core;x-friends:="org.eclipse.linuxtools.lttng2.core.tests"
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
index dadc72da98..a2f0dfd7cf 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
@@ -5,11 +5,10 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.1.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.kernel.core.tests.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.core
Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="0.1.0",
org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java
deleted file mode 100644
index 559e79d8e5..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.kernel.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>Activator</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // ------------------------------------------------------------------------
- // Attributes
- // ------------------------------------------------------------------------
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.kernel.core.tests"; //$NON-NLS-1$
-
- /**
- * The shared instance
- */
- private static Activator plugin;
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- // ------------------------------------------------------------------------
- // Accessors
- // ------------------------------------------------------------------------
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- // ------------------------------------------------------------------------
- // Operators
- // ------------------------------------------------------------------------
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
-}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
index 08d0a4d003..ec8d28556f 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
@@ -10,5 +10,3 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.core.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-friends:="org.eclipse.linuxtools.lttng2.kernel.core.tests"
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
index 3ac45ecfd5..d791c9b4ce 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.1.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.kernel.ui.tests.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.ui
Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0",
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java
deleted file mode 100644
index 6586643ab2..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.kernel.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // ------------------------------------------------------------------------
- // Attributes
- // ------------------------------------------------------------------------
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.kernel.ui.tests"; //$NON-NLS-1$
-
- /**
- * The shared instance
- */
- private static Activator plugin;
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- // ------------------------------------------------------------------------
- // Accessors
- // ------------------------------------------------------------------------
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- // ------------------------------------------------------------------------
- // AbstractUIPlugin
- // ------------------------------------------------------------------------
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
-} \ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
index d6ade7d75e..9643e2f82f 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
@@ -5,16 +5,7 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.1.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.ui.tests.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="3.8.2",
- org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
- org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.ui.views;bundle-version="3.6.0",
- org.eclipse.rse.core;bundle-version="3.2.0",
- org.eclipse.rse.services;bundle-version="3.2.100",
- org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100"
+Fragment-Host: org.eclipse.linuxtools.lttng2.ui
+Require-Bundle: org.junit;bundle-version="3.8.2"
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java
deleted file mode 100644
index 6c2b210481..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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:
- * Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // ------------------------------------------------------------------------
- // Attributes
- // ------------------------------------------------------------------------
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.ui.tests"; //$NON-NLS-1$
-
- /**
- * The shared instance
- */
- private static Activator plugin;
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- // ------------------------------------------------------------------------
- // Accessors
- // ------------------------------------------------------------------------
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- // ------------------------------------------------------------------------
- // AbstractUIPlugin
- // ------------------------------------------------------------------------
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
-} \ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java
index 567ec7c906..2f0bf7465e 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java
@@ -37,12 +37,12 @@ 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.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.junit.After;
import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
/**
* The class <code>TraceControlKernelProviderTests</code> contains UST provider handling
@@ -92,7 +92,7 @@ public class TraceControlKernelProviderTests extends TestCase {
public void setUp() throws Exception {
fFacility = TraceControlTestFacility.getInstance();
fProxy = new TestRemoteSystemProxy();
- URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.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();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java
index 0ff1d56641..cdb2969a53 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java
@@ -41,12 +41,12 @@ 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.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.junit.After;
import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
/**
* The class <code>TraceControlKernelSessionTests</code> contains UST session/channel/event
@@ -97,7 +97,7 @@ public class TraceControlKernelSessionTests extends TestCase {
public void setUp() throws Exception {
fFacility = TraceControlTestFacility.getInstance();
fProxy = new TestRemoteSystemProxy();
- URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.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();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java
index 964559dfab..bf0687e984 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java
@@ -46,13 +46,13 @@ 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.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.ui.views.properties.IPropertySource;
import org.junit.After;
import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
/**
@@ -122,7 +122,7 @@ public class TraceControlPropertiesTest extends TestCase {
TestRemoteSystemProxy proxy = 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(DIRECTORY + File.separator + TEST_STREAM), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
proxy.setTestFile(testfile.getAbsolutePath());
proxy.setScenario(SCEN_LIST_INFO_TEST);
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java
index 5a8ac9d9e3..dcb50f90f8 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java
@@ -39,13 +39,13 @@ 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.
@@ -94,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(TraceControlTestFacility.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();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java
index e27ae6e832..0994ffe057 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java
@@ -39,12 +39,12 @@ 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.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.junit.After;
import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
/**
* The class <code>TraceControlUstProviderTests</code> contains UST provider handling
@@ -94,7 +94,7 @@ public class TraceControlUstProviderTests extends TestCase {
public void setUp() throws Exception {
fFacility = TraceControlTestFacility.getInstance();
fProxy = new TestRemoteSystemProxy();
- URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.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();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java
index 9906fa4910..5b6d320630 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java
@@ -41,12 +41,12 @@ 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.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.junit.After;
import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
/**
* The class <code>TraceControlUstSessionTests</code> contains UST session/channel/event
@@ -96,7 +96,7 @@ public class TraceControlUstSessionTests extends TestCase {
public void setUp() throws Exception {
fFacility = TraceControlTestFacility.getInstance();
fProxy = new TestRemoteSystemProxy();
- URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.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();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java
index 9da01c692b..c8a2bdaba7 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java
@@ -38,7 +38,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessio
import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo;
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.osgi.framework.FrameworkUtil;
/**
* The class <code>LTTngControlServiceTest</code> contains test for the class <code>{@link LTTngControlService}</code>.
*/
@@ -90,7 +90,7 @@ public class LTTngControlServiceTest extends TestCase {
super.setUp();
fShellFactory = CommandShellFactory.getInstance();
- 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(DIRECTORY + File.separator + TEST_STREAM), null);
File testfile = new File(FileLocator.toFileURL(location).toURI());
fTestfile = testfile.getAbsolutePath();
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
index 00d63cab89..ef33b22fec 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
@@ -19,12 +19,3 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.rse.services;bundle-version="3.2.100",
org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
org.eclipse.rse.ui;bundle-version="3.2.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.ui;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.property;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.service;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests"
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
index df1b29cbfb..2b4a9cef4b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 0.5.0.qualifier
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.tests;singleton:=true
-Bundle-Activator: org.eclipse.linuxtools.tmf.ui.tests.TmfUITestPlugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit;bundle-version="3.8.2",
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java
deleted file mode 100644
index c2596c613a..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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:
- * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.tmf.ui.tests;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-@SuppressWarnings("nls")
-public class TmfUITestPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui.tests";
-
- // The shared instance
- private static TmfUITestPlugin plugin;
-
- // ========================================================================
- // Constructor
- // ========================================================================
- public TmfUITestPlugin() {
- }
-
- // ========================================================================
- // Methods
- // ========================================================================
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static TmfUITestPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-}
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java
index 3d98b66659..21e4202b96 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java
@@ -27,7 +27,6 @@ import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
-import org.eclipse.linuxtools.tmf.ui.tests.TmfUITestPlugin;
import org.eclipse.linuxtools.tmf.ui.tests.uml2sd.trace.TmfUml2SDTestTrace;
import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.Criteria;
@@ -39,6 +38,7 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.FrameworkUtil;
/**
* Singleton class to facilitate the test cases. Creates UML2SD view and loader objects as well as provides
@@ -123,7 +123,7 @@ public class Uml2SDTestFacility {
try {
// Create test trace object
- URL location = FileLocator.find(TmfUITestPlugin.getDefault().getBundle(), new Path("tracesets/sdEvents"), null); //$NON-NLS-1$
+ URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path("tracesets/sdEvents"), null); //$NON-NLS-1$
File test = new File(FileLocator.toFileURL(location).toURI());
return new TmfTraceStub(test.getPath(), 500, true, parser);
} catch (URISyntaxException e) {

Back to the top