diff options
| author | cletavernie | 2012-03-23 08:59:35 +0000 |
|---|---|---|
| committer | cletavernie | 2012-03-23 08:59:35 +0000 |
| commit | 20b69532663ac3caf56a7aee449333a2ca9a52be (patch) | |
| tree | 9c27a989f31258584a1c5f04372e838d8010f83f /tests | |
| parent | 4835d696a37e79322c69bb4e30d0780acbbdedf0 (diff) | |
| download | org.eclipse.papyrus-20b69532663ac3caf56a7aee449333a2ca9a52be.tar.gz org.eclipse.papyrus-20b69532663ac3caf56a7aee449333a2ca9a52be.tar.xz org.eclipse.papyrus-20b69532663ac3caf56a7aee449333a2ca9a52be.zip | |
359794: [UML - Tools] Content/Label providers
https://bugs.eclipse.org/bugs/show_bug.cgi?id=359794
Diffstat (limited to 'tests')
3 files changed, 17 insertions, 6 deletions
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF index 3d456939966..491ac3489bc 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.junit, org.eclipse.papyrus.uml.tools;bundle-version="0.9.0", - org.eclipse.emf.ecore;bundle-version="2.8.0" + org.eclipse.emf.ecore;bundle-version="2.8.0", + org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/Activator.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/Activator.java index 1ba17f6b453..9955ccd5a9e 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/Activator.java +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/Activator.java @@ -11,6 +11,7 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.tools.tests;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -24,7 +25,9 @@ public class Activator extends AbstractUIPlugin { // The shared instance
private static Activator plugin;
-
+
+ public static LogHelper log;
+
/**
* The constructor
*/
@@ -33,17 +36,22 @@ public class Activator extends 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;
+ log = new LogHelper(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);
@@ -51,7 +59,7 @@ public class Activator extends AbstractUIPlugin { /**
* Returns the shared instance
- *
+ *
* @return the shared instance
*/
public static Activator getDefault() {
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java index e71d622892c..7d3ee5d18f4 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/ContentProviderTest.java @@ -11,7 +11,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.tools.tests.tests;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -46,8 +48,8 @@ public class ContentProviderTest { public void init() {
try {
testModel = EMFHelper.loadEMFModel(new ResourceSetImpl(), URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/emf/TestModel.xmi", true));
- } catch (IOException e) {
-
+ } catch (IOException ex) {
+ Activator.log.error(ex);
}
assertNotNull("Cannot load the EMF Tests model", testModel);
|