diff options
author | Camille Letavernier | 2014-06-04 16:00:14 +0000 |
---|---|---|
committer | Camille Letavernier | 2014-06-04 16:00:59 +0000 |
commit | d19540ec59f5e8b00bce14096d724db1f5b47ba0 (patch) | |
tree | 6ebda3302971621e824151f0b782ae3eda1e24a1 /tests | |
parent | 8178134b11e2789cbd75e5d3ed4b0e93fd157231 (diff) | |
download | org.eclipse.papyrus-d19540ec59f5e8b00bce14096d724db1f5b47ba0.tar.gz org.eclipse.papyrus-d19540ec59f5e8b00bce14096d724db1f5b47ba0.tar.xz org.eclipse.papyrus-d19540ec59f5e8b00bce14096d724db1f5b47ba0.zip |
[Tests] Enable Sequence and InteractionOverview diagrams tests
Diffstat (limited to 'tests')
3 files changed, 9 insertions, 5 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java index ecd21bd1329..a16cbaa4f46 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java @@ -72,12 +72,12 @@ public class AllTests { /* control mode */ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class)); - + if(System.getProperty("no.SysML.tests") == null) { // SysML tests suiteClasses.addAll(AllSysMLTests.suiteClasses); } - + /* uml */ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.Activator.ID, "org.eclipse.papyrus.diagram.common.tests.AllTests")); suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.service.types.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.service.types.tests.suites.AllTests")); @@ -100,8 +100,8 @@ public class AllTests { suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class)); suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class)); suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.diagram.profile.tests.AllTests.class)); - //suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class)); //Disabled. They currently do not run on Hudson - // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); //Disabled. They currently do not run on Hudson + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class)); + suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); // //nattable tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramActivityTN.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramActivityTN.java index 506fdeab7da..ca2e376db0a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramActivityTN.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramActivityTN.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertTrue; import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart; import org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase; +import org.eclipse.papyrus.junit.utils.classification.InvalidTest; import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityNameEditPart; import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomActivityEditPartTN; import org.eclipse.papyrus.uml.diagram.timing.custom.utils.EditPartUtils; @@ -83,6 +84,7 @@ public class TestInteractionOverviewDiagramActivityTN extends AbstractInteractio assertTrue("The third interaction should be found in the diagram", getDiagramEditPart().getChildren().contains(activity3)); } + @InvalidTest("To be verified") @Test public void testEditInteractionName() { final CustomActivityEditPartTN activityEditPart = createActivity(); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java index 9917ed3b5fe..ec16669dc48 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java @@ -17,6 +17,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; import org.eclipse.papyrus.commands.ICreationCommand; import org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase; +import org.eclipse.papyrus.junit.utils.classification.InteractiveTest; import org.eclipse.papyrus.junit.utils.classification.InvalidTest; import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand; @@ -57,7 +58,8 @@ public class TestInteractionOverviewDiagramChildNode extends AbstractInteraction } @Test - @InvalidTest + @InvalidTest("To be verified") + @InteractiveTest("Opens a dialog") public void testToManageCallBehaviorAction() { testToManageNode(UMLElementTypes.CallBehaviorAction_3008, UMLPackage.eINSTANCE.getCallBehaviorAction(), UMLElementTypes.StructuredActivityNode_3065, false); } |