diff options
author | Thomas Watson | 2016-03-21 21:37:51 +0000 |
---|---|---|
committer | Thomas Watson | 2016-03-22 12:41:17 +0000 |
commit | 444573ef14c1f55dcdf8ae65df4bb77650a751fb (patch) | |
tree | e71cff97ccfb5bd36992b8b8cfdc1fb99f8b9ddd | |
parent | 5121e6a016986d5237ea8d4484c9b042d46177cf (diff) | |
download | rt.equinox.framework-444573ef14c1f55dcdf8ae65df4bb77650a751fb.tar.gz rt.equinox.framework-444573ef14c1f55dcdf8ae65df4bb77650a751fb.tar.xz rt.equinox.framework-444573ef14c1f55dcdf8ae65df4bb77650a751fb.zip |
Bug 490008 - Add to test override of main attributes for package info
Change-Id: I0d5dc773bd768525082045afaabfb6d631606238
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
5 files changed, 75 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/META-INF/MANIFEST.MF index 80b71ad1c..f31ed86d2 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/META-INF/MANIFEST.MF @@ -35,3 +35,15 @@ Specification-Vendor: equinox.c Implementation-Title: C Implementation-Version: 13.0 Implementation-Vendor: equinox.c + +Name: test/manifestpackage/d/ +Specification-Title: d +Implementation-Title: D + +Name: test/manifestpackage/e/ +Specification-Version: 1.5 +Implementation-Version: 15.0 + +Name: test/manifestpackage/f/ +Specification-Vendor: equinox.f +Implementation-Vendor: equinox.f diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java index e74806921..401124a73 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/Activator.java @@ -15,6 +15,9 @@ import org.osgi.framework.BundleContext; import test.manifestpackage.a.A; import test.manifestpackage.b.B; import test.manifestpackage.c.C; +import test.manifestpackage.d.D; +import test.manifestpackage.e.E; +import test.manifestpackage.f.F; public class Activator implements BundleActivator { @@ -22,15 +25,30 @@ public class Activator implements BundleActivator { Package thisPkg = getClass().getPackage(); assertNotNull("thisPkg", thisPkg); checkPackage(thisPkg, "main", "1.0", "equinox.main", "MAIN", "10.0", "equinox.main"); + Package aPkg = A.class.getPackage(); assertNotNull("aPkg", aPkg); checkPackage(aPkg, "a", "1.1", "equinox.a", "A", "11.0", "equinox.a"); + Package bPkg = B.class.getPackage(); assertNotNull("bPkg", bPkg); checkPackage(bPkg, "b", "1.2", "equinox.b", "B", "12.0", "equinox.b"); + Package cPkg = C.class.getPackage(); assertNotNull("cPkg", cPkg); checkPackage(cPkg, "c", "1.3", "equinox.c", "C", "13.0", "equinox.c"); + + Package dPkg = D.class.getPackage(); + assertNotNull("dPkg", dPkg); + checkPackage(dPkg, "d", "1.0", "equinox.main", "D", "10.0", "equinox.main"); + + Package ePkg = E.class.getPackage(); + assertNotNull("ePkg", ePkg); + checkPackage(ePkg, "main", "1.5", "equinox.main", "MAIN", "15.0", "equinox.main"); + + Package fPkg = F.class.getPackage(); + assertNotNull("fPkg", fPkg); + checkPackage(fPkg, "main", "1.0", "equinox.f", "MAIN", "10.0", "equinox.f"); } private void checkPackage(Package pkg, String specTitle, String specVersion, String specVendor, String implTitle, String implVersion, String implVendor) { diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java new file mode 100755 index 000000000..15dd6531d --- /dev/null +++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/d/D.java @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2016 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package test.manifestpackage.d; + +public class D { + +} diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java new file mode 100755 index 000000000..7cafce494 --- /dev/null +++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/e/E.java @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2016 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package test.manifestpackage.e; + +public class E { + +} diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java new file mode 100755 index 000000000..a25018e88 --- /dev/null +++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.manifestpackage/test/manifestpackage/f/F.java @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2016 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package test.manifestpackage.f; + +public class F { + +} |