diff options
Diffstat (limited to 'tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java')
| -rw-r--r-- | tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java index 5845ed638b5..6ace51b9ea9 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper; import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand; +import org.eclipse.papyrus.junit.framework.classification.FailingTest; import org.eclipse.papyrus.uml.validation.tests.Activator; import org.eclipse.papyrus.uml.validation.tests.Messages; import org.eclipse.swt.widgets.Display; @@ -43,14 +44,14 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest { public static final String MODEL_NAME = "UMLValidationTests"; //$NON-NLS-1$ public static final String PKG_NAME_CLASH = "nameclash"; //$NON-NLS-1$ - + public static final String CLASS1 = "Class1"; //$NON-NLS-1$ protected Class class1; - + public static final String PKG_MULTIPLICITY = "multiplicity"; //$NON-NLS-1$ public static final String NON_STANDARD_MULTIPLICITY = "NonStandardMultiplicity"; //$NON-NLS-1$ protected Class nonStandardMultiplicity; - + @Before public void initModelForValidationTest() throws Exception { initModel(PROJECT_PREFIX + MODEL_NAME, MODEL_NAME, Activator.getDefault().getBundle()); @@ -59,7 +60,7 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest { Assert.assertNotNull("RootModel is null", getRootUMLModel()); //$NON-NLS-1$ Model model = (Model) getRootUMLModel(); - + Package nameclash = (Package) model.getPackagedElement(PKG_NAME_CLASH); Assert.assertNotNull(String.format(CAN_NOT_FIND_ELEMENT, PKG_NAME_CLASH, model), nameclash); class1 = (Class) nameclash.getPackagedElement(CLASS1); @@ -69,7 +70,7 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest { Assert.assertNotNull(String.format(CAN_NOT_FIND_ELEMENT, PKG_MULTIPLICITY, model), multiplicty); nonStandardMultiplicity = (Class) multiplicty.getPackagedElement(NON_STANDARD_MULTIPLICITY); Assert.assertNotNull(String.format(CAN_NOT_FIND_ELEMENT, NON_STANDARD_MULTIPLICITY, model), nonStandardMultiplicity); - + final EditingDomain domain = TransactionUtil.getEditingDomain(model); final ValidateModelCommand validateModelCommand = new ValidateModelCommand(model); Display.getDefault().syncExec(new Runnable() { @@ -85,6 +86,7 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest { /** * Simple failing validation for IsActiveEntityRule */ + @FailingTest @Test public void validateNameClashDetection() throws Exception { // get the diagnostic and check for the given class @@ -95,6 +97,7 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest { /** * Simple valid validation for IsActiveEntityRule */ + @FailingTest @Test public void validateNonStandardMultiplicity() throws Exception { // get the diagnostic and check for the given class |