Attachment 154542 Details for Bug 292691 – PDE/Build patch

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

[patch] PDE/Build patch

pdebuild.patch (text/plain), 5.30 KB, created by Ian Bull

on 2009-12-16 02:04:57 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2009-12-16 02:04:57 EST

Size: 5.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build.tests
>Index: src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java,v
>retrieving revision 1.15.2.4
>diff -u -r1.15.2.4 P2TestCase.java
>--- src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java	8 Dec 2009 15:32:45 -0000	1.15.2.4
>+++ src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java	16 Dec 2009 07:04:14 -0000
>@@ -19,10 +19,10 @@
> 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;
>@@ -153,13 +153,13 @@
> 	}
> 
> 	public IInstallableUnit getIU(IMetadataRepository repository, String name, boolean assertNotNull) {
>-		Collector collector = repository.query(new InstallableUnitQuery(name), null);
>+		IQueryResult queryResult = repository.query(new InstallableUnitQuery(name), null);
> 
> 		IInstallableUnit unit = null;
>-		if (collector.size() > 0)
>-			unit = (IInstallableUnit) collector.iterator().next();
>+		if (queryResult.size() > 0)
>+			unit = (IInstallableUnit) queryResult.iterator().next();
> 		if (assertNotNull) {
>-			assertEquals(collector.size(), 1);
>+			assertEquals(queryResult.size(), 1);
> 			assertNotNull(unit);
> 		}
> 		return unit;
>Index: src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java,v
>retrieving revision 1.22.2.8
>diff -u -r1.22.2.8 P2Tests.java
>--- src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java	8 Dec 2009 19:23:39 -0000	1.22.2.8
>+++ src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java	16 Dec 2009 07:04:14 -0000
>@@ -19,9 +19,9 @@
> 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;
>@@ -512,7 +512,7 @@
> 		Map repoProps = repository.getProperties();
> 		assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");
> 		final String PACKED_FORMAT = "packed"; //$NON-NLS-1$
>-		Collector keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);
>+		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);
>Index: src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java,v
>retrieving revision 1.83.2.6
>diff -u -r1.83.2.6 PublishingTests.java
>--- src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java	8 Dec 2009 15:32:45 -0000	1.83.2.6
>+++ src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java	16 Dec 2009 07:04:15 -0000
>@@ -24,10 +24,10 @@
> 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;
>@@ -1321,8 +1321,8 @@
> 
> 		URI repoURI = URIUtil.fromString("file:" + buildFolder.getFolder("buildRepo").getLocation().toOSString());
> 		IMetadataRepository metadata = loadMetadataRepository(repoURI);
>-		Collector collector = metadata.query(new InstallableUnitQuery("a"), null);
>-		assertTrue(collector.size() == 0);
>+		IQueryResult queryResult = metadata.query(new InstallableUnitQuery("a"), null);
>+		assertTrue(queryResult.size() == 0);
> 		getIU(metadata, "b");
> 	}
>

Actions: View | Diff

Attachments on bug 292691: 152095 | 152205 | 152362 | 152365 | 152504 | 152544 | 152984 | 152986 | 153141 | 153282 | 153349 | 153895 | 153988 | 154541 | 154542 | 154883 | 155120 | 155154 | 155466 | 155547 | 155813 | 155814 | 155879 | 155912 | 155913 | 155979