Bug 490008 - Add a test for package info in manifest main attributesI20160322-0800

Change-Id: I5229b936ef6139b6150c1a55d8687302b4f40b81
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

2 files changed, 19 insertions, 10 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 c1132cfec..80b71ad1c 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
@@ -5,27 +5,33 @@ Bundle-SymbolicName: test.manifestpackage
 Bundle-Version: 1.0.0
 Bundle-Activator: test.manifestpackage.Activator
 Import-Package: org.osgi.framework
+Specification-Title: main
+Specification-Version: 1.0
+Specification-Vendor: equinox.main
+Implementation-Title: MAIN
+Implementation-Version: 10.0
+Implementation-Vendor: equinox.main
 
 Name: test/manifestpackage/a/
 Specification-Title: a
 Specification-Version: 1.1
-Specification-Vendor: equinox
+Specification-Vendor: equinox.a
 Implementation-Title: A
 Implementation-Version: 11.0
-Implementation-Vendor: equinox
+Implementation-Vendor: equinox.a
 
 Name: test/manifestpackage/b/
 Specification-Title: b
 Specification-Version: 1.2
-Specification-Vendor: equinox
+Specification-Vendor: equinox.b
 Implementation-Title: B
 Implementation-Version: 12.0
-Implementation-Vendor: equinox
+Implementation-Vendor: equinox.b
 
 Name: test/manifestpackage/c/
 Specification-Title: c
 Specification-Version: 1.3
-Specification-Vendor: equinox
+Specification-Vendor: equinox.c
 Implementation-Title: C
 Implementation-Version: 13.0
-Implementation-Vendor: equinox
+Implementation-Vendor: equinox.c
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 d93903765..e74806921 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 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
@@ -19,15 +19,18 @@ import test.manifestpackage.c.C;
 public class Activator implements BundleActivator {
 
 	public void start(BundleContext context) throws Exception {
+		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", "11.0", "equinox");
+		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", "12.0", "equinox");
+		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", "13.0", "equinox");
+		checkPackage(cPkg, "c", "1.3", "equinox.c", "C", "13.0", "equinox.c");
 	}
 
 	private void checkPackage(Package pkg, String specTitle, String specVersion, String specVendor, String implTitle, String implVersion, String implVendor) {