Bug 296558 - Wrong version attribute for the self provided capability of a category IU

2 files changed, 9 insertions, 2 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
index 146c558ac..c859247e8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;
 import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
 import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.RepositoryReference;
 import org.eclipse.equinox.p2.metadata.query.CategoryQuery;
@@ -54,8 +55,14 @@ public class SiteXMLActionTest extends AbstractProvisioningTest {
 		Iterator iter = results.iterator();
 		while (iter.hasNext()) {
 			IInstallableUnit unit = (IInstallableUnit) iter.next();
-			assertTrue("1.0", unit.getId().startsWith(URIUtil.toUnencodedString(siteLocation)));
+			String sitelocation = URIUtil.toUnencodedString(siteLocation);
+			assertTrue("1.0", unit.getId().startsWith(sitelocation));
 			assertEquals("2.0", "Test Category Label", unit.getProperty(IInstallableUnit.PROP_NAME));
+
+			IProvidedCapability[] provided = unit.getProvidedCapabilities();
+			assertEquals(1, provided.length);
+			assertTrue(provided[0].getName().startsWith(sitelocation));
+			assertEquals(provided[0].getVersion(), unit.getVersion());
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
index 2284bee8a..5c08ec2fb 100644
--- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
+++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
@@ -298,7 +298,7 @@ public class SiteXMLAction extends AbstractPublisherAction {
 
 		// Create set of provided capabilities
 		ArrayList providedCapabilities = new ArrayList();
-		providedCapabilities.add(PublisherHelper.createSelfCapability(categoryId, Version.emptyVersion));
+		providedCapabilities.add(PublisherHelper.createSelfCapability(categoryId, cat.getVersion()));
 
 		Map localizations = category.getLocalizations();
 		if (localizations != null) {