diff options
| author | Vincent Lorenzo | 2013-07-24 09:04:15 +0000 |
|---|---|---|
| committer | Vincent Lorenzo | 2013-07-24 09:04:15 +0000 |
| commit | dc7b250263b0c54273c2e23eafec7424e023076b (patch) | |
| tree | f64bdd4fcaed08e8430dc121e0064d5d6bdcd44e /tests/junit | |
| parent | b75d3398cb72af86c4f52db28901cd234cf3dca2 (diff) | |
| parent | 2aec6acd127723841817c8ca0b65c24365ae800c (diff) | |
| download | org.eclipse.papyrus-dc7b250263b0c54273c2e23eafec7424e023076b.tar.gz org.eclipse.papyrus-dc7b250263b0c54273c2e23eafec7424e023076b.tar.xz org.eclipse.papyrus-dc7b250263b0c54273c2e23eafec7424e023076b.zip | |
Merge branch 'pasteInTable'
Diffstat (limited to 'tests/junit')
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$
}
|