Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorCamille Letavernier2013-07-24 16:13:30 +0000
committerCamille Letavernier2013-07-24 16:13:30 +0000
commit18fdfa2851b5610e7d44f959222200bf4e675d7c (patch)
tree56cc2a993aacdfae3bcd6c649d411e855de96219 /tests
parentc77e76590bd61c44a8075ec5a9cddbbf981ae1ed (diff)
parent023ba2a13fdc2ff12dc3d2133dc3e3d2262e28b4 (diff)
downloadorg.eclipse.papyrus-18fdfa2851b5610e7d44f959222200bf4e675d7c.tar.gz
org.eclipse.papyrus-18fdfa2851b5610e7d44f959222200bf4e675d7c.tar.xz
org.eclipse.papyrus-18fdfa2851b5610e7d44f959222200bf4e675d7c.zip
Merge branch 'master' of local repository into Bug-408491-ProfileSwitch
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell2
-rw-r--r--tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem2
-rw-r--r--tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java7
-rw-r--r--tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java16
4 files changed, 25 insertions, 2 deletions
diff --git a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell
new file mode 100644
index 00000000000..a258211653b
--- /dev/null
+++ b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattablecell
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattablecell:Cell xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablecell="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"/>
diff --git a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem
new file mode 100644
index 00000000000..c38a42d9fab
--- /dev/null
+++ b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/resources/My.nattableproblem
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattableproblem:Problem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattableproblem="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"/>
diff --git a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
index 231e537885e..3dbf0bbf06f 100644
--- a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
+++ b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/Activator.java
@@ -27,8 +27,9 @@ public class Activator extends AbstractUIPlugin {
// The shared instance
private static Activator plugin;
-
+
public static LogHelper log;
+
/**
* The constructor
*/
@@ -37,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
@@ -47,6 +49,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
@@ -56,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/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
index 0aa271395ee..9c2c655af28 100644
--- a/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
+++ b/tests/junit/extraplugins/table/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/EditorsTests.java
@@ -23,8 +23,10 @@ import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNatta
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor;
import org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator;
import org.eclipse.papyrus.junit.utils.EditorUtils;
@@ -140,6 +142,20 @@ public class EditorsTests {
Assert.assertTrue(editor instanceof CustomNattabletesterEditor);
}
+
+ @Test
+ public void testOpenNattableTesterCellEditor() throws Exception {
+ IEditorPart editor = openFile("testTableConfiguration", "My.nattablecell", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+ Assert.assertTrue(editor instanceof CustomNattablecellEditor);
+ }
+
+
+ @Test
+ public void testOpenNattableTesterProblemEditor() throws Exception {
+ IEditorPart editor = openFile("testTableConfiguration", "My.nattableproblem", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+ Assert.assertTrue(editor instanceof CustomNattableproblemEditor);
+ }
+
protected String getSourcePath() {
return "/resources/"; //$NON-NLS-1$
}

Back to the top