diff options
| author | Camille Letavernier | 2014-04-04 16:39:44 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-04-04 16:39:44 +0000 |
| commit | 81c1e70f21cc3cfc2d45af7e5e2f0833c667ae38 (patch) | |
| tree | 2813f9cfeafce36149901340de58c8bdd0ff7616 /tests | |
| parent | 7d44f131a17ef9bcbe562d4d5c2adb3b7f6d2e55 (diff) | |
| download | org.eclipse.papyrus-81c1e70f21cc3cfc2d45af7e5e2f0833c667ae38.tar.gz org.eclipse.papyrus-81c1e70f21cc3cfc2d45af7e5e2f0833c667ae38.tar.xz org.eclipse.papyrus-81c1e70f21cc3cfc2d45af7e5e2f0833c667ae38.zip | |
432050: [Requirements Diagram Tests] The SysML Requirements Diagram
tests are invalid
https://bugs.eclipse.org/bugs/show_bug.cgi?id=432050
- Disable Requirements Diagram Tests
- Update Canonical Tests to JUnit 4 style
Diffstat (limited to 'tests')
141 files changed, 1133 insertions, 706 deletions
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF index 19fa63ae5a2..8378d14f47c 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF @@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.sysml.diagram.requirement;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml;bundle-version="1.0.0"
+ org.eclipse.papyrus.sysml;bundle-version="1.0.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.sysml.diagram.requirement.test,
org.eclipse.papyrus.sysml.diagram.requirement.test.canonical,
org.eclipse.papyrus.sysml.diagram.requirement.test.load
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramChildNode.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramChildNode.java index eae349fab7a..c5e41180de7 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramChildNode.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -16,6 +16,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestChildNode;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
@@ -25,6 +26,7 @@ import org.junit.Test; /**
* The Class TestClassDiagramChildNode.
*/
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramChildNode extends TestChildNode {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramCommentLink.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramCommentLink.java index 9ac1d1e7ec5..24277145a46 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramCommentLink.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramCommentLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -14,11 +14,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.canonical; import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestCommentLink;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
import org.junit.Test;
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramCommentLink extends TestCommentLink {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramConstraintLink.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramConstraintLink.java index 970630cd3e8..00e0292f5af 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramConstraintLink.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramConstraintLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -14,11 +14,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.canonical; import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestConstraintLink;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
import org.junit.Test;
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramConstraintLink extends TestConstraintLink {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramContainment.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramContainment.java index 1a06f05d486..b670153d9ce 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramContainment.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramContainment.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -14,11 +14,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.canonical; import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestContainmentLink;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
import org.junit.Test;
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramContainment extends TestContainmentLink {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLink.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLink.java index da1336d7ce5..9f018576fc6 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLink.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.canonical; import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestLink;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
@@ -22,6 +23,7 @@ import org.junit.Test; /**
* The Class TestClassDiagramLink.
*/
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramLink extends TestLink {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLinkOwnedBySource.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLinkOwnedBySource.java index 1bc722c334a..ef8383f43a2 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLinkOwnedBySource.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramLinkOwnedBySource.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -14,11 +14,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.canonical; import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestLinkOwnedBySource;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
import org.junit.Test;
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramLinkOwnedBySource extends TestLinkOwnedBySource {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramTopNode.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramTopNode.java index 0c14e525a1a..691960a9f1f 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramTopNode.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/TestRequirementDiagramTopNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -16,6 +16,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.diagram.tests.canonical.TestTopNode;
+import org.eclipse.papyrus.junit.utils.classification.InvalidTest;
import org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand;
import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.requirement.test.IRequirementDiagramTestsConstants;
@@ -25,6 +26,7 @@ import org.junit.Test; /**
* The Class TestClassDiagramTopNode.
*/
+@InvalidTest("UML Diagram Canonical Tests are not compatible with profiled models")
public class TestRequirementDiagramTopNode extends TestTopNode {
@Override
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load100RequirementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load100RequirementTest.java index 06bd8326d81..59f21eb3cdd 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load100RequirementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load100RequirementTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -44,7 +47,7 @@ public class Load100RequirementTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load10RequirementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load10RequirementTest.java index 500f5d34715..5d20f34ca8b 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load10RequirementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load10RequirementTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -44,7 +47,7 @@ public class Load10RequirementTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load200RequirementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load200RequirementTest.java index 0ff2a768eb0..e6fa9e7e613 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load200RequirementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load200RequirementTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -44,7 +47,7 @@ public class Load200RequirementTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load300RequirementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load300RequirementTest.java index 33eca5936bb..6bc56940694 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load300RequirementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load300RequirementTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -44,7 +47,7 @@ public class Load300RequirementTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load400RequirementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load400RequirementTest.java index 6b4ccf06ff3..c0de79775fe 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load400RequirementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load400RequirementTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -44,7 +47,7 @@ public class Load400RequirementTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load500RequirementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load500RequirementTest.java index cb4c43b0b88..c0105ccab0d 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load500RequirementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/Load500RequirementTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -44,7 +47,7 @@ public class Load500RequirementTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF index e1190295cbe..1d6566e0d65 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
- org.junit;bundle-version="4.10.0"
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java index 4785e95c539..8ba345a1bf3 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityAffixedChildNode.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
@@ -9,9 +9,13 @@ * Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
*****************************************************************************/
-
package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -55,10 +59,10 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas protected String getFileName() {
return IActivityDiagramTestsConstants.FILE_NAME;
}
-
+
@Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
projectCreation();
assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
@@ -68,7 +72,7 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -96,7 +100,7 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -125,7 +129,7 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -153,7 +157,7 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -186,7 +190,7 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java index 3aa297141d1..0019e719689 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -11,14 +11,16 @@ * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
*
*****************************************************************************/
-
package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
@@ -39,17 +41,18 @@ public abstract class AbstractTestActivityChildNode extends TestChildNode { protected boolean isSemanticTest() {
return true;
}
-
+
/**
* {@inheritDoc}
*/
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
- return new CreateActivityDiagramCommand();
+ return new CreateActivityDiagramCommand();
}
-
+
/**
* Test change container.
- *
+ *
* @param type
* the type
* @param containerType
@@ -58,59 +61,59 @@ public abstract class AbstractTestActivityChildNode extends TestChildNode { @Override
public void testChangeContainer(IElementType type, IElementType containerType) {
//CHANGE CONTAINER
- assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getContainerEditPart().getChildren().size());
- assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getRootSemanticModel().getOwnedElements().size());
+ assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getContainerEditPart().getChildren().size());
+ assertEquals(CHANGE_CONTAINER + INITIALIZATION_TEST, 1, getRootSemanticModel().getOwnedElements().size());
+
+ final Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getContainerEditPart().getDiagramPreferencesHint());
+
+ command = null;
+ Display.getDefault().syncExec(new Runnable() {
- final Request requestcreation = CreateViewRequestFactory.getCreateShapeRequest(containerType, getContainerEditPart().getDiagramPreferencesHint());
-
- command = null;
- Display.getDefault().syncExec( new Runnable() {
-
- public void run() {
- command = getContainerEditPart().getCommand(requestcreation);
- }
- });
- assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
- assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
- assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
- executeOnUIThread(command);
- assertEquals(CONTAINER_CREATION + TEST_THE_EXECUTION, 2, getRootView().getChildren().size());
- GraphicalEditPart containerEditPart = (GraphicalEditPart)getContainerEditPart().getChildren().get(1);
- ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);
- changeBoundsRequest.setEditParts((EditPart)getContainerEditPart().getChildren().get(0));
- changeBoundsRequest.setLocation(new Point(30, 30));
- ShapeCompartmentEditPart compartment = null;
- int index = 0;
- while(compartment == null && index < containerEditPart.getChildren().size()) {
- if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
- compartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
- }
- index++;
- }
- assertTrue("Container not found", compartment != null);
+ public void run() {
+ command = getContainerEditPart().getCommand(requestcreation);
+ }
+ });
+ assertNotNull(CONTAINER_CREATION + COMMAND_NULL, command);
+ assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+ assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+ executeOnUIThread(command);
+ assertEquals(CONTAINER_CREATION + TEST_THE_EXECUTION, 2, getRootView().getChildren().size());
+ GraphicalEditPart containerEditPart = (GraphicalEditPart)getContainerEditPart().getChildren().get(1);
+ ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);
+ changeBoundsRequest.setEditParts((EditPart)getContainerEditPart().getChildren().get(0));
+ changeBoundsRequest.setLocation(new Point(30, 30));
+ ShapeCompartmentEditPart compartment = null;
+ int index = 0;
+ while(compartment == null && index < containerEditPart.getChildren().size()) {
+ if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart) {
+ compartment = (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));
+ }
+ index++;
+ }
+ assertTrue("Container not found", compartment != null);
- command = compartment.getCommand(changeBoundsRequest);
- assertNotNull(CHANGE_CONTAINER, command);
- assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
- assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+ command = compartment.getCommand(changeBoundsRequest);
+ assertNotNull(CHANGE_CONTAINER, command);
+ assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+ assertTrue(CHANGE_CONTAINER + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
- // execute change container
- executeOnUIThread(command);
- assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootView().getChildren().size());
- assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootSemanticModel().getOwnedElements().size());
- assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());
+ // execute change container
+ executeOnUIThread(command);
+ assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootView().getChildren().size());
+ assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, getRootSemanticModel().getOwnedElements().size());
+ assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());
- // undo change container
- undoOnUIThread();
- assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootView().getChildren().size());
- assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootSemanticModel().getOwnedElements().size());
- assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 0, compartment.getChildren().size());
+ // undo change container
+ undoOnUIThread();
+ assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootView().getChildren().size());
+ assertEquals(CHANGE_CONTAINER + TEST_THE_UNDO, 2, getRootSemanticModel().getOwnedElements().size());
+ assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 0, compartment.getChildren().size());
- // redo change container
- redoOnUIThread();
- assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootView().getChildren().size());
- // assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootSemanticModel().getOwnedElements().size());
- assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());
+ // redo change container
+ redoOnUIThread();
+ assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootView().getChildren().size());
+ // assertEquals(CHANGE_CONTAINER + TEST_THE_REDO, 1, getRootSemanticModel().getOwnedElements().size());
+ assertEquals(CHANGE_CONTAINER + TEST_THE_EXECUTION, 1, compartment.getChildren().size());
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java index 12c8ea1833d..028374e976e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestActivityChildwithOtherCreation.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -14,6 +14,9 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -37,7 +40,8 @@ import org.eclipse.uml2.uml.Element; import org.junit.Before;
/**
- * Set as deprecated.
+ * Set as deprecated.
+ *
* @use {@link AbstractTestActivityChildNode}
*/
@Deprecated
@@ -48,7 +52,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Gets the root compartment.
- *
+ *
* @return the root compartment
*/
protected ShapeCompartmentEditPart getRootCompartment() {
@@ -60,7 +64,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
- *
+ *
* @return
*/
@@ -71,7 +75,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
projectCreation();
assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1);
@@ -89,7 +93,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -113,7 +117,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -142,7 +146,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -170,7 +174,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -204,7 +208,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -232,7 +236,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl /**
* Test change container.
- *
+ *
* @param type
* the type
* @param containerType
@@ -280,7 +284,7 @@ public abstract class AbstractTestActivityChildwithOtherCreation extends org.ecl assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 0);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CHANGE_CONTAINER + TEST_THE_REDO, getRootView().getChildren().size() == 1);
- //Here there is a problem for activity diagram it is not clear
+ //Here there is a problem for activity diagram it is not clear
//assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);
assertTrue(CHANGE_CONTAINER + TEST_THE_EXECUTION, compartment.getChildren().size() == 1);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java index 9563ba1477d..c4875ac9702 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AbstractTestCaseIntoStructureActivity.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
@@ -37,7 +42,7 @@ public abstract class AbstractTestCaseIntoStructureActivity extends TestChildNod @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
projectCreation();
assertEquals(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size(), 1);
GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF index 58312d8da03..fcc9db139c5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.diagram.component;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.diagram.component;bundle-version="1.0.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.diagram.component.test,
org.eclipse.papyrus.uml.diagram.component.test.canonical,
org.eclipse.papyrus.uml.diagram.component.test.load
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java index a963968c443..1bb985fc6b0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load1000ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java index 727637b9e0a..65969e27832 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load100ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java index 30ec914f2fa..92263cdf523 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load10ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java index 4f3e4050779..85b9a4b1836 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load200ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java index 8e7780c77ea..a3f4d0f1006 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load300ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java index 5ee2822d10f..c15854ebdeb 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load400ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java index eaf7ee292fe..1677c07e401 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.component.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load500ComponentTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IComponentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a Component.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF index 90b70036b71..1c6d926acee 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml;bundle-version="4.0.0", org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0", org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0", - org.junit;bundle-version="4.10.0" + org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java index 34841a567d7..4288a720c74 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2014 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 @@ -13,6 +13,8 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.composite.test.canonical; +import static org.junit.Assert.assertTrue; + import java.util.List; import org.eclipse.gef.commands.Command; @@ -25,6 +27,7 @@ import org.eclipse.papyrus.diagram.tests.canonical.TestLinkWithParent; import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand; import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants; +import org.junit.Before; import org.junit.Test; @@ -43,7 +46,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink * @return the diagram command creation * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation() */ - + @Override protected ICreationCommand getDiagramCommandCreation() { return new CreateCompositeDiagramCommand(); @@ -55,7 +58,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink * @return the project name * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName() */ - + @Override protected String getProjectName() { return ICompositeDiagramTestsConstants.PROJECT_NAME; @@ -67,31 +70,32 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink * @return the file name * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName() */ - + @Override protected String getFileName() { return ICompositeDiagramTestsConstants.FILE_NAME; } - + /** * Sets the up. * - * @throws Exception the exception + * @throws Exception + * the exception * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#setUp() */ - + @Before @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); parentType = UMLElementTypes.Class_2073; } - + /** * Inits the configuration for a link owned by the parent. */ - protected void initConfLinkOwnedByParent(){ + protected void initConfLinkOwnedByParent() { // expected values before link creation beginRootSemanticOwnedElementSize = 2; beginDiagramEditPartChildrenSize = 2; @@ -101,24 +105,27 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink // expected values after link creation endSourceConnectionsSize = beginSourceConnectionsSize + 1; endRootSemanticOwnedElementSize = beginRootSemanticOwnedElementSize + 1; - endDiagramEditPartChildrenSize = beginDiagramEditPartChildrenSize; + endDiagramEditPartChildrenSize = beginDiagramEditPartChildrenSize; endRootEdgeSize = beginRootEdgeSize + 1; endRootViewChildrenSize = beginRootViewChildrenSize; } - + /** * Install environment. * - * @param sourceType the source type - * @param targetType the target type - * @see org.eclipse.papyrus.diagram.tests.canonical.TestLinkWithParent#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType, org.eclipse.gmf.runtime.emf.type.core.IElementType) + * @param sourceType + * the source type + * @param targetType + * the target type + * @see org.eclipse.papyrus.diagram.tests.canonical.TestLinkWithParent#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType, + * org.eclipse.gmf.runtime.emf.type.core.IElementType) */ - + @Override public void installEnvironment(IElementType sourceType, IElementType targetType) { super.installEnvironment(sourceType, targetType); - + //create the parent source CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(parentType, getDiagramEditPart().getDiagramPreferencesHint()); requestcreation.setLocation(DEFAULT_PARENT_LOCATION); @@ -126,27 +133,27 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink assertTrue(command.canExecute()); diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); targetParent = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1); - + //create the target requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint()); requestcreation.setLocation(DEFAULT_SOURCE_LOCATION); command = targetParent.getCommand(requestcreation); assertTrue(command.canExecute()); - diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); + diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); // FIXME : get(0) : header; get(1) : container List<GraphicalEditPart> children = targetParent.getChildren(); - target = (GraphicalEditPart)children.get(2); + target = children.get(2); } - + /** * Test to manage port connector. */ @Test public void testToManagePortConnector() { testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Connector_4013); - } - + } + /** * Test to manage port usage. */ @@ -154,8 +161,8 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink public void testToManagePortUsage() { initConfLinkOwnedByParent(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Usage_4008, UMLElementTypes.Class_2073, true); - } - + } + /** * Test to manage port abstraction. */ @@ -163,8 +170,8 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink public void testToManagePortAbstraction() { initConfLinkOwnedByParent(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4007, UMLElementTypes.Class_2073, true); - } - + } + /** * Test to manage port substitution. */ @@ -172,14 +179,14 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink public void testToManagePortSubstitution() { initConfLinkOwnedByParent(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Substitution_4011, UMLElementTypes.Class_2073, true); - } - + } + /** * Test to manage port generalization. */ @Test public void testToManagePortGeneralization() { testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4015); - } - + } + } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java index 3ba2b068662..09e7dac2210 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2014 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 @@ -13,6 +13,8 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.composite.test.canonical; +import static org.junit.Assert.assertTrue; + import java.util.List; import org.eclipse.gef.commands.Command; @@ -25,6 +27,7 @@ import org.eclipse.papyrus.diagram.tests.canonical.TestLinkWithParent; import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand; import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.composite.test.ICompositeDiagramTestsConstants; +import org.junit.Before; import org.junit.Test; /** @@ -32,14 +35,14 @@ import org.junit.Test; */ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithParent { - + /** * Gets the diagram command creation. * * @return the diagram command creation * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation() */ - + @Override protected ICreationCommand getDiagramCommandCreation() { return new CreateCompositeDiagramCommand(); @@ -51,7 +54,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP * @return the project name * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getProjectName() */ - + @Override protected String getProjectName() { return ICompositeDiagramTestsConstants.PROJECT_NAME; @@ -63,55 +66,58 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP * @return the file name * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getFileName() */ - + @Override protected String getFileName() { return ICompositeDiagramTestsConstants.FILE_NAME; } - + /** * Sets the up. * - * @throws Exception the exception + * @throws Exception + * the exception * @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#setUp() */ - + @Before @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); parentType = UMLElementTypes.Class_2073; } - + /** * Install environment. * - * @param sourceType the source type - * @param targetType the target type - * @see org.eclipse.papyrus.diagram.tests.canonical.TestLinkWithParent#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType, org.eclipse.gmf.runtime.emf.type.core.IElementType) + * @param sourceType + * the source type + * @param targetType + * the target type + * @see org.eclipse.papyrus.diagram.tests.canonical.TestLinkWithParent#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType, + * org.eclipse.gmf.runtime.emf.type.core.IElementType) */ - @Override public void installEnvironment(IElementType sourceType, IElementType targetType) { super.installEnvironment(sourceType, targetType); - + //create the target CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint()); requestcreation.setLocation(DEFAULT_SOURCE_LOCATION); Command command = parent.getCommand(requestcreation); assertTrue(command.canExecute()); - diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); + diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); // FIXME : get(0) : header; get(1) : container List<GraphicalEditPart> children = parent.getChildren(); - target = (GraphicalEditPart)children.get(3); + target = children.get(3); } - + /** * Init the configuration for a link owned by the parent. (Connector) */ - protected void initConfLinkOwnedByParent(){ + protected void initConfLinkOwnedByParent() { // expected values before link creation beginRootSemanticOwnedElementSize = 1; beginDiagramEditPartChildrenSize = 1; @@ -121,16 +127,16 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP // expected values after link creation endSourceConnectionsSize = beginSourceConnectionsSize + 1; endRootSemanticOwnedElementSize = beginRootSemanticOwnedElementSize; - endDiagramEditPartChildrenSize = beginDiagramEditPartChildrenSize; - endRootEdgeSize = beginRootEdgeSize+1; + endDiagramEditPartChildrenSize = beginDiagramEditPartChildrenSize; + endRootEdgeSize = beginRootEdgeSize + 1; endRootViewChildrenSize = beginRootViewChildrenSize; } - - + + /** * Init the configuration for a link owned by the root. (Usage) */ - protected void initConfLinkOwnedByDiagram(){ + protected void initConfLinkOwnedByDiagram() { // expected values before link creation beginRootSemanticOwnedElementSize = 1; beginDiagramEditPartChildrenSize = 1; @@ -140,11 +146,11 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP // expected values after link creation endSourceConnectionsSize = beginSourceConnectionsSize + 1; endRootSemanticOwnedElementSize = beginRootSemanticOwnedElementSize + 1; - endDiagramEditPartChildrenSize = beginDiagramEditPartChildrenSize; + endDiagramEditPartChildrenSize = beginDiagramEditPartChildrenSize; endRootEdgeSize = beginRootEdgeSize + 1; endRootViewChildrenSize = beginRootViewChildrenSize; - } - + } + /** * Test to manage port connector. */ @@ -153,7 +159,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP initConfLinkOwnedByParent(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Connector_4013, UMLElementTypes.Class_2073, true); } - + /** * Test to manage port usage. */ @@ -161,8 +167,8 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP public void testToManagePortUsage() { initConfLinkOwnedByDiagram(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Usage_4008, UMLElementTypes.Class_2073, true); - } - + } + /** * Test to manage port abstraction. */ @@ -170,8 +176,8 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP public void testToManagePortAbstraction() { initConfLinkOwnedByDiagram(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4007, UMLElementTypes.Class_2073, true); - } - + } + /** * Test to manage port substitution. */ @@ -179,14 +185,14 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP public void testToManagePortSubstitution() { initConfLinkOwnedByDiagram(); testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Substitution_4011, UMLElementTypes.Class_2073, true); - } - + } + /** * Test to manage port generalization. */ @Test public void testToManagePortGeneralization() { testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4015); - } - + } + } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF index 3c51746b7d4..a7e5fa2379d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="1.0.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.diagram.deployment.test,
org.eclipse.papyrus.uml.diagram.deployment.test.canonical,
org.eclipse.papyrus.uml.diagram.deployment.test.load
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java index bbe332d9399..bee0d59151b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestWithoutReconnectAMultilinkk.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.Request;
@@ -29,10 +32,11 @@ import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.papyrus.diagram.tests.canonical.TestLink;
import org.eclipse.uml2.uml.Element;
-public abstract class TestWithoutReconnectAMultilinkk extends TestLink {
+public abstract class TestWithoutReconnectAMultilinkk extends TestLink {
+
/**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -64,7 +68,7 @@ public abstract class TestWithoutReconnectAMultilinkk extends TestLink { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -98,7 +102,7 @@ public abstract class TestWithoutReconnectAMultilinkk extends TestLink { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -115,7 +119,7 @@ public abstract class TestWithoutReconnectAMultilinkk extends TestLink { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
*/
@@ -203,7 +207,7 @@ public abstract class TestWithoutReconnectAMultilinkk extends TestLink { /**
* test the drop of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
@@ -214,7 +218,7 @@ public abstract class TestWithoutReconnectAMultilinkk extends TestLink { /**
* test the creation of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java index ff073fab518..cc462415c4d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load1000NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java index d7b17e4ee2c..09c44c66f53 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load100NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java index 47de67d9202..b792d9d3de9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load10NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java index 3886edbae9e..3c4bc10acd5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load200NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java index 5dd05405845..c053e5c4f64 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load300NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java index 8a6c617facf..7e2e9278cde 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load400NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java index 3c9e6f605c3..54941ec0b42 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.deployment.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -36,10 +39,10 @@ public class Load500NodeTest extends AbstractPapyrusTestCase { protected String getFileName() {
return IDeploymentDiagramTestsConstants.FILE_NAME;
}
-
+
/**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF index f651fbfa510..a5f119632be 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml;bundle-version="4.0.2",
org.eclipse.gmf.runtime.diagram.ui,
org.eclipse.gmf.runtime.diagram.ui,
- org.junit;bundle-version="4.10.0"
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview.te
sts
Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java index da5da14147c..74cc945dd66 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2013 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 @@ -10,6 +10,12 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.interactionoverview.tests.canonical; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -73,10 +79,11 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected boolean operationFailed = false; + @Override protected ICreationCommand getDiagramCommandCreation() { return new InteractionOverviewDiagramCreateCommand(); } - + @Override protected String getProjectName() { return IInteractionoverviewDiagramTestsConstants.PROJECT_NAME; @@ -90,12 +97,12 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { /** * Create a view for the given type, plus the associated semantic element unless the given type is a notation-only * type. - * + * * <ul> * <li>if type is an {@link INotationType}, then create a view using a {@link CreateViewRequest} * <li>otherwise, create a view and the corresponding semantic element using a CreateViewAndElementRequest * </ul> - * + * * @param elementType * the type for which to create a view (and possibly a model element) * @param parentEditPart @@ -109,12 +116,12 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { /** * Create a view for the given type, plus the associated semantic element unless the given type is a notation-only * type. - * + * * <ul> * <li>if type is an {@link INotationType}, then create a view using a {@link CreateViewRequest} * <li>otherwise, create a view and the corresponding semantic element using a CreateViewAndElementRequest * </ul> - * + * * @param elementType * the type for which to create a view (and possibly a model element) * @param location @@ -214,6 +221,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } /** Execute the given command in the diagram editor. */ + @Override protected void execute(final Command command) { resetLastOperationFailedState(); getCommandStack().execute(new GEFtoEMFCommandWrapper(command)); @@ -221,6 +229,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } /** Undo the last command done in the diagram editor. */ + @Override protected void undo() { resetLastOperationFailedState(); final CommandStack commandStack = getCommandStack(); @@ -230,6 +239,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } /** Redo the last command undone in the diagram editor. */ + @Override protected void redo() { resetLastOperationFailedState(); final CommandStack commandStack = getCommandStack(); @@ -239,6 +249,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } /** Call {@link AbstractPapyrusTestCase#execute(Command) execute} on the UI thread. */ + @Override protected void executeOnUIThread(final Command command) { Display.getDefault().syncExec(new Runnable() { @@ -249,6 +260,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } /** Call {@link AbstractPapyrusTestCase#undo() undo} on the UI thread. */ + @Override protected void undoOnUIThread() { Display.getDefault().syncExec(new Runnable() { @@ -259,6 +271,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } /** Call {@link AbstractPapyrusTestCase#redo() redo} on the UI thread. */ + @Override protected void redoOnUIThread() { Display.getDefault().syncExec(new Runnable() { @@ -282,6 +295,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * Reset the "operation failed" state. Call this before executing each operation for which you want to test whether * if failed with {@link AbstractPapyrusTestCase#assertLastOperationSuccessful()}. */ + @Override protected void resetLastOperationFailedState() { this.operationFailed = false; } @@ -290,13 +304,15 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * Asserts that no Command executed on the {@link IOperationHistory} since the last call to * {@link AbstractPapyrusTestCase#resetLastOperationFailedState resetLastOperationFailedState} returned * {@link OperationHistoryEvent#OPERATION_NOT_OK}. - * + * */ + @Override protected void assertLastOperationSuccessful() { assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed); } /** The command stack to use to execute commands on the diagram. */ + @Override protected CommandStack getCommandStack() { // not "diagramEditor.getDiagramEditDomain().getDiagramCommandStack()" because it messes up undo contexts return this.diagramEditor.getEditingDomain().getCommandStack(); @@ -346,7 +362,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { /** * Send the given EditPart a "delete" request (which only deletes the View), and execute the returned command. - * + * * @param editPart * the EditPart to hide */ @@ -378,7 +394,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { /** * Send the given EditPart a {@link DestroyElementRequest}, and execute the returned command. - * + * * @param editPart * the EditPart to destroy */ @@ -456,7 +472,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * Set the name of the given GraphicalEditPart (which must be a name edit part) using a DirectEditRequest. This sets * the name in the Text widget that appears as a result of the DirectEditRequest, and then closes the Text widget to * accept the changes. - * + * * @param editPart * the edit part on which to perform the DirectEditRequest. * @param newName 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 c81098c2fde..506fdeab7da 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 @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2013 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 @@ -10,8 +10,12 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.interactionoverview.tests.canonical; +import static org.junit.Assert.assertEquals; +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.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; @@ -33,7 +37,7 @@ public class TestInteractionOverviewDiagramActivityTN extends AbstractInteractio projectCreation(); createActivity(); - assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1); + assertTrue(AbstractPapyrusTestCase.CREATION + AbstractPapyrusTestCase.INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1); GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0); rootCompartment = null; int index = 0; 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 58a43e2b4c9..0e86d342684 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 @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2013 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 @@ -10,10 +10,13 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.interactionoverview.tests.canonical; +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.gmf.runtime.diagram.ui.requests.CreateViewRequest; import org.eclipse.papyrus.commands.ICreationCommand; +import org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase; import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand; import org.eclipse.uml2.uml.UMLPackage; @@ -24,11 +27,11 @@ public class TestInteractionOverviewDiagramChildNode extends AbstractInteraction @Before @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { projectCreation(); createActivity(); - assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1); + assertTrue(AbstractPapyrusTestCase.CREATION + AbstractPapyrusTestCase.INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 1); GraphicalEditPart containerEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0); rootCompartment = null; int index = 0; diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java index 702d44f3839..ec7dab676b6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2013 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 @@ -10,6 +10,10 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.interactionoverview.tests.canonical; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart; diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF index a2ad97c8d05..ad8e7cc7849 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF @@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.diagram.sequence.tests
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java index dfb937a117f..cc4bb063a08 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -74,7 +77,7 @@ public class TestAdvancedDragDrop_364696 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Override
protected void projectCreation() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java index 5c739e679fd..bde93103adb 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
@@ -36,6 +39,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;
import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;
import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestTopNode;
+import org.junit.After;
import org.junit.Test;
/**
@@ -43,7 +47,7 @@ import org.junit.Test; * the user just wants to delete the combined fragment and keeping its content.
* It would be useful to give the possibility to not delete the combined
* fragment content. This would imply a refactoring of the model.
- *
+ *
*/
public class TestCombinedFragmentDeletion_364804 extends TestTopNode {
@@ -51,7 +55,7 @@ public class TestCombinedFragmentDeletion_364804 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -210,8 +214,9 @@ public class TestCombinedFragmentDeletion_364804 extends TestTopNode { }
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
page.closeAllEditors(false);
papyrusEditor = null;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java index 6e5c8c4c403..25137b5e284 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -39,6 +42,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDi import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestLink;
import org.eclipse.uml2.uml.CombinedFragment;
import org.eclipse.uml2.uml.Message;
+import org.junit.After;
import org.junit.Test;
/**
@@ -54,7 +58,7 @@ public class TestCombinedFragmentGates_364816 extends TestLink { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -171,8 +175,9 @@ public class TestCombinedFragmentGates_364816 extends TestLink { assertTrue(CREATION + TEST_THE_REDO, cf.getCfragmentGates().size() == 1);
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
waitForComplete();
PopupUtil.removeDialogCloseHandler();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java index 8b5adbf0a09..3deceb31d73 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.ecore.EAttribute;
@@ -46,9 +49,9 @@ import org.junit.Test; * combined fragment owing more than one operand when the modification is
* compatible with the number of operands. For instance, the change of seq kind to
* alt kind should be allowed.
- *
+ *
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=364710
- *
+ *
*/
public class TestCombinedFragmentKind_364710 extends TestTopNode {
@@ -58,7 +61,7 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java index 6ce4dd50d1c..719d269d849 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.draw2d.geometry.Dimension;
@@ -37,9 +41,9 @@ import org.junit.Test; /**
* Combined fragment name shall be displayed at the right upper corner of the fragment.
- *
+ *
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=382951
- *
+ *
*/
public class TestCombinedFragmentName_382951 extends TestTopNode {
@@ -54,7 +58,7 @@ public class TestCombinedFragmentName_382951 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java index 202cf03b8b9..f53d97b7c66 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
@@ -46,7 +49,7 @@ import org.junit.Test; * Adding of operands is allowed, but it is not possible to delete an operand
* from a combined fragment. Moreover, the resize of operands is also not
* possible. https://bugs.eclipse.org/bugs/show_bug.cgi?id=364701
- *
+ *
*/
public class TestCombinedFragmentOperand_364701 extends TestTopNode {
@@ -56,7 +59,7 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java index 71c26e98f2c..e032f51764d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.ecore.EObject;
@@ -36,7 +39,7 @@ import org.junit.Test; /**
* Undo doesn't work anymore for creation of the following elements: lifelines, messages, action and behavior executions.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=384618
- *
+ *
*/
public class TestCreationUndo_384618 extends TestLink {
@@ -44,7 +47,7 @@ public class TestCreationUndo_384618 extends TestLink { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java index ca13b87ddc2..7438c7833ad 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import org.eclipse.core.resources.IFile;
@@ -57,6 +60,7 @@ import org.eclipse.uml2.uml.CombinedFragment; import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.After;
import org.junit.Test;
@@ -77,7 +81,7 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -178,8 +182,9 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode { assertTrue(CREATION + TEST_THE_EXECUTION, !cf2.getCovereds().contains(childLifeline.resolveSemanticElement()));
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
waitForComplete();
PopupUtil.removeDialogCloseHandler();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java index ba11e4a5627..764c57a3c3e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import org.eclipse.core.resources.IFile;
@@ -62,6 +65,7 @@ import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.After;
import org.junit.Test;
@@ -94,7 +98,7 @@ public class TestDecompositionMove_364812 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Override
protected void projectCreation() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -154,7 +158,7 @@ public class TestDecompositionMove_364812 extends TestTopNode { @Test
public void testMoving() {
LifelineEditPart decomposition = setupDecomposition();
- { // test move
+ { // test move
moveLifeline(decomposition, new Point(50, 0));
moveLifeline(decomposition, new Point(-20, 0));
// move child
@@ -294,8 +298,9 @@ public class TestDecompositionMove_364812 extends TestTopNode { return p;
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
waitForComplete();
PopupUtil.removeDialogCloseHandler();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java index ed4f2fa0eef..28e492bd61b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -40,7 +43,7 @@ import org.junit.Test; * The icon of the tool "destruction node" is missing in the palette of the sequence diagram editor.
* The default size of the figure associated to the destruction node is too big and should be resizable.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=384201
- *
+ *
*/
public class TestDestructionNode_384201 extends TestTopNode {
@@ -61,7 +64,7 @@ public class TestDestructionNode_384201 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testResizeNorth() {
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java index 15a786beff2..243e04fb0ea 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -57,7 +60,7 @@ import org.junit.Test; * An embedded textuel editor shall allow editing duration constraints. This editor shall be accessible on the diagram.
* When the two values of the interval are equal, the value shall be displayed only once.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=384596
- *
+ *
*/
public class TestDurationConstraints_384596 extends TestTopNode {
@@ -85,7 +88,7 @@ public class TestDurationConstraints_384596 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testDurationEdition() {
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java index da06d0370d7..26d397e89c0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -38,7 +41,7 @@ import org.junit.Test; /**
* Cannot reduce dimensions of Behavior Execution Specification box. The minimal height is 20.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=384572
- *
+ *
*/
public class TestExecutionSpecificationDimension_384572 extends TestTopNode {
@@ -58,7 +61,7 @@ public class TestExecutionSpecificationDimension_384572 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testResizeActionExecutionNorth() {
resizeNorth(UMLElementTypes.ActionExecutionSpecification_3006);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java index 68a9015dae3..30530f17c8e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -60,7 +63,7 @@ import org.junit.Test; /**
* An advanced textual editor for combined fragments guards would allow to capture
* complex guards.
- *
+ *
*/
public class TestGuardEdition_364808 extends TestTopNode {
@@ -72,7 +75,7 @@ public class TestGuardEdition_364808 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java index 12558aa09a6..3f8241ee035 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Collections;
import org.eclipse.draw2d.geometry.Dimension;
@@ -55,7 +58,7 @@ import org.junit.Test; * Minint and Maxint values are allways visible on the diagram, even when the guard of a loop combined fragment is deleted and also when these values
* are not defined. This interval shall not appear on the diagram when it is not defined in the model.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=382966
- *
+ *
*/
public class TestInteractionConstraint_382966 extends TestTopNode {
@@ -65,7 +68,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -94,7 +97,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode { }
}, true);
waitForComplete();
-
+
//introduced a guard edit part for displaying operand label.
WrappingLabel label = op instanceof CustomInteractionOperandEditPart ? ((CustomInteractionOperandEditPart)op).getInteractionConstraintLabel() : op.getPrimaryShape().getInteractionConstraintLabel();
assertTrue(TEST_THE_EXECUTION, label.getText().equals(""));
@@ -118,7 +121,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode { }
}, true);
waitForComplete();
-
+
WrappingLabel label = op instanceof CustomInteractionOperandEditPart ? ((CustomInteractionOperandEditPart)op).getInteractionConstraintLabel() : op.getPrimaryShape().getInteractionConstraintLabel();
assertTrue(TEST_THE_EXECUTION, label.getText().equals(""));
}
@@ -126,7 +129,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode { /**
* Execute a EMF command without history
- *
+ *
* @param editingDomain
* The editing domain
* @param command
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java index df4edf47f42..14b7a34e503 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.ecore.EObject;
@@ -39,7 +42,7 @@ import org.junit.Test; * All lifelines (except lifelines that are result of a create message) should be
* aligned vertically and must remain aligned.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=364688
- *
+ *
*/
public class TestLifelineAlignment_364688 extends TestLink {
@@ -49,7 +52,7 @@ public class TestLifelineAlignment_364688 extends TestLink { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java index 7f82de543d9..589b3f686e8 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.util.Collections;
@@ -69,7 +72,7 @@ import org.junit.Test; * When the width of a lifeline has been manually modified, it should not be in autosize mode
* (the size should not be modified when the Lifeline#represent property is set).
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=383723
- *
+ *
*/
public class TestLifelineAutoResize_383723 extends TestTopNode {
@@ -83,7 +86,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -180,7 +183,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode { /**
* Execute a EMF command without history
- *
+ *
* @param editingDomain
* The editing domain
* @param command
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java index c550acee5f5..f49275d15f5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import org.eclipse.core.resources.IFile;
@@ -64,7 +67,7 @@ import org.junit.Test; * One should be able to only show the represented element type name, or its name, or both. When the type is not set, one should have the choice to
* make it appear as undefined or to be systematically hidden.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=383722
- *
+ *
*/
public class TestLifelineLabelCustomize_383722 extends TestTopNode {
@@ -104,7 +107,7 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testLabelAppearence1() {
final LifelineEditPart lifeline1 = setupLifeline();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java index a996ed27cee..10f6dd8c4fd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
@@ -43,7 +46,7 @@ import org.junit.Test; * The active region to select the target Lifeline is very critical in the creation of the message Create. The active region should be header and the
* vertical bar.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=379661
- *
+ *
*/
public class TestMessageCreate_379661 extends TestLink {
@@ -63,7 +66,7 @@ public class TestMessageCreate_379661 extends TestLink { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testHeaderAnchor() {
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java index 2dc92422a03..7f4bcbd4453 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.ecore.EObject;
@@ -41,7 +44,7 @@ import org.junit.Test; /**
* It is not possible to link a constraint to a messageEnd with a constraint Link.
* The selection of a messageEnd should be possible.
- *
+ *
*/
public class TestMessageEndConstraint_364817 extends TestLink {
@@ -49,7 +52,7 @@ public class TestMessageEndConstraint_364817 extends TestLink { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java index 0346427eaad..69ef1988eae 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.AbstractPointListShape;
import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.ConnectionAnchor;
@@ -50,7 +53,7 @@ import org.junit.Test; /**
* Within the sequence diagram editor, it not possible to model lost message,found message or general ordering.
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=384202
- *
+ *
*/
public class TestMessageLostFound_384202 extends TestLink {
@@ -68,7 +71,7 @@ public class TestMessageLostFound_384202 extends TestLink { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testMessageFound() {
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
@@ -180,7 +183,7 @@ public class TestMessageLostFound_384202 extends TestLink { /**
* Get the extremity of a connection edit part
- *
+ *
* @param connection
* the connection edit part to find extremity
* @param isStart
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java index 7bca6668139..8e0e3fb320c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -51,7 +54,7 @@ import org.junit.Test; * When a message is deleted, its associated send and receive events are not
* deleted. These events must be deleted because new events are systematically
* created upon the creation of a new message.
- *
+ *
* It fixes the deletion of the associated send MessageSend and receive
* MessageRecv events for
* - Message Sync
@@ -59,7 +62,7 @@ import org.junit.Test; * - Message Reply
* - Message Create
* - Message Delete
- *
+ *
*/
public class TestMessagesDeletion_364828 extends TestLink {
@@ -77,7 +80,7 @@ public class TestMessagesDeletion_364828 extends TestLink { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Override
public CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target, ILinkTestProvider provider) {
CreateConnectionViewRequest request = super.createConnectionViewRequest(type, source, target, provider);
@@ -118,9 +121,11 @@ public class TestMessagesDeletion_364828 extends TestLink { private int getMessageEndCount(EList<InteractionFragment> fragments) {
int count = 0;
- for(InteractionFragment f : fragments)
- if(f instanceof MessageEnd)
+ for(InteractionFragment f : fragments) {
+ if(f instanceof MessageEnd) {
count++;
+ }
+ }
return count;
}
@@ -221,9 +226,11 @@ public class TestMessagesDeletion_364828 extends TestLink { public int getSemanticChildrenSize() {
int count = 0;
EList<Element> elems = ((Element)getRootEditPart().getNotationView().getElement()).getOwnedElements();
- for(Element f : elems)
- if(!(f instanceof MessageEnd) && !(f instanceof ExecutionOccurrenceSpecification))
+ for(Element f : elems) {
+ if(!(f instanceof MessageEnd) && !(f instanceof ExecutionOccurrenceSpecification)) {
count++;
+ }
+ }
return count;
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java index 65f715f9f87..614173bf32e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -50,7 +53,7 @@ public class TestMovingCombinedFragment_364711 extends TestTopNode { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java index 3e07a646706..14038d63bcf 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.Request;
@@ -58,7 +61,7 @@ public class TestNestedCombinedFragment_364795 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testCover() {
// create parent combined fragment
@@ -76,13 +79,13 @@ public class TestNestedCombinedFragment_364795 extends TestTopNode { final CombinedFragment parentCF = (CombinedFragment)parentCFP.resolveSemanticElement();
final CombinedFragment childCF = (CombinedFragment)childCFP.resolveSemanticElement();
- waitForComplete(); // wait for updating covered field
+ waitForComplete(); // wait for updating covered field
assertTrue(CREATION + TEST_THE_EXECUTION, parentCF.getCovereds().size() == 2);
assertTrue(CREATION + TEST_THE_EXECUTION, childCF.getCovereds().size() == 2);
GraphicalEditPart lifelineEP = (GraphicalEditPart)getRootEditPart().getChildren().get(2);
deleteNode(lifelineEP);
- waitForComplete(); // wait for updating covered field
+ waitForComplete(); // wait for updating covered field
assertTrue(CREATION + TEST_THE_EXECUTION, parentCF.getCovereds().size() == 1);
assertTrue(CREATION + TEST_THE_EXECUTION, childCF.getCovereds().size() == 1);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java index 9ce1a333492..d62b73d3d02 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -43,7 +46,7 @@ import org.junit.Test; /**
* Support all messages in nested actions and behaviors execution (delete, move and resize)
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=384616
- *
+ *
*/
public class TestNestedExecution_384616 extends TestTopNode {
@@ -65,7 +68,7 @@ public class TestNestedExecution_384616 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testActionExecutionSpecification() {
manageActions(UMLElementTypes.ActionExecutionSpecification_3006);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java index 807415c74a7..2803d777785 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.AbstractPointListShape;
@@ -77,7 +80,7 @@ public class TestObservationLink_364826 extends TestLink { protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
-
+
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -404,9 +407,9 @@ public class TestObservationLink_364826 extends TestLink { /**
* Copy from org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil.getAbsoluteEdgeExtremity(ConnectionNodeEditPart, boolean)
- *
+ *
* Get the extremity of a connection edit part
- *
+ *
* @param connection
* the connection edit part to find extremity
* @param isStart
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java index d0ce757a506..c8d44daf201 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -39,7 +42,7 @@ import org.junit.Test; * When childs are outside the current size, the parent bar should autoresize. The parent should always wrap the children.
* Its size should be extended when we create, move, resize and reparent a child
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=385603
- *
+ *
*/
public class TestParentBarAutoresize_385603 extends TestTopNode {
@@ -61,7 +64,7 @@ public class TestParentBarAutoresize_385603 extends TestTopNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testActionExecutionSpecificationUp() {
moveUp(UMLElementTypes.ActionExecutionSpecification_3006);
@@ -110,7 +113,7 @@ public class TestParentBarAutoresize_385603 extends TestTopNode { assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y == getAbsoluteBounds(child).getTop().y);
/*
* the parent would not be always expanded.
- *
+ *
* assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y - before.getTop().y == moveDelta.y);
*/
assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y <= getAbsoluteBounds(child).getTop().y);
@@ -141,7 +144,7 @@ public class TestParentBarAutoresize_385603 extends TestTopNode { /*
* DISABLED: the parent is not always expanded when adding a child.
- *
+ *
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y > before.getBottom().y);
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y == getAbsoluteBounds(child).getBottom().y);
*/
@@ -167,7 +170,7 @@ public class TestParentBarAutoresize_385603 extends TestTopNode { /*
* parent would not be changed.
- *
+ *
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y == getAbsoluteBounds(child).getBottom().y);
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).height == before.height + deltaSize.height);
*/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java index eb367dc21c9..a2fb67bc149 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.ecore.EObject;
@@ -36,13 +39,14 @@ import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;
import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;
import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestLink;
+import org.junit.After;
import org.junit.Test;
/**
* When a synchronous message is created, an executionSpecification (Action or
* Behavior: a popup menu should give the choice to the user) has to be created in
* case it does'nt exist.
- *
+ *
*/
public class TestSynchronousMessageCreation_364827 extends TestLink {
@@ -60,7 +64,7 @@ public class TestSynchronousMessageCreation_364827 extends TestLink { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
public void selectActionExecution(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType subNodeType) {
installEnvironment(sourceType, targetType, subNodeType);
target = createSubNode(target, subNodeType, getAbsoluteCenter(target));
@@ -77,7 +81,7 @@ public class TestSynchronousMessageCreation_364827 extends TestLink { AbstractMessageEditPart p = (AbstractMessageEditPart)source.getSourceConnections().get(0);
assertTrue(CREATION + TEST_THE_EXECUTION, ((View)p.getModel()).getType().equals(((IHintedType)linkType).getSemanticHint()));
- // assertTrue(CREATION + TEST_THE_EXECUTION, target.getChildren().size() == 2); // LifelineNameEditPart
+ // assertTrue(CREATION + TEST_THE_EXECUTION, target.getChildren().size() == 2); // LifelineNameEditPart
assertTrue(CREATION + TEST_THE_EXECUTION, target instanceof ActionExecutionSpecificationEditPart);
getDiagramCommandStack().undo();
@@ -115,8 +119,9 @@ public class TestSynchronousMessageCreation_364827 extends TestLink { assertTrue(CREATION + TEST_THE_REDO, target.getTargetConnections().size() == 1);
}
+ @After
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
super.tearDown();
waitForComplete();
PopupUtil.removeMenuListener();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java index 739c6f71605..decae0fa1b5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
@@ -63,6 +67,7 @@ import org.eclipse.ui.intro.IIntroPart; import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.OccurrenceSpecification;
import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Before;
/**
* @author Jin Liu (jin.liu@soyatec.com)
@@ -83,7 +88,7 @@ public abstract class AbstractNodeTest extends TestTopNode { /**
* @see org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
- *
+ *
* @return
*/
@Override
@@ -93,11 +98,12 @@ public abstract class AbstractNodeTest extends TestTopNode { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestTopNode#setUp()
- *
+ *
* @throws Exception
*/
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
Runnable runnable = new Runnable() {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java index f846b456d5f..caf7cd53d0e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,12 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.Collections;
import org.eclipse.draw2d.ConnectionAnchor;
@@ -94,7 +100,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
protected Event createMouseEvent(int x, int y, int button, int stateMask, int count) {
Event event = new Event();
event.time = (int)System.currentTimeMillis();
@@ -147,13 +153,14 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { menu.notifyListeners(SWT.Show, event);
menu.setVisible(true);
MenuItem[] items = menu.getItems();
- for(MenuItem it : items)
+ for(MenuItem it : items) {
if(it.getText().toLowerCase().contains(itemText)) {
Event e = createEvent();
e.widget = it;
it.notifyListeners(SWT.Selection, e);
}
+ }
menu.notifyListeners(SWT.Hide, event);
menu.setVisible(false);
waitForComplete();
@@ -171,7 +178,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { }
@Test
- // test property view of duration link
+ // test property view of duration link
public void testDurationLinkProperty() {
LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), null);
assertNotNull(lifeline);
@@ -323,7 +330,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
public void testDurationMoveResize() {
- // test move
+ // test move
DurationConstraintEditPart dc = (DurationConstraintEditPart)createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(400, 200), null);
assertNotNull(dc);
moveEditPart(dc, new Point(50, 0));
@@ -508,7 +515,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { }
@Test
- // duration link to message and execution
+ // duration link to message and execution
public void testLinkingExecutionMessageOnTwoLifeline() {
LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 80), null);
assertNotNull(lifeline1);
@@ -726,6 +733,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { assertTrue(MOVE + TEST_THE_REDO, after.equals(getAbsoluteBounds(lifelineEP)));
}
+ @Override
protected EditPartViewer.Conditional getTargetingConditional(final Request req) {
return new EditPartViewer.Conditional() {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java index aef3bcc260d..7333cf61889 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Field;
import java.util.Collections;
@@ -60,18 +64,19 @@ import org.junit.Test; /**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=396799
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestElementIcon_396799 extends AbstractNodeTest {
/**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
+ @Override
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
}
@@ -84,7 +89,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
protected void replaceEannotation(EAnnotation annotation, EModelElement object) {
while(object.getEAnnotation(annotation.getSource()) != null) {
object.getEAnnotations().remove(object.getEAnnotation(annotation.getSource()));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java index ecef169e85d..a467e82cea6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.eclipse.draw2d.geometry.Dimension;
@@ -34,7 +39,7 @@ import org.junit.Test; /**
* Test Execution ends(one is MessageOccurrenceSpecification of linked message) when the message reconnected or deleted.
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestExecutionEndsWithMessageOccurrenceSpecification extends AbstractNodeTest {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java index ecb1672f3b5..e40f3dbecc7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
@@ -66,8 +69,8 @@ import org.junit.Test; /**
* Bug:
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=395462
- *
- *
+ *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest {
@@ -101,7 +104,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testOnChangeLifelineName() {
//Make sure the lifeline width is -1 to enable auto-increment.
@@ -293,7 +296,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest });
getDiagramCommandStack().execute(command);
waitForComplete();
- //waiting until dialog closed.
+ //waiting until dialog closed.
while(true) {
if(!result.isEmpty()) {
result.get(0).close();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java index b6cccace00c..e92bd03ce3c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.eclipse.draw2d.geometry.Point;
@@ -47,7 +51,7 @@ import org.junit.Test; /**
* Test the name of a Gate which created automatically on CombinedFragment when adding a Message.
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestGateNameOnCombinedFragment extends AbstractNodeTest {
@@ -185,6 +189,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { return null;
}
+ @Override
protected EditPart createLink(IElementType elementType, EditPartViewer currentViewer, Point startLocation, EditPart sourceEditPart, Point endLocation, EditPart targetEditPart) {
final EditPart linkEditPart = super.createLink(elementType, currentViewer, startLocation, sourceEditPart, endLocation, targetEditPart);
if(linkEditPart instanceof AbstractMessageEditPart) {
@@ -207,7 +212,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { label.translateToAbsolute(b);
req.setLocation(b.getCenter());
req.getExtendedData().put(SequenceRequestConstant.DIRECT_EDIT_AFTER_CREATION, true);
-// messageEditPart.performRequest(req);
+ // messageEditPart.performRequest(req);
waitForComplete();
@@ -215,7 +220,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { Control control = messageEditPart.getViewer().getControl();
control.setFocus();
Control focusControl = control.getDisplay().getFocusControl();
-
+
waitForComplete();
}
@@ -228,7 +233,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { GateEditPart gateEditPart = createGate(cfEditPart, new Point(cfBounds.right() - 1, cfBounds.y + cfBounds.height / 2));
assertNotNull("Gate on CombinedFragment creation", gateEditPart);
- Gate gate = (Gate)((GateEditPart)gateEditPart).resolveSemanticElement();
+ Gate gate = (Gate)gateEditPart.resolveSemanticElement();
changeName(getEditingDomain(), gate, gateName);
assertEquals("Check gate name when creation", gateName, gate.getLabel());
//2. Create Lifeline
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java index 2ce78589404..6e194ed0976 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.eclipse.draw2d.IFigure;
@@ -52,7 +57,7 @@ import org.junit.Test; /**
* Graphical Presentation of Gate with In/Out
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=389531
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestGraphicalGate_389531 extends AbstractNodeTest {
@@ -174,7 +179,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { /**
* Create a Gate on given type parent.
- *
+ *
* @param parentType
* @param parentLocation
* @param parentSize
@@ -197,6 +202,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { return es;
}
+ @Override
protected EditPart createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
EditPart editPart = super.createNode(type, parentPart, location, size);
assertNotNull("create failed: " + type.getDisplayName(), editPart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java index 664f3c9eb92..d9562033cd1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA
*
- *
+ *
* 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
@@ -46,7 +51,6 @@ import org.eclipse.ui.part.IPage; import org.eclipse.ui.views.properties.PropertySheet;
import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -54,16 +58,6 @@ import org.junit.Test; */
public class TestGuardVisibility_402966 extends AbstractNodeTest {
- /**
- * @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
- * @throws Exception
- */
- @Before
- protected void setUp() throws Exception {
- super.setUp();
- }
-
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -73,7 +67,7 @@ public class TestGuardVisibility_402966 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testPreferencePage() {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUseInCombinedFragment_402971.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUseInCombinedFragment_402971.java index 85d0d0d9b52..21793669867 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUseInCombinedFragment_402971.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUseInCombinedFragment_402971.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -26,9 +29,9 @@ import org.junit.Test; /**
* Fixed bug: A new created InteractionUse in CombinedFragment is always located at left and top
- *
+ *
* See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=402971
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestInteractionUseInCombinedFragment_402971 extends AbstractNodeTest {
@@ -42,7 +45,7 @@ public class TestInteractionUseInCombinedFragment_402971 extends AbstractNodeTes protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void test() {
CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(500, 200));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java index 32f902306ec..1b8f2007d3f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Field;
import org.eclipse.draw2d.geometry.Dimension;
@@ -34,7 +37,7 @@ import org.junit.Test; /**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=402978
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestMakeSameHeightForLifelines_402978 extends AbstractNodeTest {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java index 7082e57cada..a3745fc57f9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
@@ -23,7 +26,7 @@ import org.junit.Test; /**
* Create a lifeline if the target of Create message is not selected.
- *
+ *
* @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=403134
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -38,7 +41,7 @@ public class TestMessageCreateWithLifeline_403134 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void test() {
LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java index d24eb4bdd60..44acd5ff1b4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
@@ -46,7 +49,8 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
+ @Override
protected EditPart createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
EditPart node = super.createNode(type, parentPart, location, size);
assertNotNull("Create Node Failed: " + type.getDisplayName(), node);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java index 23bfd933c8c..4671f21cf8b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.RequestConstants;
@@ -28,7 +31,7 @@ import org.junit.Test; /**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=402970
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestMoveAnchorInsideCoRegion_402970 extends AbstractNodeTest {
@@ -42,7 +45,7 @@ public class TestMoveAnchorInsideCoRegion_402970 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testMoveMessageDown() {
LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 300));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java index bad8704d109..e56df0b7972 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.RequestConstants;
@@ -28,7 +31,7 @@ import org.junit.Test; /**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=403138
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestMoveMessageLostFound_403138 extends AbstractNodeTest {
@@ -42,7 +45,7 @@ public class TestMoveMessageLostFound_403138 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testMoveMessageFound() {
LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 300));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java index 53eaae68a99..2fa4f9a5329 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
@@ -28,7 +32,7 @@ import org.junit.Test; /**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=403233
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestOrderingFragments_403233 extends AbstractNodeTest {
@@ -42,7 +46,7 @@ public class TestOrderingFragments_403233 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testOrderingAfterCreateExecutions() {
LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java index b5a54468e1a..fa559e75fd3 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -21,26 +23,15 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;
-import org.junit.Before;
import org.junit.Test;
/**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=395774
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestResizeStateInvariant_395774 extends AbstractNodeTest {
- /**
- * @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
- * @throws Exception
- */
- @Before
- protected void setUp() throws Exception {
- super.setUp();
- }
-
@Override
protected String getProjectName() {
return ISequenceDiagramTestsConstants.PROJECT_NAME;
@@ -50,7 +41,7 @@ public class TestResizeStateInvariant_395774 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testResize() {
LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java index a2464cf110e..5e4a9514f26 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -31,7 +34,7 @@ import org.junit.Test; /**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=402969
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestShiftEnclosingMessageInOperand_402969 extends AbstractNodeTest {
@@ -45,7 +48,7 @@ public class TestShiftEnclosingMessageInOperand_402969 extends AbstractNodeTest protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testResizeOperand() {
LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), new Dimension(80, 300));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java index d81a05dce92..0bff3ef59b6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -64,10 +68,10 @@ import org.junit.Test; /**
* Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=402964
- *
+ *
* Description:
* http://ec2-46-137-124-143.eu-west-1.compute.amazonaws.com/confluence/display/PAPYRUS/402964+-+Display+type+name+as+tooltip+of+each+node+element
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class TestTooltip_402964 extends AbstractNodeTest {
@@ -83,7 +87,7 @@ public class TestTooltip_402964 extends AbstractNodeTest { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testLifelineTooltip() {
LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/BaseStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/BaseStereotypesTest.java index a226a2b133e..18144603782 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/BaseStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/BaseStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -94,7 +98,7 @@ public class BaseStereotypesTest extends AbstractNodeTest { assertTrue("displayInCompartment", displayInCompartment);
final View node = ((GraphicalEditPart)editPart).getNotationView();
int i = 0;
- //we go through all sub nodes
+ //we go through all sub nodes
Node compartmentNode = null;
while(i < node.getChildren().size()) {
if((node.getChildren().get(i)) instanceof Node) {
@@ -314,7 +318,7 @@ public class BaseStereotypesTest extends AbstractNodeTest { @SuppressWarnings("unchecked")
Iterator<Edge> edgeIterator = semanticView.getSourceEdges().iterator();
while(edgeIterator.hasNext()) {
- Edge edge = (Edge)edgeIterator.next();
+ Edge edge = edgeIterator.next();
if(edge.getType().equals("AppliedStereotypesCommentLink")) {
appliedStereotypeLink = edge;
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java index f732e4828f0..4ddea4fa887 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,10 +13,13 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
@@ -29,12 +32,12 @@ public class CombinedFragmentStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
assertNotNull(combinedFragment);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java index dbcdf693db5..27eb2b21982 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.transaction.RecordingCommand;
@@ -24,9 +26,9 @@ import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
import org.eclipse.uml2.uml.CombinedFragment;
import org.eclipse.uml2.uml.InteractionOperatorKind;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -36,12 +38,12 @@ public class ContinuationStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java index 6dfd99ac2d1..e8ff49bf8e4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,13 +13,15 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintAppliedStereotypeEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -29,12 +31,12 @@ public class DurationConstraintStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
durationConstraint = (DurationConstraintEditPart)createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(100, 100), null);
assertNotNull(durationConstraint);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java index 77b841c362c..7228a48efe1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,13 +13,15 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationAppliedStereotypeEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -29,12 +31,12 @@ public class DurationObservationStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
durationObservation = (DurationObservationEditPart)createNode(UMLElementTypes.DurationObservation_3024, getRootEditPart(), new Point(100, 100), null);
assertNotNull(durationObservation);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java index ecca1d5af99..43f25a948ee 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,13 +13,15 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -29,12 +31,12 @@ public class ExecutionSpecificationStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 300), null);
assertNotNull(lifeline);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java index b5099c3e4f9..ad66ea686ff 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
@@ -23,10 +25,9 @@ import org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest; import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
import org.junit.Test;
-
/**
* Fixed bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=417373
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373 extends AbstractNodeTest {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java index 3ff1d8e2b54..15bace95276 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
@@ -34,9 +38,9 @@ import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure; import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
import org.eclipse.uml2.uml.Message;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -80,11 +84,12 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
prepareDiagram();
}
@@ -304,7 +309,7 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest { public void testResizeLifelineAfterStereotypeApplied() {
//Applied stereotype on lifeline1
doTestDisplayStereotypeInCompartment(lifeline4, lifeline4);
- //resize down/up from bottom
+ //resize down/up from bottom
resize(lifeline4, SequenceUtil.getAbsoluteBounds(lifeline4).getLocation(), PositionConstants.SOUTH, new Dimension(0, 30));
resize(lifeline4, SequenceUtil.getAbsoluteBounds(lifeline4).getLocation(), PositionConstants.NORTH, new Dimension(0, 30));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java index 0def0237bdc..30709adcd74 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.ArrayList;
import java.util.List;
@@ -36,10 +39,9 @@ import org.eclipse.uml2.uml.Message; import org.eclipse.uml2.uml.OccurrenceSpecification;
import org.junit.Test;
-
/**
* Fixed bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=417375
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class Fixbug_OrderFragmentsAfterMessageReconnection_417375 extends AbstractNodeTest {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java index 7db412a8d92..6941374241f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.ArrayList;
import java.util.List;
@@ -31,10 +34,9 @@ import org.eclipse.uml2.uml.Interaction; import org.eclipse.uml2.uml.InteractionFragment;
import org.junit.Test;
-
/**
* Fixed bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=417374
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class Fixbug_OrderFragmentsAfterResizeExecutions_417374 extends AbstractNodeTest {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GateStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GateStereotypesTest.java index 006f298a94d..1c988edde5a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GateStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GateStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.eclipse.draw2d.geometry.Point;
@@ -24,9 +27,9 @@ import org.eclipse.gef.requests.CreationFactory; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.util.GateHelper;
import org.eclipse.uml2.uml.Gate;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -36,12 +39,12 @@ public class GateStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
gate = createGate(getRootEditPart().getParent(), new Point(0, 100));
assertNotNull(gate);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java index 9897d92b860..5d049e290f9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,15 +13,17 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -31,12 +33,12 @@ public class GeneralOrderingStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java index c2678d7bbc6..007cb311ca7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;
@@ -20,9 +22,9 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditP import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandGuardEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -32,12 +34,12 @@ public class InteractionOperandStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java index df142682a38..1bf4554d90e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
@@ -20,9 +22,9 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -38,12 +40,12 @@ public class InteractionStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
interaction = (InteractionEditPart)getRootEditPart().getParent();
assertNotNull(interaction);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java index d5e25775ef6..e36247957a3 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,13 +13,15 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
-
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
@@ -29,12 +31,12 @@ public class InteractionUseStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
assertNotNull(interactionUse);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java index a4f0e15d96c..d76afc9b51f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,11 +13,14 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
+import org.junit.Before;
import org.junit.Test;
@@ -32,12 +35,12 @@ public class LifelineStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java index 35db86e4b80..1bba0b6af0a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java index c4b31abfdca..8815b68d757 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Point;
@@ -33,12 +38,13 @@ import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.OpaqueBehavior;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Before;
import org.junit.Test;
/**
* Display behavior as a label: https://bugs.eclipse.org/bugs/show_bug.cgi?id=417376
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class New_DisplayBehaviorForBehaviorExecutionSpecification_417376 extends AbstractNodeTest {
@@ -108,12 +114,12 @@ public class New_DisplayBehaviorForBehaviorExecutionSpecification_417376 extends /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
assertNotNull("lifeline", lifeline);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java index 491fb4d23b5..d36f199d2a2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Point;
@@ -41,12 +45,13 @@ import org.eclipse.uml2.uml.TimeExpression; import org.eclipse.uml2.uml.TimeInterval;
import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Before;
import org.junit.Test;
/**
* Display invariant for a StateInvariant: https://bugs.eclipse.org/bugs/show_bug.cgi?id=417377
- *
+ *
* @author Jin Liu (jin.liu@soyatec.com)
*/
public class New_DisplayInvariantForStateInvariant_417377 extends AbstractNodeTest {
@@ -57,12 +62,12 @@ public class New_DisplayInvariantForStateInvariant_417377 extends AbstractNodeTe /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
assertNotNull("lifeline", lifeline);
@@ -148,7 +153,7 @@ public class New_DisplayInvariantForStateInvariant_417377 extends AbstractNodeTe @Override
protected void doExecute() {
- Constraint constraint = (Constraint)interaction.createOwnedRule("constraintRule", UMLPackage.eINSTANCE.getConstraint());
+ Constraint constraint = interaction.createOwnedRule("constraintRule", UMLPackage.eINSTANCE.getConstraint());
LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
value.setValue("testConstraint");
constraint.setSpecification(value);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java index 67a99bb6425..c3b5b60918b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,10 +13,13 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
@@ -29,12 +32,12 @@ public class StateInvariantStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_3017, lifeline, new Point(131, 150), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java index b870dabb89a..8aee35edd9c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
@@ -22,6 +24,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPa import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
+import org.junit.Before;
import org.junit.Test;
@@ -34,12 +37,12 @@ public class TimeConstraintStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, new Point(131, 100), null);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java index bed8b263da4..deb3d61284c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 CEA
*
- *
+ *
* 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
@@ -13,12 +13,15 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
+import static org.junit.Assert.assertNotNull;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
+import org.junit.Before;
import org.junit.Test;
@@ -31,12 +34,12 @@ public class TimeObservationStereotypesTest extends BaseStereotypesTest { /**
* @see org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7.AbstractNodeTest#setUp()
- *
+ *
* @throws Exception
*/
-
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
timeObservation = (TimeObservationEditPart)createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), new Point(100, 100), null);
assertNotNull(timeObservation);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java index 62557f0c4db..e33461694f6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
@@ -31,6 +34,7 @@ import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper; import org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase;
import org.eclipse.swt.widgets.Display;
import org.eclipse.uml2.uml.Element;
+import org.junit.Before;
/**
@@ -81,7 +85,7 @@ public abstract class TestChildNode extends AbstractPapyrusTestCase { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -118,7 +122,7 @@ public abstract class TestChildNode extends AbstractPapyrusTestCase { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -151,7 +155,7 @@ public abstract class TestChildNode extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -198,8 +202,9 @@ public abstract class TestChildNode extends AbstractPapyrusTestCase { getDiagramCommandStack().execute(command);
}
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
createTopNode();
}
@@ -219,13 +224,13 @@ public abstract class TestChildNode extends AbstractPapyrusTestCase { /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
* the container type
*/
- public void testToManageChildNode(IElementType type, IChildTestProvider provider) { //IElementType containerType,
+ public void testToManageChildNode(IElementType type, IChildTestProvider provider) { //IElementType containerType,
testToCreateChildNode(type, provider);
// the node is still present
testDestroy(type, provider);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java index 7053285471a..98eaac29ebe 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.eclipse.draw2d.IFigure;
@@ -53,7 +55,7 @@ public class TestCombinedFragmentChildNode extends TestChildNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testToManageOperand() {
testToManageChildNode(UMLElementTypes.InteractionOperand_3005, combinedFragmentProvider);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java index 35fdb4f9dd5..4e7cfb6c1a4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.eclipse.draw2d.IFigure;
@@ -117,7 +120,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Get the bounds of an edit part
- *
+ *
* @param part
* edit part to find bounds
* @return part's bounds in absolute coordinates
@@ -155,7 +158,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test view deletion.
- *
+ *
* @param type
* the type
* @param provider
@@ -186,7 +189,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Retrieves the TransactionalEditingDomain
- *
+ *
* @return the editing domain (can be null)
*/
protected TransactionalEditingDomain getEditingDomain() {
@@ -204,7 +207,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test destroy.
- *
+ *
* @param type
* the type
* @param provider
@@ -240,7 +243,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
* @param provider
@@ -414,7 +417,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param provider
@@ -439,7 +442,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* test the creation of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param provider
* @param allowed
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java index 96094122842..633bd608f72 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -62,7 +65,7 @@ public class TestSequenceDiagramChildNode extends TestChildNode { protected String getFileName() {
return ISequenceDiagramTestsConstants.FILE_NAME;
}
-
+
@Test
public void testToManageActionExecution() {
testToManageChildNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineProvider);
@@ -183,9 +186,11 @@ public class TestSequenceDiagramChildNode extends TestChildNode { public int getSemanticChildrenSize() {
Lifeline lifeline = ((Lifeline)getParentEditPart().getNotationView().getElement());
int count = 0;
- for(InteractionFragment f : lifeline.getCoveredBys())
- if(f instanceof DestructionOccurrenceSpecification || f instanceof ActionExecutionSpecification || f instanceof BehaviorExecutionSpecification)
+ for(InteractionFragment f : lifeline.getCoveredBys()) {
+ if(f instanceof DestructionOccurrenceSpecification || f instanceof ActionExecutionSpecification || f instanceof BehaviorExecutionSpecification) {
count++;
+ }
+ }
return count;
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java index 20ebe1af1ab..f0c933c0292 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2012 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.IFigure;
@@ -87,17 +90,6 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { return (Package)container;
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
protected void waitForComplete() {
boolean run = true;
while(run) {
@@ -119,7 +111,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { /**
* Get the bounds of an edit part
- *
+ *
* @param part
* edit part to find bounds
* @return part's bounds in absolute coordinates
@@ -156,7 +148,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { /**
* Test view deletion.
- *
+ *
* @param type
* the type
* @param provider
@@ -188,7 +180,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { /**
* Retrieves the TransactionalEditingDomain
- *
+ *
* @return the editing domain (can be null)
*/
protected TransactionalEditingDomain getEditingDomain() {
@@ -206,7 +198,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { /**
* Test destroy.
- *
+ *
* @param type
* the type
* @param provider
@@ -238,7 +230,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { /**
* Test drop.
- *
+ *
* @param type
* the type
* @param provider
@@ -303,7 +295,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase { /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param containerType
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF index 241ddede539..6f3b07747a7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF @@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
- org.junit;bundle-version="4.10.0"
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.uml.diagram.usecase.tests
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java index 598a19a3601..67635f374c2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -51,7 +56,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -79,7 +84,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Retrieves the TransactionalEditingDomain
- *
+ *
* @return the editing domain (can be null)
*/
protected TransactionalEditingDomain getEditingDomain() {
@@ -97,7 +102,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -129,7 +134,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -162,7 +167,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test change container.
- *
+ *
* @param type
* the type
* @param containerType
@@ -217,7 +222,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -247,7 +252,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -280,7 +285,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -298,7 +303,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.diagram.te /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param containerType
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/META-INF/MANIFEST.MF index d239362817a..0e912befb66 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
- org.junit;bundle-version="4.10.0"
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.diagram.clazz.test,
org.eclipse.papyrus.diagram.clazz.test.canonical,
org.eclipse.papyrus.diagram.clazz.test.load
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java index ba0afaaa1f1..c309daa0cbd 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -41,7 +45,7 @@ import org.junit.Test; * test in order to verify if the drop respect the order of the selection
* Create an enumeration, create subenumerationliterals, select them, drop into the diagram
* the order of enumeration list has to be the same that as the list in the request drop.
- *
+ *
*/
public class TestDropfunction extends TestChildLabel {
@@ -101,7 +105,7 @@ public class TestDropfunction extends TestChildLabel { /**
* Test drop.
- *
+ *
* @param type
* the type
* @param containerType
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java index 6f30bf26013..550d5f020cd 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.text.FlowPage;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.gef.commands.Command;
@@ -38,7 +41,7 @@ import org.junit.Test; /**
* this class is used to test if feature are a representation for static
- *
+ *
*/
public class TestStaticFeatureRepresentation extends TestChildLabel {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java index 5c1df6dcd5d..1b281c57dd2 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -42,7 +45,7 @@ public class Load100ClassTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java index 56fc166fa38..8fe8930dbc0 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -42,7 +45,7 @@ public class Load10ClassTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java index c8874ef0060..db6bdbc9bcf 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -42,7 +45,7 @@ public class Load200ClassTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java index a55621f418c..6fa811e30a7 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -42,7 +45,7 @@ public class Load300ClassTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java index 1f0c9208f8d..e152b420c1e 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -42,7 +45,7 @@ public class Load400ClassTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java index 8d385a96410..1dcbd2a7f7c 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.tests/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.clazz.test.load;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
@@ -42,7 +45,7 @@ public class Load500ClassTest extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF index 7ade946e385..54831811859 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.common.core
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.diagram.tests.canonical
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java index 1ccb6f3426b..88861b279d0 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractPapyrusTestCase.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -16,8 +16,6 @@ package org.eclipse.papyrus.diagram.tests.canonical; import java.io.ByteArrayInputStream;
import java.util.ArrayList;
-import junit.framework.TestCase;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -47,6 +45,7 @@ import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry; import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.junit.utils.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
import org.eclipse.papyrus.uml.tools.model.UmlModel;
@@ -67,7 +66,7 @@ import org.junit.Before; /**
* The Class AbstractPapyrusTestCase.
*/
-public abstract class AbstractPapyrusTestCase extends TestCase {
+public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
protected boolean operationFailed = false;
@@ -136,19 +135,17 @@ public abstract class AbstractPapyrusTestCase extends TestCase { /**
* @see junit.framework.TestCase#setUp()
- *
+ *
* @throws Exception
*/
@Before
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ public void setUp() throws Exception {
projectCreation();
}
/**
* Gets the root view.
- *
+ *
* @return the root view
*/
protected View getRootView() {
@@ -157,7 +154,7 @@ public abstract class AbstractPapyrusTestCase extends TestCase { /**
* Gets the root semantic model.
- *
+ *
* @return the root semantic model
*/
protected Element getRootSemanticModel() {
@@ -166,12 +163,11 @@ public abstract class AbstractPapyrusTestCase extends TestCase { /**
* @see junit.framework.TestCase#tearDown()
- *
+ *
* @throws Exception
*/
@After
- @Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
RunnableWithResult<Boolean> runnable = new RunnableWithResult.Impl<Boolean>() {
public void run() {
@@ -193,13 +189,13 @@ public abstract class AbstractPapyrusTestCase extends TestCase { };
Display.getDefault().syncExec(runnable);
if(!runnable.getResult()) {
- fail("Cannot close the editor and delete the project");
+ Assert.fail("Cannot close the editor and delete the project");
}
}
/**
* Gets the diagram edit part.
- *
+ *
* @return the diagram edit part
*/
protected DiagramEditPart getDiagramEditPart() {
@@ -243,7 +239,7 @@ public abstract class AbstractPapyrusTestCase extends TestCase { }
} catch (Exception ex) {
ex.printStackTrace(System.out);
- fail(ex.getMessage());
+ Assert.fail(ex.getMessage());
}
}
};
@@ -252,12 +248,12 @@ public abstract class AbstractPapyrusTestCase extends TestCase { root = workspace.getRoot();
/*
* final String timestamp = Long.toString(System.currentTimeMillis());
- *
+ *
* project = root.getProject("DiagramTestProject_" + timestamp); file =
* project.getFile("DiagramTest_" + timestamp + ".di"); //$NON-NLS-2$
*/
project = root.getProject(getProjectName());
- file = project.getFile(getFileName()); //$NON-NLS-2$
+ file = project.getFile(getFileName());
this.diResourceSet = new DiResourceSet();
// at this point, no resources have been created
@@ -322,7 +318,7 @@ public abstract class AbstractPapyrusTestCase extends TestCase { page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
papyrusEditor = (IMultiDiagramEditor)page.openEditor(new FileEditorInput(file), PapyrusMultiDiagramEditor.EDITOR_ID);
} catch (Exception ex) {
- fail(ex.getMessage());
+ Assert.fail(ex.getMessage());
ex.printStackTrace(System.out);
}
}
@@ -365,7 +361,7 @@ public abstract class AbstractPapyrusTestCase extends TestCase { }
protected void assertLastOperationSuccessful() {
- assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed);
+ Assert.assertFalse("The operation failed. Look at the log, or put a breakpoint on ExecutionException or DefaultOperationHistory#notifyNotOK to find the cause.", this.operationFailed);
}
/**
@@ -387,7 +383,7 @@ public abstract class AbstractPapyrusTestCase extends TestCase { protected void undo() {
resetLastOperationFailedState();
final CommandStack commandStack = getCommandStack();
- assertTrue("We should be able to undo", commandStack.canUndo());
+ Assert.assertTrue("We should be able to undo", commandStack.canUndo());
commandStack.undo();
assertLastOperationSuccessful();
}
@@ -396,7 +392,7 @@ public abstract class AbstractPapyrusTestCase extends TestCase { protected void redo() {
resetLastOperationFailedState();
final CommandStack commandStack = getCommandStack();
- assertTrue("We should be able to redo", commandStack.canRedo());
+ Assert.assertTrue("We should be able to redo", commandStack.canRedo());
commandStack.redo();
assertLastOperationSuccessful();
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestMultiLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestMultiLink.java index 72241584500..969ecd34f6e 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestMultiLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestMultiLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.ConnectionAnchor;
@@ -116,7 +119,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -158,7 +161,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -183,7 +186,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -221,12 +224,12 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* Test to create a node.
- *
+ *
* @param branchType
* type of the branch to create
* @param flow
* TODO
- *
+ *
*/
public void testToCreateAMultiLink(IElementType branchType, boolean flow) {
//test to create the branch for dependency to node
@@ -330,12 +333,12 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
- *
+ *
* @throws Exception
*/
@Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
CreateViewRequest requestcreation = createViewRequestShapeContainer();
//1st node
@@ -397,7 +400,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
- *
+ *
* @return
*/
@Override
@@ -407,7 +410,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java index 51c675db780..a2d85b68637 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/AbstractTestNode.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,10 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
@@ -52,19 +56,19 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
- *
+ *
* @throws Exception
*/
@Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
testSemantic = isSemanticTest();
}
/**
* Returns <code>true</code> if semantic tests should be also performed
- *
+ *
* @return <code>true</code> if semantic tests should be also performed
*/
protected boolean isSemanticTest() {
@@ -73,9 +77,10 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
- *
+ *
* @return
*/
+ @Override
protected abstract View getRootView();
/**
@@ -85,7 +90,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -98,7 +103,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests testToCreateANode(type, 1, 1, 1, 1);
// destroy the first element
testDestroy(type, 2, 2, 1, 1);
- // destroy the second one
+ // destroy the second one
testDestroy(type, 1, 1, 1, 1);
// the node has been destroyed, the UML element also. restore one element
undoOnUIThread();
@@ -114,7 +119,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -127,7 +132,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests testToCreateANode(type, 1, 1, 1, 1);
// destroy the first element
testDestroy(type, 2, 2, 1, 1);
- // destroy the second one
+ // destroy the second one
testDestroy(type, 1, 1, 1, 1);
// the node has been destroyed, the UML element also. restore one element
undoOnUIThread();
@@ -143,7 +148,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test to manage child node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -157,7 +162,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -167,7 +172,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -201,7 +206,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -240,7 +245,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test change container.
- *
+ *
* @param type
* the type
* @param containerType
@@ -299,7 +304,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -342,7 +347,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test to create a node.
- *
+ *
* @param type
* the type
*/
@@ -352,7 +357,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -382,7 +387,7 @@ public abstract class AbstractTestNode extends org.eclipse.papyrus.diagram.tests redoOnUIThread();
assertEquals(VIEW_DELETION + TEST_THE_REDO, 0, getContainerEditPart().getChildren().size());
if(testSemantic) {
- //assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == numberOfRelatedSemanticElement);
+ //assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == numberOfRelatedSemanticElement);
}
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildLabel.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildLabel.java index ddd40a96f83..7e9682d7c85 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildLabel.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildLabel.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -84,7 +87,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test view deletion.
- *
+ *
* @param type
* the type
* @param containerType
@@ -121,7 +124,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test destroy.
- *
+ *
* @param type
* the type
* @param containerType
@@ -158,7 +161,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test drop.
- *
+ *
* @param type
* the type
* @param containerType
@@ -199,7 +202,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test change container.
- *
+ *
* @param topNodeType
* the top node type
* @param type
@@ -260,7 +263,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test to create a node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -295,7 +298,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test to create a top node.
- *
+ *
* @param type
* the type
*/
@@ -315,7 +318,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Gets the top edit part.
- *
+ *
* @return the top edit part
*/
public GraphicalEditPart getTopEditPart() {
@@ -324,7 +327,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()
- *
+ *
* @return
*/
@Override
@@ -335,7 +338,7 @@ public abstract class TestChildLabel extends org.eclipse.papyrus.diagram.tests.c /**
* Test to manage top node.
- *
+ *
* @param topNodeType
* the top node type
* @param type
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildNode.java index 8d3d46265ce..f7585499291 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildNode.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestChildNode.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,11 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
@@ -35,12 +40,12 @@ public abstract class TestChildNode extends AbstractTestNode { /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()
- *
+ *
* @throws Exception
*/
@Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
CreateViewRequest requestcreation = createViewRequestShapeContainer();
if(requestcreation != null) {
@@ -74,7 +79,7 @@ public abstract class TestChildNode extends AbstractTestNode { /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()
- *
+ *
* @return
*/
@Override
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestCommentLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestCommentLink.java index b7f81cbf1f3..82020533cb2 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestCommentLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestCommentLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.Request;
@@ -33,7 +36,7 @@ public abstract class TestCommentLink extends TestLink { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -64,7 +67,7 @@ public abstract class TestCommentLink extends TestLink { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -95,7 +98,7 @@ public abstract class TestCommentLink extends TestLink { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -111,7 +114,7 @@ public abstract class TestCommentLink extends TestLink { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
*/
@@ -209,7 +212,7 @@ public abstract class TestCommentLink extends TestLink { /**
* test the drop of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
@@ -219,7 +222,7 @@ public abstract class TestCommentLink extends TestLink { /**
* test the creation of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestConstraintLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestConstraintLink.java index 6f0e639f400..edd9d9e0cd4 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestConstraintLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestConstraintLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -12,6 +12,9 @@ /*****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.Request;
@@ -33,7 +36,7 @@ public abstract class TestConstraintLink extends TestLink { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -64,7 +67,7 @@ public abstract class TestConstraintLink extends TestLink { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -95,7 +98,7 @@ public abstract class TestConstraintLink extends TestLink { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -111,7 +114,7 @@ public abstract class TestConstraintLink extends TestLink { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
*/
@@ -209,7 +212,7 @@ public abstract class TestConstraintLink extends TestLink { /**
* test the drop of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
@@ -219,7 +222,7 @@ public abstract class TestConstraintLink extends TestLink { /**
* test the creation of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestContainmentLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestContainmentLink.java index 9980012ae6e..d858c4107ed 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestContainmentLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestContainmentLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.Request;
@@ -34,7 +37,7 @@ public abstract class TestContainmentLink extends TestLink { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -65,7 +68,7 @@ public abstract class TestContainmentLink extends TestLink { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -96,7 +99,7 @@ public abstract class TestContainmentLink extends TestLink { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -112,7 +115,7 @@ public abstract class TestContainmentLink extends TestLink { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
*/
@@ -217,7 +220,7 @@ public abstract class TestContainmentLink extends TestLink { /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param containerType
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLink.java index 81e8ae05840..9bbdf16f2b9 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -71,7 +75,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -97,7 +101,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Retrieves the TransactionalEditingDomain
- *
+ *
* @return the editing domain (can be null)
*/
protected TransactionalEditingDomain getEditingDomain() {
@@ -113,7 +117,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -144,7 +148,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -178,7 +182,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test change container.
- *
+ *
* @param type
* the type
* @param containerType
@@ -228,7 +232,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
*/
@@ -350,7 +354,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -372,7 +376,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* test the drop of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
@@ -408,7 +412,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase { /**
* test the creation of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkOwnedBySource.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkOwnedBySource.java index 7a7fd78f34d..e8b0c0db001 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkOwnedBySource.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import org.eclipse.draw2d.geometry.Point;
@@ -37,7 +40,7 @@ public abstract class TestLinkOwnedBySource extends TestLink { /**
* Test view deletion.
- *
+ *
* @param type
* the type
*/
@@ -68,7 +71,7 @@ public abstract class TestLinkOwnedBySource extends TestLink { /**
* Test destroy.
- *
+ *
* @param type
* the type
*/
@@ -99,7 +102,7 @@ public abstract class TestLinkOwnedBySource extends TestLink { /**
* Test drop.
- *
+ *
* @param type
* the type
*/
@@ -138,7 +141,7 @@ public abstract class TestLinkOwnedBySource extends TestLink { /**
* Test to create a link.
- *
+ *
* @param linkType
* the type
*/
@@ -253,7 +256,7 @@ public abstract class TestLinkOwnedBySource extends TestLink { /**
* test the drop of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
@@ -290,7 +293,7 @@ public abstract class TestLinkOwnedBySource extends TestLink { /**
* test the creation of a link where the source and the target are the same objects
- *
+ *
* @param linkType
* @param allowed
*/
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkWithParent.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkWithParent.java index be73c0904a5..7f7920aadec 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkWithParent.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestLinkWithParent.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2014 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 @@ -13,6 +13,11 @@ *****************************************************************************/ package org.eclipse.papyrus.diagram.tests.canonical; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.List; @@ -35,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.uml2.uml.Element; /** - * The Class TestLinkWithParent use to test link between elements with parent. + * The Class TestLinkWithParent use to test link between elements with parent. */ public abstract class TestLinkWithParent extends TestLink { @@ -94,7 +99,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * @see org.eclipse.papyrus.diagram.tests.canonical.TestLink#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType, * org.eclipse.gmf.runtime.emf.type.core.IElementType) - * + * * @param sourceType * @param targetType */ @@ -118,14 +123,14 @@ public abstract class TestLinkWithParent extends TestLink { diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); // FIXME : get(0) : header; get(1) : container List<GraphicalEditPart> children = parent.getChildren(); - source = (GraphicalEditPart)children.get(2); + source = children.get(2); } /** * Check that the link is impossible to create - * + * * @param sourceType * the source type * @param targetType @@ -144,7 +149,7 @@ public abstract class TestLinkWithParent extends TestLink { * @see org.eclipse.papyrus.diagram.tests.canonical.TestLink#testToManageLink(org.eclipse.gmf.runtime.emf.type.core.IElementType, * org.eclipse.gmf.runtime.emf.type.core.IElementType, org.eclipse.gmf.runtime.emf.type.core.IElementType, * org.eclipse.gmf.runtime.emf.type.core.IElementType, boolean) - * + * * @param sourceType * @param targetType * @param linkType @@ -187,7 +192,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * @see org.eclipse.papyrus.diagram.tests.canonical.TestLink#testToCreateALink(org.eclipse.gmf.runtime.emf.type.core.IElementType) - * + * * @param linkType */ @@ -216,7 +221,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * @see org.eclipse.papyrus.diagram.tests.canonical.TestLink#testDestroy(org.eclipse.gmf.runtime.emf.type.core.IElementType) - * + * * @param type */ @@ -249,7 +254,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * @see org.eclipse.papyrus.diagram.tests.canonical.TestLink#testViewDeletion(org.eclipse.gmf.runtime.emf.type.core.IElementType) - * + * * @param type */ @@ -276,7 +281,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * @see org.eclipse.papyrus.diagram.tests.canonical.TestLink#testDrop(org.eclipse.gmf.runtime.emf.type.core.IElementType) - * + * * @param type */ @@ -313,7 +318,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * test the drop of a link where the source and the target are the same objects. - * + * * @param linkType * the link type * @param allowed @@ -352,7 +357,7 @@ public abstract class TestLinkWithParent extends TestLink { /** * test the creation of a link where the source and the target are the same objects. - * + * * @param linkType * the link type * @param allowed diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestNested.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestNested.java index 7745ff74a21..0188c0dec18 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestNested.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.tests/src/org/eclipse/papyrus/diagram/tests/canonical/TestNested.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 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
@@ -13,6 +13,9 @@ *****************************************************************************/
package org.eclipse.papyrus.diagram.tests.canonical;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
@@ -34,7 +37,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Test to create a nested classifier node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -69,7 +72,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Test to create a node.
- *
+ *
* @param type
* the type
* @param containerType
@@ -107,7 +110,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Gets the root semantic modelchild.
- *
+ *
* @return the root semantic modelchild
*/
private Element getRootSemanticModelchild() {
@@ -116,7 +119,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Test to create a top node.
- *
+ *
* @param type
* the type
*/
@@ -136,7 +139,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Gets the top edit part.
- *
+ *
* @return the top edit part
*/
public GraphicalEditPart getTopEditPart() {
@@ -145,7 +148,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Gets the Child edit part.
- *
+ *
* @return the Child edit part
*/
public GraphicalEditPart getChildEditPart() {
@@ -154,7 +157,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootSemanticModel()
- *
+ *
* @return
*/
@Override
@@ -164,7 +167,7 @@ public abstract class TestNested extends org.eclipse.papyrus.diagram.tests.canon /**
* Test to manage top node.
- *
+ *
* @param type
* the type
* @param containerType
|