412212: [Refactoring Tests] The Activity diagram tests should be refactored

https://bugs.eclipse.org/bugs/show_bug.cgi?id=412212

8 files changed, 75 insertions, 3 deletions

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 4cd2cac03fd..c6dccb28507 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.bundles.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="0.10.0",

+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.core.queries.configuration.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.core.queries.test;bundle-version="0.10.0",

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 66e0db46939..05e2638f348 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -79,6 +79,7 @@ public class AllTests {
 		

 		/* uml idagrams */

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.diagram.clazz.test.AllTests.class));

+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));

 		

 		//---- deactivate during test refactoring

 		//suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));

@@ -86,7 +87,6 @@ public class AllTests {
 		//suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class));

 		// ---- end deactivate

 		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class));

-		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));

 		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); //Disabled. They currently do not run on Hudson

 		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class)); //Disabled. They currently do not run on Hudson

 		

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.java
new file mode 100644
index 00000000000..1c7991f4cf0
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/IActivityDiagramTestsConstants.java
@@ -0,0 +1,22 @@
+/*****************************************************************************

+ * 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

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.activity.tests;

+

+public interface IActivityDiagramTestsConstants {

+

+	/** name of the test project */

+	public final String PROJECT_NAME = "ActivityDiagramTestProject";

+

+	/** name of the test model */

+	public final String FILE_NAME = "ActivityDiagramTest.di";

+}

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 dfe3eba47d7..4785e95c539 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
@@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.diagram.tests.canonical.AbstractPapyrusTestCase;

+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

 import org.eclipse.uml2.uml.Element;

 import org.junit.Before;

 

@@ -45,6 +46,16 @@ public class AbstractTestActivityAffixedChildNode extends AbstractPapyrusTestCas
 		return null;

 	}

 

+	@Override

+	protected String getProjectName() {

+		return IActivityDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IActivityDiagramTestsConstants.FILE_NAME;

+	}

+	

 	@Before

 	@Override

 	protected void setUp() throws Exception {

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java
index 143bcf4291a..5a4fed98c60 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java
@@ -17,13 +17,23 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

 import org.eclipse.uml2.uml.UMLPackage;

 import org.junit.Test;

 

 

 public  class TestActivityChildNodeInStructuredActivity extends AbstractTestActivityChildNode {

 

+	@Override

+	protected String getProjectName() {

+		return IActivityDiagramTestsConstants.PROJECT_NAME;

+	}

 

+	@Override

+	protected String getFileName() {

+		return IActivityDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * {@inheritDoc}

 	 */

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java
index 565ec310429..30c340ba32b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
 

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

 import org.eclipse.uml2.uml.UMLPackage;

 import org.junit.Test;

 

@@ -23,6 +24,16 @@ import org.junit.Test;
  */

 public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode {

 

+	@Override

+	protected String getProjectName() {

+		return IActivityDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IActivityDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to manageDecision Node.

 	 */

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java
index 255dd61ad91..15ef183105f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
 

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

 import org.eclipse.uml2.uml.UMLPackage;

 import org.junit.Ignore;

 import org.junit.Test;

@@ -25,6 +26,15 @@ import org.junit.Test;
  */

 public class TestActivityDiagramChildWithOtherCreationNode extends AbstractTestActivityChildNode {

 

+	@Override

+	protected String getProjectName() {

+		return IActivityDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IActivityDiagramTestsConstants.FILE_NAME;

+	}

 	

 	/**

 	 * Test to manage callbehaviorAction

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java
index c56e8853b3a..70301877932 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramLink.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
 

 import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.diagram.tests.canonical.TestLink;

+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;

 

 

 /**

@@ -28,7 +29,13 @@ public class TestActivityDiagramLink extends TestLink {
 		return null;

 	}

 

+	@Override

+	protected String getProjectName() {

+		return IActivityDiagramTestsConstants.PROJECT_NAME;

+	}

 

-

-

+	@Override

+	protected String getFileName() {

+		return IActivityDiagramTestsConstants.FILE_NAME;

+	}

 }