Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFlorian Noyrit2015-03-25 08:11:52 -0400
committerFlorian Noyrit2015-03-25 08:11:52 -0400
commit9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c (patch)
treee691a04ba22a8895ae18472176360c04753dad04 /tests
parent7f2d62b5093b9916e04219ddccb58f09195fc42f (diff)
downloadorg.eclipse.papyrus-9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c.tar.gz
org.eclipse.papyrus-9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c.tar.xz
org.eclipse.papyrus-9c90c56d9b73a62ceb1db16fdd5cc58862a5dd2c.zip
Fix elementTypesConfigurations tests.
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations18
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java7
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java6
3 files changed, 19 insertions, 12 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
index 2ff5cb6b1f5..125a0ad1f99 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
@@ -61,6 +61,9 @@
identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass"
hint="Abstract Class Creation Action">
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration
+ xmi:id="_qI4JwNLXEeSAkKOodzTEYg"
+ matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
</elementTypeConfigurations>
<elementTypeConfigurations
xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
@@ -70,6 +73,9 @@
identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype"
hint="ElementElementTypeConfigurations">
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration
+ xmi:id="_8kqIkNLXEeSAkKOodzTEYg"
+ matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
</elementTypeConfigurations>
<elementTypeConfigurations
xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
@@ -79,6 +85,9 @@
identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename"
hint="ElementElementTypeConfigurations">
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration
+ xmi:id="_8yABANLXEeSAkKOodzTEYg"
+ matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
</elementTypeConfigurations>
<elementTypeConfigurations
xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
@@ -88,6 +97,9 @@
identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues"
hint="ElementElementTypeConfigurations">
<specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration
+ xmi:id="_8-EHENLXEeSAkKOodzTEYg"
+ matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
</elementTypeConfigurations>
<elementTypeConfigurations
xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
@@ -97,6 +109,9 @@
identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype"
hint="ElementElementTypeConfigurations">
<specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass</specializedTypesID>
+ <matcherConfiguration
+ xmi:id="_9KgAkNLXEeSAkKOodzTEYg"
+ matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
</elementTypeConfigurations>
<elementTypeConfigurations
xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
@@ -106,6 +121,9 @@
identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView"
hint="ElementElementTypeConfigurations">
<specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename</specializedTypesID>
+ <matcherConfiguration
+ xmi:id="_9WxiANLXEeSAkKOodzTEYg"
+ matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher"/>
</elementTypeConfigurations>
<adviceBindingsConfigurations
xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration"
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
index b5ef43aa3b4..cac6e74c8f2 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2010 CEA LIST.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.uml2.uml.Component;
import org.eclipse.uml2.uml.Package;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -51,7 +50,6 @@ public class ElementEditHelperAdviceTests extends AbstractElementTypeTests imple
Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package With components only type", elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
}
- @Ignore
@Test
public void testPACKAGE_WITH_ALL_ELEMENTSType() {
List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithAllElements, papyrusContext));
@@ -60,14 +58,12 @@ public class ElementEditHelperAdviceTests extends AbstractElementTypeTests imple
Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should not be a Package With components only type", !elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
}
- @Ignore
@Test
// transcoded from extended types framework
public void testSemanticCreateComponentInGoodPackage() throws ExecutionException {
testCreateComponent(packageWithComponents, true);
}
- @Ignore
@Test
// transcoded from extended types framework
public void testSemanticCreateComponentInWrongPackage() throws ExecutionException {
@@ -123,7 +119,6 @@ public class ElementEditHelperAdviceTests extends AbstractElementTypeTests imple
testMoveComponent(otherPackageWithComponents, component1_packageWithComponents, true);
}
- @Ignore
@Test
// transcoded from extended types framework
public void testSemanticMoveComponentFromGoodPackageToWrongPackage() throws ExecutionException {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
index 72696cee1a7..5bb64f419f4 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
@@ -14,14 +14,11 @@
*****************************************************************************/
package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
-
-
import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.papyrus.infra.elementtypesconfigurations.preferences.ElementTypesPreferences;
import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -32,7 +29,6 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
/**
* Test registration based on plugin declaration
*/
- @Ignore
@Test
// transcoded from extended types framework
public final void testGetTypeRegisteredInplugin() {
@@ -46,7 +42,6 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
/**
* Test workspace registration. Element type in the workspace, but element type set is not loaded
*/
- @Ignore
@Test
// transcoded from extended types framework
public final void testGetTypeRegisteredInWorkspaceNotLoaded() {
@@ -61,7 +56,6 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
/**
* Test workspace registration. Element type in the workspace, but element type set is not loaded
*/
- @Ignore
@Test
// transcoded from extended types framework
public final void testLoadUnloadWorkspaceSet() {

Back to the top