Fix ProvisioningContextTest.testFollowHelpsResolve is violating API

Currently ProvisioningContextTest.testFollowHelpsResolve() assumes it can modify the context repositories after using the context but this is not valid according to API.
eclipse-equinox · Jun 16, 2024 · 85b0b03 · 85b0b03
1 parent 60e7ccd
commit 85b0b03
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true
-Bundle-Version: 2.10.200.qualifier
+Bundle-Version: 2.10.300.qualifier
 Bundle-Activator: org.eclipse.equinox.internal.p2.engine.EngineActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/.../org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java b/.../org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java
@@ -234,8 +234,8 @@ private Set<IMetadataRepository> getLoadedMetadataRepositories(IProgressMonitor
 
 			// Clear out the list of remembered artifact repositories
 			referencedArtifactRepositories = new HashMap<>();
-			for (URI repositorie : repositories) {
-				loadMetadataRepository(repoManager, repositorie, loadedRepos, shouldFollowReferences(), sub.split(1));
+			for (URI repository : repositories) {
+				loadMetadataRepository(repoManager, repository, loadedRepos, shouldFollowReferences(), sub.split(1));
 			}
 		}
 		return new HashSet<>(loadedRepos.values());

diff --git a/...pse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningContextTest.java b/...pse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningContextTest.java
@@ -22,7 +22,10 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
 import org.eclipse.equinox.p2.planner.IProfileChangeRequest;
-import org.eclipse.equinox.p2.query.*;
+import org.eclipse.equinox.p2.query.ExpressionMatchQuery;
+import org.eclipse.equinox.p2.query.IQuery;
+import org.eclipse.equinox.p2.query.IQueryable;
+import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.IRepository;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
@@ -199,6 +202,12 @@ public void testFollowHelpsResolve() {
 		context.setArtifactRepositories(new URI[0]);
 		IProvisioningPlan plan = getPlanner(getAgent()).getProvisioningPlan(request, context, getMonitor());
 		assertFalse("resolve should fail with missing requirements", plan.getStatus().isOK());
+		// we need to create a new context as the planner is calling
+		// ProvisioningContext.getMetadata(IProgressMonitor) and after that call
+		// repositories are fixed as per API...
+		context = new ProvisioningContext(getAgent());
+		context.setMetadataRepositories(new URI[] { repoA.getLocation() });
+		context.setArtifactRepositories(new URI[0]);
 		context.setProperty(ProvisioningContext.FOLLOW_REPOSITORY_REFERENCES, "true");
 		plan = getPlanner(getAgent()).getProvisioningPlan(request, context, getMonitor());
 		assertTrue("resolve should pass", plan.getStatus().isOK());