Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2018-11-12 05:57:01 -0500
committervincent lorenzo2018-11-12 07:56:46 -0500
commit2183e773219d02bfe8c4d85af85212b4875173f1 (patch)
tree9996b65ddb12bf5b9deebbe42920ae00c24f4da0
parenta508c51752fefaba92d3da7ea486125ee935601e (diff)
downloadorg.eclipse.papyrus-2183e773219d02bfe8c4d85af85212b4875173f1.tar.gz
org.eclipse.papyrus-2183e773219d02bfe8c4d85af85212b4875173f1.tar.xz
org.eclipse.papyrus-2183e773219d02bfe8c4d85af85212b4875173f1.zip
Bug 517731 - [Table] Remove Operation requiring parameters from the Create/Destroy Columns
- fix a failing JUnit tests Change-Id: Ic91433d4c3f4f583e25ff2b3537968d511849688 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml20
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/AddElementsOnConnectedTableTest.java20
3 files changed, 22 insertions, 20 deletions
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
index 065930e9299..a2a19dc4557 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
Export-Package: org.eclipse.papyrus.uml.nattable.generic.tests.tests
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
Bundle-Name: %Bundle-Name
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
index 818e5388546..f7eaae8f108 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.eclipse.papyrus.tests</groupId>
<artifactId>org.eclipse.papyrus.uml.nattable.main.test</artifactId>
<version>1.2.0-SNAPSHOT</version>
- </parent>
- <groupId>org.eclipse.papyrus.tests</groupId>
- <artifactId>org.eclipse.papyrus.uml.nattable.generic.tests</artifactId>
- <version>1.2.100-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
+ </parent>
+ <groupId>org.eclipse.papyrus.tests</groupId>
+ <artifactId>org.eclipse.papyrus.uml.nattable.generic.tests</artifactId>
+ <version>1.2.200-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/AddElementsOnConnectedTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/AddElementsOnConnectedTableTest.java
index 183f3405e76..e49ecdc4ade 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/AddElementsOnConnectedTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/AddElementsOnConnectedTableTest.java
@@ -1,6 +1,6 @@
/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
+ * Copyright (c) 2015, 2018 CEA LIST and others.
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
*
* Contributors:
* Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
- *
+ * Vincent LORENZO (CEA-LIST) vincent.lorenzo@cea.fr - Bug 517731
*****************************************************************************/
package org.eclipse.papyrus.uml.nattable.generic.tests.bugs;
@@ -54,12 +54,12 @@ public class AddElementsOnConnectedTableTest extends AbstractPapyrusTest {
/**
* The number of class features and operations.
*/
- private static final int NB_CLASS_FEATURES_AND_OPERATIONS = 164;
+ private static final int NB_CLASS_FEATURES_AND_OPERATIONS = 103;
/**
- * The number of interface features and operations.
+ * The number of features and operations provided by Interface, in addition of UML Class.
*/
- private static final int NB_INTERFACE_FEATURES_AND_OPERATIONS = 9;
+ private static final int NB_INTERFACE_FEATURES_AND_OPERATIONS = 6;
/**
* The number of empty axis (equals to 0).
@@ -93,7 +93,7 @@ public class AddElementsOnConnectedTableTest extends AbstractPapyrusTest {
/**
* This allows to test add of elements in table .
- *
+ *
* @throws Exception
* The exception
*/
@@ -218,7 +218,7 @@ public class AddElementsOnConnectedTableTest extends AbstractPapyrusTest {
/**
* This allow to create a class element in the table from the contextual menu.
- *
+ *
* @param commandService
* The command service.
* @throws Exception
@@ -231,7 +231,7 @@ public class AddElementsOnConnectedTableTest extends AbstractPapyrusTest {
/**
* This allow to create an interface element in the table from the contextual menu.
- *
+ *
* @param commandService
* The command service.
* @throws Exception
@@ -244,7 +244,7 @@ public class AddElementsOnConnectedTableTest extends AbstractPapyrusTest {
/**
* Get the command from the command id an return its created element.
- *
+ *
* @param commandService
* The command service.
* @param commandId

Back to the top