diff options
| author | ptessier | 2014-05-27 12:41:35 +0000 |
|---|---|---|
| committer | ptessier | 2014-05-27 12:41:35 +0000 |
| commit | 95539f6754acddc819de5ecf4d1662d2063a28d1 (patch) | |
| tree | 90ae071e087fbe2ad86c8a09dcf8fda1934fed74 /tests/junit | |
| parent | 67130185a0837c9082a1b38864ed9e77fcaa5997 (diff) | |
| download | org.eclipse.papyrus-95539f6754acddc819de5ecf4d1662d2063a28d1.tar.gz org.eclipse.papyrus-95539f6754acddc819de5ecf4d1662d2063a28d1.tar.xz org.eclipse.papyrus-95539f6754acddc819de5ecf4d1662d2063a28d1.zip | |
412165: [Refactoring Tests] The tests plug-in should be refactored
https://bugs.eclipse.org/bugs/show_bug.cgi?id=412165
Change-Id: If6f7377dc7eeb862c5765a55df485ce2aadf8635
Diffstat (limited to 'tests/junit')
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java index 9a59e20cfa8..95142b272f7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java @@ -490,12 +490,12 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests if( initialName!=null){
name=initialName;
}
- if(name.length()<((ITextAwareEditPart)createdEditPart).getEditText().length()){
- Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)createdEditPart).getEditText().substring(0,name.length()));
+ if(name.length()<((ITextAwareEditPart)namedEditPart).getEditText().length()){
+ Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)namedEditPart).getEditText().substring(0,name.length()));
}
else{
//not the same it sure but display the mistake is important
- Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)createdEditPart).getEditText());
+ Assert.assertEquals(" the name must contain the name of the metaclass",name, ((ITextAwareEditPart)namedEditPart).getEditText());
}
if(namedEditPart instanceof CompartmentEditPart ){
Assert.assertTrue("the primary editpart must be the namelabelEditpart",namedEditPart instanceof CompartmentEditPart);
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 5b75b396b1e..7699c8827b0 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 @@ -37,7 +37,7 @@ public class TestUseCaseChildNodeForClassSubject extends TestChildNode { @Override
public DiagramUpdater getDiagramUpdater() {
- return org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater.INSTANCE;
+ return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;
}
@Override
protected CreateViewRequest createViewRequestShapeContainer() {
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 0a4182fc71d..292d75e0238 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 @@ -33,7 +33,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { @Override
public DiagramUpdater getDiagramUpdater() {
- return org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater.INSTANCE;
+ return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;
}
@Override
protected CreateViewRequest createViewRequestShapeContainer() {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java index 688b5ece585..d89c00130d1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java @@ -29,7 +29,7 @@ public class TestUseCaseLink extends TestLink { @Override
public DiagramUpdater getDiagramUpdater() {
- return org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater.INSTANCE;
+ return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;
}
@Override
protected ICreationCommand getDiagramCommandCreation() {
@@ -62,11 +62,11 @@ public class TestUseCaseLink extends TestLink { }
@Test
public void testToManageAssociationUseCase_UseCase() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Association_4011,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Association_4011,UMLElementTypes.Package_2016,true,"A_usecase1_usecase");
}
@Test
public void testToManageAssociationUseCase_Actor() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.Actor_2011,UMLElementTypes.Association_4011,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.Actor_2011,UMLElementTypes.Association_4011,UMLElementTypes.Package_2016,true,"A_usecase1_actor");
}
@Test
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java index dfd3907cc0e..cd90b3bc019 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java @@ -29,7 +29,7 @@ public class TestUseCaseLinkOwnedBySource extends TestLinkOwnedBySource { @Override
public DiagramUpdater getDiagramUpdater() {
- return org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater.INSTANCE;
+ return org.eclipse.papyrus.uml.diagram.usecase.custom.edit.parts.CustomUMLDiagramUpdater.INSTANCE;
}
@Override
protected ICreationCommand getDiagramCommandCreation() {
|