Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2019-04-19 15:39:19 +0000
committerEd Willink2019-04-26 14:07:26 +0000
commit63d317ade20ff7192822886d1be2ba369b468bfc (patch)
tree2af3494ce6613b16c9bd0015493d061c4bf19459
parentc48ccf707fb2278ed64d5b42ede41cb5efc130dc (diff)
downloadorg.eclipse.qvtd-63d317ade20ff7192822886d1be2ba369b468bfc.tar.gz
org.eclipse.qvtd-63d317ade20ff7192822886d1be2ba369b468bfc.tar.xz
org.eclipse.qvtd-63d317ade20ff7192822886d1be2ba369b468bfc.zip
[unrelated] Auto-generate Export-Package in MANIFEST.MF
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseTestFileSystemHelper.java16
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java16
2 files changed, 30 insertions, 2 deletions
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 7432f1b49..24db96b04 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
@@ -126,6 +126,7 @@ public abstract class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
s.append("Automatic-Module-Name: " + projectName + "\n");
s.append("Bundle-SymbolicName: " + projectName + ";singleton:=true\n");
s.append("Bundle-Version: 1.0.0.qualifier\n");
+ s.append("Bundle-RequiredExecutionEnvironment: JavaSE-1.8\n");
boolean isFirst = true;
for (@NonNull String requiredBundle : getRequiredBundles()) {
s.append(isFirst ? "Require-Bundle: " : ",\n ");
@@ -133,7 +134,16 @@ public abstract class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
isFirst = false;
}
s.append("\n");
- s.append("Bundle-RequiredExecutionEnvironment: JavaSE-1.8\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;
+ }
+ }
+ s.append("\n");
s.close();
} catch (IOException e) {
throw new WrappedException(e);
@@ -141,6 +151,10 @@ public abstract class QVTbaseTestFileSystemHelper extends TestFileSystemHelper
return file;
}
+ protected @Nullable List<@NonNull String> getExportedPackages() {
+ return null;
+ }
+
protected @NonNull List<@NonNull String> getRequiredBundles() {
List<@NonNull String> requiredBundles = new ArrayList<>();
requiredBundles.add("org.eclipse.qvtd.runtime");
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 7ce7b0268..09cc5849b 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
@@ -27,7 +27,6 @@ import org.eclipse.m2m.atl.emftvm.compiler.AtlResourceFactoryImpl;
import org.eclipse.m2m.atl.engine.parser.AtlParser;
import org.eclipse.ocl.examples.codegen.dynamic.JavaClasspath;
import org.eclipse.ocl.examples.codegen.dynamic.JavaFileUtil;
-import org.eclipse.ocl.examples.xtext.tests.TestFileSystemHelper;
import org.eclipse.ocl.examples.xtext.tests.TestProject;
import org.eclipse.ocl.pivot.PivotPackage;
import org.eclipse.ocl.pivot.internal.manager.PivotMetamodelManager;
@@ -76,8 +75,17 @@ public class QVTrCompilerTests extends LoadTestCase
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) {
@@ -87,6 +95,11 @@ public class QVTrCompilerTests extends LoadTestCase
}
@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();
}
@@ -281,6 +294,7 @@ public class QVTrCompilerTests extends LoadTestCase
// QVTm2QVTs.DUMP_CLASS_TO_CONSUMING_NODES.setState(true);
MyQVTrelationTestFileSystemHelper testFileSystemHelper = getTestFileSystemHelper();
testFileSystemHelper.addRequiredBundle("org.eclipse.qvtd.atl");
+ testFileSystemHelper.addExportedPackage("org.eclipse.qvtd.xtext.qvtrelation.tests.newatl2qvtr");
Class<? extends Transformer> txClass1 = null;
URI txURI1 = getModelsURI("newATL2QVTr/NewATL2QVTr.qvtr");
MyQVT myQVT1 = createQVT("NewATL2QVTr", txURI1);

Back to the top