[547723] Promote TestFileSystemHelper requiredBundles/exportedPackage

support

6 files changed, 48 insertions, 79 deletions

diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
index 716bdc73c..34b9b9d39 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
@@ -12,7 +12,6 @@ package org.eclipse.qvtd.cs2as.compiler.tests;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
@@ -314,14 +313,9 @@ public class OCL2QVTiTestCases extends LoadTestCase
 
 	@Override
 	protected @NonNull TestFileSystemHelper getTestFileSystemHelper() {
-		return new QVTbaseTestFileSystemHelper() {
-			@Override
-			protected @NonNull List<@NonNull String> getRequiredBundles() {
-				List<@NonNull String> requiredBundles = super.getRequiredBundles();
-				requiredBundles.add("org.eclipse.qvtd.cs2as.compiler.tests");
-				return requiredBundles;
-			}
-		};
+		QVTbaseTestFileSystemHelper testFileSystemHelper = new QVTbaseTestFileSystemHelper();
+		testFileSystemHelper.addRequiredBundle("org.eclipse.qvtd.cs2as.compiler.tests");
+		return testFileSystemHelper;
 	}
 
 	@Override
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseTestFileSystemHelper.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseTestFileSystemHelper.java
index 24db96b04..3a4030054 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseTestFileSystemHelper.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseTestFileSystemHelper.java
@@ -22,8 +22,27 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.ocl.examples.xtext.tests.TestFileSystemHelper;
 
