Bug 464647: [Tests] Generate JUnit tests for diagram view synch

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

Further refinements to generation of specific diagram test suites, including support for custom model-to-text templates for generation of JUnit sources from the UTP model.

4 files changed, 30 insertions, 30 deletions

diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF b/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF
index 4ed029eb1df..bcfa6af5f40 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF
@@ -41,13 +41,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.papyrus.tests.framework,
+ org.eclipse.papyrus.tests.framework.exceptions,
+ org.eclipse.papyrus.tests.framework.exceptions.impl,
+ org.eclipse.papyrus.tests.framework.exceptions.util,
  org.eclipse.papyrus.tests.framework.gmfgen2uml,
  org.eclipse.papyrus.tests.framework.gmfgenuml2utp,
+ org.eclipse.papyrus.tests.framework.internal.exceptions.operations,
  org.eclipse.papyrus.tests.framework.m2m,
  org.eclipse.papyrus.tests.framework.m2t.xtend,
- org.eclipse.papyrus.tests.framework.mwe,
- org.eclipse.papyrus.tests.framework.exceptions,
- org.eclipse.papyrus.tests.framework.exceptions.impl,
- org.eclipse.papyrus.tests.framework.exceptions.util,
- org.eclipse.papyrus.tests.framework.internal.exceptions.operations
+ org.eclipse.papyrus.tests.framework.m2t.xtend.templates,
+ org.eclipse.papyrus.tests.framework.mwe
 
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorComponent.java b/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorComponent.java
index 938b01b10d5..89e76d69513 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorComponent.java
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorComponent.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.tests.framework.m2t.xtend.templates.CodegenContext;
 import org.eclipse.papyrus.tests.framework.m2t.xtend.templates.PapyrusDiagramCanonicalTests;
 import org.eclipse.uml2.uml.Model;
 
+import com.google.common.base.Supplier;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
@@ -48,20 +49,15 @@ public class CodeGeneratorComponent extends WorkflowComponentWithModelSlot {
 	@Inject
 	private CodegenContext codegenContext;
 
-	public CodeGeneratorComponent() {
-		injector = Guice.createInjector(createCodeGeneratorModule());
+	public CodeGeneratorComponent(Supplier<? extends CodeGeneratorModule> codegenModule) {
+		injector = Guice.createInjector(codegenModule.get());
 		injector.injectMembers(this);
 	}
 
-	protected CodeGeneratorModule createCodeGeneratorModule() {
-		return new CodeGeneratorModule();
-	}
-
 	public String getTempSrcPath() {
 		return tempSrcPath;
 	}
 
-
 	public void setTempSrcPath(String tempSrcPath) {
 		this.tempSrcPath = tempSrcPath;
 	}
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorModule.java b/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorModule.java
index 23d7218d360..95fba8f99fc 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorModule.java
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/m2t/xtend/CodeGeneratorModule.java
@@ -52,35 +52,35 @@ public class CodeGeneratorModule extends AbstractModule {
 		// Pass
 	}
 
-	private void bindAllPackageTestsTemplate() {
+	protected void bindAllPackageTestsTemplate() {
 		// Pass
 	}
 
-	private void bindAppearanceTestTemplate() {
+	protected void bindAppearanceTestTemplate() {
 		// Pass
 	}
 
-	private void bindDeleteTestTemplate() {
+	protected void bindDeleteTestTemplate() {
 		// Pass
 	}
 
-	private void bindDropTestTemplate() {
+	protected void bindDropTestTemplate() {
 		// Pass
 	}
 
-	private void bindEditionTestTemplate() {
+	protected void bindEditionTestTemplate() {
 		// Pass
 	}
 
-	private void bindTestChildLabelNodeTestTemplate() {
+	protected void bindTestChildLabelNodeTestTemplate() {
 		// Pass
 	}
 
-	private void bindTestLinkTemplate() {
+	protected void bindTestLinkTemplate() {
 		// Pass
 	}
 
-	private void bindTestNodeTemplate() {
+	protected void bindTestNodeTemplate() {
 		// Pass
 	}
 
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/mwe/GenerateTestsWorkflow.xtend b/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/mwe/GenerateTestsWorkflow.xtend
index e177eec2ce6..ac01e1f0391 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/mwe/GenerateTestsWorkflow.xtend
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/src/org/eclipse/papyrus/tests/framework/mwe/GenerateTestsWorkflow.xtend
@@ -12,32 +12,33 @@
  ******************************************************************************/
 package org.eclipse.papyrus.tests.framework.mwe
 
+import java.util.Collection
+import java.util.List
+import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.plugin.EcorePlugin
+import org.eclipse.emf.mwe.core.WorkflowContext
+import org.eclipse.emf.mwe.core.issues.Issues
+import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2
+import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
 import org.eclipse.emf.mwe.utils.DirectoryCleaner
 import org.eclipse.emf.mwe.utils.Mapping
 import org.eclipse.emf.mwe.utils.Reader
 import org.eclipse.emf.mwe.utils.StandaloneSetup
 import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext
+import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator
 import org.eclipse.papyrus.mwe2.utils.XtendWorkflow
+import org.eclipse.papyrus.mwe2.utils.components.MultiReader
 import org.eclipse.papyrus.mwe2.utils.components.RegisterUmlProfile
 import org.eclipse.papyrus.mwe2.utils.components.UMLWriter
 import org.eclipse.papyrus.tests.framework.gmfgen2uml.GMFGen2UMLComponent
 import org.eclipse.papyrus.tests.framework.gmfgenuml2utp.GMFGen2UTPComponent
 import org.eclipse.papyrus.tests.framework.gmfgenuml2utp.GMFGen2UTPModule
 import org.eclipse.papyrus.tests.framework.m2t.xtend.CodeGeneratorComponent
+import org.eclipse.papyrus.tests.framework.m2t.xtend.CodeGeneratorModule
 import org.eclipse.uml2.uml.Model
 import org.eclipse.uml2.uml.Profile
 import org.eclipse.uml2.uml.resources.util.UMLResourcesUtil
 import org.eclipse.xtend.lib.annotations.Accessors
-import org.eclipse.emf.common.util.URI
-import java.util.List
-import org.eclipse.papyrus.mwe2.utils.components.MultiReader
-import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator
-import java.util.Collection
-import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2
-import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
-import org.eclipse.emf.mwe.core.issues.Issues
-import org.eclipse.emf.mwe.core.WorkflowContext
 
 /**
  * A workflow orchestrating a transformation pipeline for generation of JUnit tests for the edit-parts of a diagram.
@@ -65,6 +66,8 @@ class GenerateTestsWorkflow extends XtendWorkflow {
 
 	(Model, Model, Profile)=>GMFGen2UTPModule utpModuleFunction
 
+	@Accessors ()=>CodeGeneratorModule codegenModuleSupplier = [new CodeGeneratorModule]
+	
 	final TestExceptionsBuilder testExceptionsBuilder = new TestExceptionsBuilder
 	
 	def setUtpModuleFunction((Model, Model, Profile)=>GMFGen2UTPModule utpModuleFunction) {
@@ -281,7 +284,7 @@ class GenerateTestsWorkflow extends XtendWorkflow {
 		components += new DirectoryCleaner => [
 			directory = projectFile(testSrcGenLocation)
 		]
-		components += new CodeGeneratorComponent => [
+		components += new CodeGeneratorComponent(codegenModuleSupplier) => [
 			tempSrcPath = projectFile(testSrcGenLocation)
 			modelSlot = 'papyrusTestModel'
 		]