Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-03-14 11:50:51 -0400
committerCamille Letavernier2014-03-14 11:50:51 -0400
commit5663068a23b9f422f5574a92d271d2f32bb7ee27 (patch)
tree698ab292a34110f04ac613e77eb0e80b00cbd286 /tests/junit
parent30ce30be670b586bac03cc70556b9a5076988096 (diff)
downloadorg.eclipse.papyrus-5663068a23b9f422f5574a92d271d2f32bb7ee27.tar.gz
org.eclipse.papyrus-5663068a23b9f422f5574a92d271d2f32bb7ee27.tar.xz
org.eclipse.papyrus-5663068a23b9f422f5574a92d271d2f32bb7ee27.zip
430023: [Papyrus Tests] Papyrus shall propose different levels of
testing, to allow test-driven development https://bugs.eclipse.org/bugs/show_bug.cgi?id=430023
Diffstat (limited to 'tests/junit')
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java7
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java13
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF2
4 files changed, 12 insertions, 13 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF
index 45ba9cd9225..72d46afda17 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0"
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Bundle-Vendor: %Bundle-Vendor
Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-ver
sion="0.10.0"
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java
index 43a1f662ad1..bd096cc83a0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java
@@ -13,11 +13,12 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.junit.utils.classification.NotImplemented;
+import org.eclipse.papyrus.junit.utils.tests.AbstractPapyrusTest;
import org.eclipse.swt.SWT;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
@@ -25,7 +26,7 @@ import org.junit.Test;
*
* @author cedric dumoulin
*/
-public class DiContentProviderTest {
+public class DiContentProviderTest extends AbstractPapyrusTest {
/**
* The {@link DiContentProvider} under test.
@@ -198,7 +199,7 @@ public class DiContentProviderTest {
* Check if the method works and DO NO send any event.
*/
@Test
- @Ignore("This test is currently deprecated; current folder cannot be set programmatically")
+ @NotImplemented("This test is currently deprecated; current folder cannot be set programmatically")
public void testSetCurrentFolder() {
// A listener on change event.
ContentChangeListener changeListener = new ContentChangeListener();
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java
index cbc22819782..9b0d16d196e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
import org.eclipse.swt.SWT;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
/**
@@ -60,7 +59,7 @@ public class PageMngrImplTest extends TestCase {
/**
* @see junit.framework.TestCase#setUp()
- *
+ *
* @throws java.lang.Exception
*/
@Override
@@ -85,7 +84,7 @@ public class PageMngrImplTest extends TestCase {
/**
* @see junit.framework.TestCase#tearDown()
- *
+ *
* @throws java.lang.Exception
*/
@After
@@ -96,7 +95,7 @@ public class PageMngrImplTest extends TestCase {
/**
* Lookup for a folder in the SashModel. Return the first folder found.
- *
+ *
* @return
*/
private ITabFolderModel lookupFolderModel() {
@@ -116,7 +115,7 @@ public class PageMngrImplTest extends TestCase {
/**
* Recursively search in sash models for a FolderModel.
* Return the first encountered folder.
- *
+ *
* @param panelModel
* @return
*/
@@ -144,7 +143,6 @@ public class PageMngrImplTest extends TestCase {
* Test method for
* {@link org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl#addPage(org.eclipse.emf.ecore.EObject)}.
*/
- @Ignore("This test is deprecated (Bug 429239)")
public void testAddPage() {
// A listener on change event.
ContentChangeListener changeListener = new ContentChangeListener();
@@ -384,7 +382,6 @@ public class PageMngrImplTest extends TestCase {
* Test method for
* {@link org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageMngrImpl#removePage(org.eclipse.emf.ecore.EObject)}.
*/
- @Ignore("This test is deprecated (Bug 429239)")
public void testRemovePage() {
// A listener on change event.
ContentChangeListener changeListener = new ContentChangeListener();
@@ -434,7 +431,7 @@ public class PageMngrImplTest extends TestCase {
* Check if closing the last page in a second tabfolder work propoerly.
* Create 3 editors, move one in a new folder, then remove the moved one.
* The new folder should automatically be removed.
- *
+ *
*/
public void testCloseLastPageOfTabFolder() {
// A listener on change event.
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
index 99d55f5daec..885a306a9ba 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.papyrus.uml.diagram.wizards
-
+Bundle-Localization: plugin

Back to the top