From 21ff564ebbcbd26f46f10157e53fcd293493fc57 Mon Sep 17 00:00:00 2001 From: rschnekenbu Date: Tue, 23 Apr 2013 09:28:36 +0000 Subject: Update use case tests corresponding to update of the generic test framework --- .../canonical/TestUseCaseChildNodeForClassSubject.java | 7 ++++--- .../tests/canonical/TestUseCaseChildNodeForPackage.java | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java index 98e1a3abf92..bbfff3dc127 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java @@ -24,6 +24,7 @@ import org.eclipse.papyrus.commands.ICreationCommand; import org.eclipse.papyrus.diagram.tests.canonical.TestChildNode; import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand; import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes; +import org.eclipse.uml2.uml.UMLPackage; import org.junit.Test; @@ -48,16 +49,16 @@ public class TestUseCaseChildNodeForClassSubject extends TestChildNode { @Test public void testToManageUseCaseForClassSubject() { - testToManageChildNode(UMLElementTypes.UseCase_3009, UMLElementTypes.Classifier_2015, false); + testToManageNode(UMLElementTypes.UseCase_3009, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_2015, false); } @Test public void testToManageUseCaseForComponentSubject() { - testToManageChildNode(UMLElementTypes.UseCase_3009, UMLElementTypes.Classifier_2015, false); + testToManageNode(UMLElementTypes.UseCase_3009,UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_2015, false); } @Test public void testToManageUseCaseForInterfaceSubject() { - testToManageChildNode(UMLElementTypes.UseCase_3009, UMLElementTypes.Classifier_2015, false); + testToManageNode(UMLElementTypes.UseCase_3009, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_2015, false); } @Override protected ICreationCommand getDiagramCommandCreation() { diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java index 93bf06c329f..f56738ee039 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java @@ -19,6 +19,7 @@ import org.eclipse.papyrus.commands.ICreationCommand; import org.eclipse.papyrus.diagram.tests.canonical.TestChildNode; import org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand; import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes; +import org.eclipse.uml2.uml.UMLPackage; import org.junit.Test; @@ -39,7 +40,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManagePackage() { - testToManageChildNode(UMLElementTypes.Package_3014, UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Package_3014, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_3014, true); } /** @@ -47,7 +48,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManageActor() { - testToManageChildNode(UMLElementTypes.Actor_3011, UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Actor_3011, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Package_3014, true); } /** @@ -55,22 +56,22 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManageComment() { - testToManageChildNode(UMLElementTypes.Comment_3015, UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Comment_3015, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_3014, true); } /** * Test to manage component. */ @Test public void testToManageConstraint() { - testToManageChildNode(UMLElementTypes.Constraint_3010, UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Constraint_3010, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_3014, true); } @Test public void testToManageComponent() { - testToManageChildNode(UMLElementTypes.Component_3013, UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Component_3013, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_3014, true); } @Test public void testToManageUseCase() { - testToManageChildNode(UMLElementTypes.UseCase_3012, UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.UseCase_3012, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Package_3014, true); } @Override -- cgit v1.2.3