Attachment #154542 for bug #292691

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 292691 | Differences between

and this patch

Collapse All | Expand All




import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.internal.repository.tools.RepositoryUtilities;
import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.metadata.query.IQueryResult;
import org.eclipse.equinox.p2.repository.artifact.*;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;

	}

	public IInstallableUnit getIU(IMetadataRepository repository, String name, boolean assertNotNull) {
		IQueryResult queryResult = repository.query(new InstallableUnitQuery(name), null);

		IInstallableUnit unit = null;
		if (queryResult.size() > 0)
			unit = (IInstallableUnit) queryResult.iterator().next();
		if (assertNotNull) {
			assertEquals(queryResult.size(), 1);
			assertNotNull(unit);
		}
		return unit;




import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.query.IQueryResult;
import org.eclipse.equinox.p2.repository.artifact.*;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.pde.build.internal.tests.Utils;

		Map repoProps = repository.getProperties();
		assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");
		final String PACKED_FORMAT = "packed"; //$NON-NLS-1$
		IQueryResult keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);
		for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
			IArtifactKey key = (IArtifactKey) iterator.next();
			IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);




import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.IRequirement;
import org.eclipse.equinox.p2.metadata.query.IQueryResult;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.pde.build.internal.tests.Utils;


		URI repoURI = URIUtil.fromString("file:" + buildFolder.getFolder("buildRepo").getLocation().toOSString());
		IMetadataRepository metadata = loadMetadataRepository(repoURI);
		IQueryResult queryResult = metadata.query(new InstallableUnitQuery("a"), null);
		assertTrue(queryResult.size() == 0);
		getIU(metadata, "b");
	}


Return to bug 292691

Lines 19-28 Link Here

(-)src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java (-5 / +5 lines)
19	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;	19	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
20	import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;	20	import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
24	import org.eclipse.equinox.p2.internal.repository.tools.RepositoryUtilities;	23	import org.eclipse.equinox.p2.internal.repository.tools.RepositoryUtilities;
25	import org.eclipse.equinox.p2.metadata.*;	24	import org.eclipse.equinox.p2.metadata.*;
		25	import org.eclipse.equinox.p2.metadata.query.IQueryResult;
26	import org.eclipse.equinox.p2.repository.artifact.*;	26	import org.eclipse.equinox.p2.repository.artifact.*;
27	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;	27	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
28	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;	28	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
Lines 153-165 Link Here
153	}	153	}
154		154
155	public IInstallableUnit getIU(IMetadataRepository repository, String name, boolean assertNotNull) {	155	public IInstallableUnit getIU(IMetadataRepository repository, String name, boolean assertNotNull) {
156	Collector collector = repository.query(new InstallableUnitQuery(name), null);	156	IQueryResult queryResult = repository.query(new InstallableUnitQuery(name), null);
157		157
158	IInstallableUnit unit = null;	158	IInstallableUnit unit = null;
159	if (collector.size() > 0)	159	if (queryResult.size() > 0)
160	unit = (IInstallableUnit) collector.iterator().next();	160	unit = (IInstallableUnit) queryResult.iterator().next();
161	if (assertNotNull) {	161	if (assertNotNull) {
162	assertEquals(collector.size(), 1);	162	assertEquals(queryResult.size(), 1);
163	assertNotNull(unit);	163	assertNotNull(unit);
164	}	164	}
165	return unit;	165	return unit;

Lines 19-27 Link Here

(-)src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java (-2 / +2 lines)
19	import org.eclipse.core.resources.IFolder;	19	import org.eclipse.core.resources.IFolder;
20	import org.eclipse.core.runtime.*;	20	import org.eclipse.core.runtime.*;
21	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;	21	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
23	import org.eclipse.equinox.p2.metadata.IArtifactKey;	22	import org.eclipse.equinox.p2.metadata.IArtifactKey;
24	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	23	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
		24	import org.eclipse.equinox.p2.metadata.query.IQueryResult;
25	import org.eclipse.equinox.p2.repository.artifact.*;	25	import org.eclipse.equinox.p2.repository.artifact.*;
26	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;	26	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
27	import org.eclipse.pde.build.internal.tests.Utils;	27	import org.eclipse.pde.build.internal.tests.Utils;
Lines 512-518 Link Here
512	Map repoProps = repository.getProperties();	512	Map repoProps = repository.getProperties();
513	assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");	513	assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");
514	final String PACKED_FORMAT = "packed"; //$NON-NLS-1$	514	final String PACKED_FORMAT = "packed"; //$NON-NLS-1$
515	Collector keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);	515	IQueryResult keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);
516	for (Iterator iterator = keys.iterator(); iterator.hasNext();) {	516	for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
517	IArtifactKey key = (IArtifactKey) iterator.next();	517	IArtifactKey key = (IArtifactKey) iterator.next();
518	IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);	518	IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);