-public abstract class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
+public class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
 {
+	private @NonNull List<@NonNull String> exportedPackages = new ArrayList<>();
+	private @NonNull List<@NonNull String> requiredBundles = new ArrayList<>();
+
+	public QVTbaseTestFileSystemHelper() {
+		addRequiredBundle("org.eclipse.qvtd.runtime");
+	}
+
+	public void addExportedPackage(@NonNull String exportedPackage) {
+		if (!exportedPackages.contains(exportedPackage)) {
+			exportedPackages.add(exportedPackage);
+		}
+	}
+
+	public void addRequiredBundle(@NonNull String requiredBundle) {
+		if (!requiredBundles.contains(requiredBundle)) {
+			requiredBundles.add(requiredBundle);
+		}
+	}
+
 	@Override
 	protected void appendBuildSpec(@NonNull Writer s) throws IOException {
 		s.append("  <buildSpec>\n");
@@ -136,12 +155,10 @@ public abstract class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
 			s.append("\n");
 			isFirst = true;
 			List<@NonNull String> exportedPackages = getExportedPackages();
-			if (exportedPackages != null) {
-				for (@NonNull String exportedPackage : exportedPackages) {
-					s.append(isFirst ? "Export-Package: " : ",\n ");
-					s.append(exportedPackage);
-					isFirst = false;
-				}
+			for (@NonNull String exportedPackage : exportedPackages) {
+				s.append(isFirst ? "Export-Package: " : ",\n ");
+				s.append(exportedPackage);
+				isFirst = false;
 			}
 			s.append("\n");
 			s.close();
@@ -151,13 +168,11 @@ public abstract class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
 		return file;
 	}
 
-	protected @Nullable List<@NonNull String> getExportedPackages() {
-		return null;
+	protected @NonNull List<@NonNull String> getExportedPackages() {
+		return exportedPackages;
 	}
 
 	protected @NonNull List<@NonNull String> getRequiredBundles() {
-		List<@NonNull String> requiredBundles = new ArrayList<>();
-		requiredBundles.add("org.eclipse.qvtd.runtime");
 		return requiredBundles;
 	}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcoreTestFileSystemHelper.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcoreTestFileSystemHelper.java
index cb2fe3220..7014c7b5e 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcoreTestFileSystemHelper.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcoreTestFileSystemHelper.java
@@ -10,17 +10,12 @@
  *******************************************************************************/
 package org.eclipse.qvtd.xtext.qvtcore.tests;
 
-import java.util.List;
-
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.qvtd.xtext.qvtbase.tests.QVTbaseTestFileSystemHelper;
 
 public class QVTcoreTestFileSystemHelper extends QVTbaseTestFileSystemHelper
 {
-	@Override
-	protected @NonNull List<@NonNull String> getRequiredBundles() {
-		List<@NonNull String> requiredBundles = super.getRequiredBundles();
-		requiredBundles.add("org.eclipse.qvtd.xtext.qvtcore.tests");
-		return requiredBundles;
+	public QVTcoreTestFileSystemHelper() {
+		//	addRequiredBundle("org.eclipse.qvtd.pivot.qvtbase");
+		addRequiredBundle("org.eclipse.qvtd.xtext.qvtcore.tests");
 	}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
index abfa6b8a8..3df0426ee 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiCompilerTests.java
@@ -48,7 +48,6 @@ import org.eclipse.ocl.examples.codegen.dynamic.OCL2JavaFileObject;
 import org.eclipse.ocl.examples.codegen.utilities.CGUtil;
 import org.eclipse.ocl.examples.pivot.tests.PivotTestCase.GlobalStateMemento;
 import org.eclipse.ocl.examples.xtext.tests.TestFile;
-import org.eclipse.ocl.examples.xtext.tests.TestFileSystemHelper;
 import org.eclipse.ocl.examples.xtext.tests.TestProject;
 import org.eclipse.ocl.examples.xtext.tests.TestUtil;
 import org.eclipse.ocl.pivot.internal.manager.MetamodelManagerInternal;
@@ -429,6 +428,8 @@ public class QVTiCompilerTests extends LoadTestCase
 		assertEquals("All objects post-clear", 0, Iterables.size(allObjects));
 	}
 
+	public QVTimperativeTestFileSystemHelper testFileSystemHelper = null;
+
 	@Override
 	protected @NonNull OCLInternal createOCL() {
 		return QVTimperative.newInstance(getTestProjectManager(), null);
@@ -439,8 +440,12 @@ public class QVTiCompilerTests extends LoadTestCase
 	}
 
 	@Override
-	protected @NonNull TestFileSystemHelper getTestFileSystemHelper() {
-		return new QVTimperativeTestFileSystemHelper();
+	protected @NonNull QVTimperativeTestFileSystemHelper getTestFileSystemHelper() {
+		QVTimperativeTestFileSystemHelper testFileSystemHelper2 = testFileSystemHelper;
+		if (testFileSystemHelper2 == null) {
+			testFileSystemHelper = testFileSystemHelper2 = new QVTimperativeTestFileSystemHelper();
+		}
+		return testFileSystemHelper2;
 	}
 
 	@Override
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTimperativeTestFileSystemHelper.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTimperativeTestFileSystemHelper.java
index adc4b37c5..3569f725e 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTimperativeTestFileSystemHelper.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTimperativeTestFileSystemHelper.java
@@ -10,17 +10,12 @@
  *******************************************************************************/
 package org.eclipse.qvtd.xtext.qvtimperative.tests;
 
-import java.util.List;
-
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.qvtd.xtext.qvtbase.tests.QVTbaseTestFileSystemHelper;
 
 public class QVTimperativeTestFileSystemHelper extends QVTbaseTestFileSystemHelper
 {
-	@Override
-	protected @NonNull List<@NonNull String> getRequiredBundles() {
-		List<@NonNull String> requiredBundles = super.getRequiredBundles();
-		requiredBundles.add("org.eclipse.qvtd.xtext.qvtimperative.tests");
-		return requiredBundles;
+	public QVTimperativeTestFileSystemHelper() {
+	//	addRequiredBundle("org.eclipse.qvtd.pivot.qvtbase");
+		addRequiredBundle("org.eclipse.qvtd.xtext.qvtimperative.tests");
 	}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index a84312dbc..f721b8cfb 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -11,8 +11,6 @@
 package org.eclipse.qvtd.xtext.qvtrelation.tests;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 import org.eclipse.emf.common.EMFPlugin;
@@ -21,7 +19,6 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.m2m.atl.dsls.core.EMFTCSInjector;
 import org.eclipse.m2m.atl.emftvm.compiler.AtlResourceFactoryImpl;
 import org.eclipse.m2m.atl.engine.parser.AtlParser;
@@ -73,38 +70,6 @@ public class QVTrCompilerTests extends LoadTestCase
 	public static final boolean ENABLE_ATL2QVTr_reverse_CG = false;	// Set true to debug; test does not pass yet - wip
 	private static boolean NO_MERGES = true;				// Set true to suppress the complexities of merging
 
-	protected static class MyQVTrelationTestFileSystemHelper extends QVTrelationTestFileSystemHelper
-	{
-		private @Nullable List<@NonNull String> exportedPackages = null;
-		private @Nullable List<@NonNull String> requiredBundles = null;
-
-		public void addExportedPackage(@NonNull String exportedPackage) {
-			List<@NonNull String> exportedPackages2 = exportedPackages;
-			if (exportedPackages2 == null) {
-				exportedPackages = exportedPackages2 = new ArrayList<>();
-			}
-			exportedPackages2.add(exportedPackage);
-		}
-
-		public void addRequiredBundle(@NonNull String requiredBundle) {
-			List<@NonNull String> requiredBundles2 = requiredBundles;
-			if (requiredBundles2 == null) {
-				requiredBundles = requiredBundles2 = new ArrayList<>();
-			}
-			requiredBundles2.add(requiredBundle);
-		}
-
-		@Override
-		protected @Nullable List<@NonNull String> getExportedPackages() {			// FIXME ?? compute from other content ??
-			return exportedPackages != null ? exportedPackages : super.getExportedPackages();
-		}
-
-		@Override
-		protected @NonNull List<@NonNull String> getRequiredBundles() {
-			return requiredBundles != null ? requiredBundles : super.getRequiredBundles();
-		}
-	}
-
 	protected class MyQVT extends AbstractTestQVT
 	{
 		protected class InstrumentedCompilerChain extends QVTrCompilerChain
@@ -203,7 +168,7 @@ public class QVTrCompilerTests extends LoadTestCase
 		}
 	}
 
-	public MyQVTrelationTestFileSystemHelper testFileSystemHelper = null;
+	public QVTrelationTestFileSystemHelper testFileSystemHelper = null;
 
 	@Override
 	protected @NonNull OCLInternal createOCL() {
@@ -219,10 +184,10 @@ public class QVTrCompilerTests extends LoadTestCase
 	}
 
 	@Override
-	protected @NonNull MyQVTrelationTestFileSystemHelper getTestFileSystemHelper() {
-		MyQVTrelationTestFileSystemHelper testFileSystemHelper2 = testFileSystemHelper;
+	protected @NonNull QVTrelationTestFileSystemHelper getTestFileSystemHelper() {
+		QVTrelationTestFileSystemHelper testFileSystemHelper2 = testFileSystemHelper;
 		if (testFileSystemHelper2 == null) {
-			testFileSystemHelper = testFileSystemHelper2 = new MyQVTrelationTestFileSystemHelper();
+			testFileSystemHelper = testFileSystemHelper2 = new QVTrelationTestFileSystemHelper();
 		}
 		return testFileSystemHelper2;
 	}
@@ -301,7 +266,7 @@ public class QVTrCompilerTests extends LoadTestCase
 		//	TransformationPartitioner.REGION_IMMEDIATE_PREDECESSORS.setState(true);
 		//	TransformationPartitioner.REGION_TRANSITIVE_PREDECESSORS.setState(true);
 		//	TransformationPartitioner.REGION_TRANSITIVE_SUCCESSORS.setState(true);
-		MyQVTrelationTestFileSystemHelper testFileSystemHelper = getTestFileSystemHelper();
+		QVTrelationTestFileSystemHelper testFileSystemHelper = getTestFileSystemHelper();
 		testFileSystemHelper.addRequiredBundle("org.eclipse.qvtd.atl");
 		testFileSystemHelper.addExportedPackage("org.eclipse.qvtd.xtext.qvtrelation.tests.newatl2qvtr");
 		Class<? extends Transformer> txClass1 = null;