diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests.ui')
16 files changed, 131 insertions, 96 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/.classpath b/bundles/org.eclipse.equinox.p2.tests.ui/.classpath index 2fbb7a23e..64c5e31b7 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/.classpath +++ b/bundles/org.eclipse.equinox.p2.tests.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.tests.ui/.settings/org.eclipse.jdt.core.prefs index b4fdaeb4b..ba7bd9ea6 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.p2.tests.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Aug 19 22:58:53 EDT 2008 +#Mon Feb 08 20:27:19 EST 2010 eclipse.preferences.version=1 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.builder.cleanOutputFolder=clean @@ -8,24 +8,24 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -85,7 +85,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests.ui/META-INF/MANIFEST.MF index 36f1650b0..ee642ddbf 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.p2.tests.ui Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.100", org.eclipse.ui;bundle-version="3.5.0", org.eclipse.equinox.p2.metadata;bundle-version="1.0.0", diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java index 227c0952c..185a9deb8 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/AbstractProvisioningUITest.java @@ -114,7 +114,7 @@ public abstract class AbstractProvisioningUITest extends AbstractProvisioningTes protected IStatus install(IInstallableUnit iu, boolean root, boolean lock) throws ProvisionException { ProfileChangeRequest req = new ProfileChangeRequest(profile); - req.addInstallableUnits(new IInstallableUnit[] {iu}); + req.add(iu); if (root) { req.setInstallableUnitProfileProperty(iu, IProfile.PROP_PROFILE_ROOT_IU, Boolean.toString(true)); } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java index cd2110a96..f895ccd5e 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java @@ -35,27 +35,27 @@ import org.eclipse.ui.PlatformUI; public class ElementUtilsTest extends ProfileModificationActionTest { public void testEmpty() { - assertEquals(getEmptySelection().length, ElementUtils.elementsToIUs(getEmptySelection()).length); + assertEquals(getEmptySelection().length, ElementUtils.elementsToIUs(getEmptySelection()).size()); } public void testInvalid() { - assertTrue(ElementUtils.elementsToIUs(getInvalidSelection()).length == 0); + assertTrue(ElementUtils.elementsToIUs(getInvalidSelection()).size() == 0); } public void testIUs() { - assertEquals(getTopLevelIUs().length, ElementUtils.elementsToIUs(getTopLevelIUs()).length); + assertEquals(getTopLevelIUs().length, ElementUtils.elementsToIUs(getTopLevelIUs()).size()); } public void testElements() { - assertEquals(getTopLevelIUElements().length, ElementUtils.elementsToIUs(getTopLevelIUElements()).length); + assertEquals(getTopLevelIUElements().length, ElementUtils.elementsToIUs(getTopLevelIUElements()).size()); } public void testMixedIUsAndNonIUs() { - assertTrue(getMixedIUsAndNonIUs().length != ElementUtils.elementsToIUs(getMixedIUsAndNonIUs()).length); + assertTrue(getMixedIUsAndNonIUs().length != ElementUtils.elementsToIUs(getMixedIUsAndNonIUs()).size()); } public void testMixedIUsAndElements() { - assertEquals(getMixedIUsAndElements().length, ElementUtils.elementsToIUs(getMixedIUsAndElements()).length); + assertEquals(getMixedIUsAndElements().length, ElementUtils.elementsToIUs(getMixedIUsAndElements()).size()); } public void testUpdateUsingElements() throws URISyntaxException { diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/InstallActionTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/InstallActionTest.java index aea471405..0091e6ae4 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/InstallActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/InstallActionTest.java @@ -11,6 +11,7 @@ package org.eclipse.equinox.p2.tests.ui.actions; +import java.util.List; import org.eclipse.equinox.internal.p2.ui.actions.InstallAction; import org.eclipse.equinox.internal.p2.ui.model.AvailableIUElement; import org.eclipse.equinox.internal.p2.ui.model.IIUElement; @@ -27,7 +28,7 @@ public class InstallActionTest extends ProfileModificationActionTest { super(InstallActionTest.this.getProvisioningUI(), InstallActionTest.this.getSelectionProvider(sel), profile.getProfileId()); } - public IInstallableUnit[] getSelectedIUs() { + public List<IInstallableUnit> getSelectedIUs() { return super.getSelectedIUs(); } } @@ -35,45 +36,45 @@ public class InstallActionTest extends ProfileModificationActionTest { public void testEmptySelection() { TestInstallAction action = new TestInstallAction(getEmptySelection()); assertFalse("Should not be enabled with empty selection", action.isEnabled()); - assertEquals(0, action.getSelectedIUs().length); + assertEquals(0, action.getSelectedIUs().size()); } public void testIUs() { TestInstallAction action = new TestInstallAction(getTopLevelIUs()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testElements() { TestInstallAction action = new TestInstallAction(getTopLevelIUElements()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testMixedIUsAndNonIUs() { TestInstallAction action = new TestInstallAction(getMixedIUsAndNonIUs()); assertTrue("Mixed selections allowed", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testMixedIUsAndElements() { TestInstallAction action = new TestInstallAction(getMixedIUsAndElements()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testParentIsCategory() { TestInstallAction action = new TestInstallAction(getCategoryAndChildIUElements()); assertTrue("Should be enabled", action.isEnabled()); // Only the non-category should be considered a selection - assertEquals(1, action.getSelectedIUs().length); + assertEquals(1, action.getSelectedIUs().size()); } public void testParentIsNestedCategory() { TestInstallAction action = new TestInstallAction(getNestedCategoriesAndChildIUElements()); assertTrue("Should be enabled", action.isEnabled()); // Only the non-category should be considered a selection - assertEquals(1, action.getSelectedIUs().length); + assertEquals(1, action.getSelectedIUs().size()); } protected IIUElement element(IInstallableUnit iu) { diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UninstallActionTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UninstallActionTest.java index 8a7f9d9aa..9aaf340b2 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UninstallActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UninstallActionTest.java @@ -11,6 +11,7 @@ package org.eclipse.equinox.p2.tests.ui.actions; +import java.util.List; import org.eclipse.equinox.internal.p2.ui.actions.UninstallAction; import org.eclipse.equinox.p2.metadata.IInstallableUnit; @@ -24,7 +25,7 @@ public class UninstallActionTest extends ProfileModificationActionTest { super(UninstallActionTest.this.getProvisioningUI(), UninstallActionTest.this.getSelectionProvider(sel), profile.getProfileId()); } - public IInstallableUnit[] getSelectedIUs() { + public List<IInstallableUnit> getSelectedIUs() { return super.getSelectedIUs(); } } @@ -32,54 +33,54 @@ public class UninstallActionTest extends ProfileModificationActionTest { public void testLockedElements() { TestUninstallAction action = new TestUninstallAction(getTopLevelIUElementsWithLockedIU()); assertFalse("Should not be enabled with locked elements", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testLockedIUs() { TestUninstallAction action = new TestUninstallAction(getTopLevelIUsWithLockedIU()); assertFalse("Should not be enabled with locked ius", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testEmptySelection() { TestUninstallAction action = new TestUninstallAction(getEmptySelection()); assertFalse("Should not be enabled with empty selection", action.isEnabled()); - assertEquals(0, action.getSelectedIUs().length); + assertEquals(0, action.getSelectedIUs().size()); } public void testTopLevelIUs() { TestUninstallAction action = new TestUninstallAction(getTopLevelIUs()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testTopLevelElements() { TestUninstallAction action = new TestUninstallAction(getTopLevelIUElements()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testNestedIUs() { TestUninstallAction action = new TestUninstallAction(getMixedIUs()); assertFalse("Should not enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testNestedElements() { TestUninstallAction action = new TestUninstallAction(getMixedIUElements()); assertFalse("Should not enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testMixedIUsAndNonIUs() { TestUninstallAction action = new TestUninstallAction(getMixedIUsAndNonIUs()); assertFalse("Should not enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testMixedIUsAndElements() { TestUninstallAction action = new TestUninstallAction(getMixedIUsAndElements()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UpdateActionTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UpdateActionTest.java index fa3ca5e56..66d36c331 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UpdateActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/UpdateActionTest.java @@ -11,6 +11,7 @@ package org.eclipse.equinox.p2.tests.ui.actions; +import java.util.List; import org.eclipse.equinox.internal.p2.ui.actions.UpdateAction; import org.eclipse.equinox.p2.metadata.IInstallableUnit; @@ -24,7 +25,7 @@ public class UpdateActionTest extends ProfileModificationActionTest { super(UpdateActionTest.this.getProvisioningUI(), UpdateActionTest.this.getSelectionProvider(sel), profile.getProfileId(), true); } - public IInstallableUnit[] getSelectedIUs() { + public List<IInstallableUnit> getSelectedIUs() { return super.getSelectedIUs(); } } @@ -32,54 +33,54 @@ public class UpdateActionTest extends ProfileModificationActionTest { public void testLockedElements() { TestUpdateAction action = new TestUpdateAction(getTopLevelIUElementsWithLockedIU()); assertFalse("Should not be enabled with locked elements", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testLockedIUs() { TestUpdateAction action = new TestUpdateAction(getTopLevelIUsWithLockedIU()); assertFalse("Should not be enabled with locked ius", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testEmptySelection() { TestUpdateAction action = new TestUpdateAction(getEmptySelection()); assertFalse("Should not be enabled with empty selection", action.isEnabled()); - assertEquals(0, action.getSelectedIUs().length); + assertEquals(0, action.getSelectedIUs().size()); } public void testTopLevelIUs() { TestUpdateAction action = new TestUpdateAction(getTopLevelIUs()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testTopLevelElements() { TestUpdateAction action = new TestUpdateAction(getTopLevelIUElements()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testNestedIUs() { TestUpdateAction action = new TestUpdateAction(getMixedIUs()); assertFalse("Should not enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testNestedElements() { TestUpdateAction action = new TestUpdateAction(getMixedIUElements()); assertFalse("Should not enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testMixedIUsAndNonIUs() { TestUpdateAction action = new TestUpdateAction(getMixedIUsAndNonIUs()); assertFalse("Should not enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } public void testMixedIUsAndElements() { TestUpdateAction action = new TestUpdateAction(getMixedIUsAndElements()); assertTrue("Should be enabled", action.isEnabled()); - assertEquals(2, action.getSelectedIUs().length); + assertEquals(2, action.getSelectedIUs().size()); } } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java index 107e3ec19..e51e97204 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/InstallWizardTest.java @@ -10,20 +10,15 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.dialogs; -import org.eclipse.equinox.p2.metadata.Version; - -import org.eclipse.equinox.p2.metadata.IProvidedCapability; - -import org.eclipse.equinox.p2.metadata.ILicense; - +import java.util.ArrayList; import org.eclipse.equinox.internal.p2.metadata.License; import org.eclipse.equinox.internal.p2.ui.ProvUI; import org.eclipse.equinox.internal.p2.ui.dialogs.*; import org.eclipse.equinox.internal.p2.ui.model.IIUElement; import org.eclipse.equinox.internal.p2.ui.viewers.DeferredQueryContentProvider; -import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.metadata.*; import org.eclipse.equinox.p2.operations.InstallOperation; import org.eclipse.equinox.p2.operations.ProfileModificationJob; import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob; @@ -58,9 +53,11 @@ public class InstallWizardTest extends WizardTest { } public void testInstallWizardResolved() { - InstallOperation op = new InstallOperation(getSession(), new IInstallableUnit[] {toInstall}); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(toInstall); + InstallOperation op = new InstallOperation(getSession(), iusInvolved); op.setProfileId(TESTPROFILE); - PreselectedIUInstallWizard wizard = new PreselectedIUInstallWizard(getProvisioningUI(), op, new IInstallableUnit[] {toInstall}, null); + PreselectedIUInstallWizard wizard = new PreselectedIUInstallWizard(getProvisioningUI(), op, iusInvolved, null); ProvisioningWizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard); dialog.setBlockOnOpen(false); dialog.open(); @@ -121,7 +118,7 @@ public class InstallWizardTest extends WizardTest { AvailableIUsPage page1 = (AvailableIUsPage) wizard.getPage(AVAILABLE_SOFTWARE_PAGE); // test initial wizard state - assertTrue("1.0", page1.getSelectedIUs().length == 0); + assertTrue("1.0", page1.getSelectedIUs().size() == 0); assertFalse("1.1", page1.isPageComplete()); // Start reaching in... diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UninstallWizardTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UninstallWizardTest.java index 079a8bccc..eb26d3d29 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UninstallWizardTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UninstallWizardTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.dialogs; +import java.util.ArrayList; import org.eclipse.equinox.internal.p2.ui.ProvUI; import org.eclipse.equinox.internal.p2.ui.dialogs.*; import org.eclipse.equinox.p2.metadata.IInstallableUnit; @@ -30,8 +31,9 @@ public class UninstallWizardTest extends WizardTest { * This is the normal SDK workflow. */ public void testUninstallWizardResolved() { - - IInstallableUnit[] iusInvolved = new IInstallableUnit[] {top1, top2}; + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(top1); + iusInvolved.add(top2); UninstallOperation op = getProvisioningUI().getUninstallOperation(iusInvolved, null); op.resolveModal(getMonitor()); UninstallWizard wizard = new UninstallWizard(getProvisioningUI(), op, iusInvolved, null); @@ -71,8 +73,11 @@ public class UninstallWizardTest extends WizardTest { */ public void testUninstallWizardUnresolved() { // This test is pretty useless right now but at least it opens the wizard - UninstallOperation operation = getProvisioningUI().getUninstallOperation(new IInstallableUnit[] {top1, top2}, null); - UninstallWizard wizard = new UninstallWizard(getProvisioningUI(), operation, new IInstallableUnit[] {top1, top2}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(top1); + iusInvolved.add(top2); + UninstallOperation operation = getProvisioningUI().getUninstallOperation(iusInvolved, null); + UninstallWizard wizard = new UninstallWizard(getProvisioningUI(), operation, iusInvolved, null); WizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard); dialog.setBlockOnOpen(false); dialog.create(); diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UpdateWizardTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UpdateWizardTest.java index b8eba8582..1a77c7ca8 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UpdateWizardTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/UpdateWizardTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.dialogs; +import java.util.ArrayList; import org.eclipse.equinox.internal.p2.metadata.License; import org.eclipse.equinox.internal.p2.ui.ProvUI; import org.eclipse.equinox.internal.p2.ui.dialogs.*; @@ -64,7 +65,9 @@ public class UpdateWizardTest extends WizardTest { * This is the SDK */ public void testUpdateWizardResolved() { - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {main}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(main); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); UpdateWizard wizard = new UpdateWizard(getProvisioningUI(), op, op.getSelectedUpdates(), null); WizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard); @@ -97,7 +100,9 @@ public class UpdateWizardTest extends WizardTest { } public void testUpdateWizardResolvedWithLicense() { - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {main}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(main); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); UpdateWizard wizard = new UpdateWizard(getProvisioningUI(), op, op.getSelectedUpdates(), null); ProvisioningWizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard); @@ -128,7 +133,9 @@ public class UpdateWizardTest extends WizardTest { * Tests the wizard when a prior resolution has been done, but is in error. */ public void testUpdateWizardResolvedError() { - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {main}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(main); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); op.setSelectedUpdates(op.getPossibleUpdates()); UpdateWizard wizard = new UpdateWizard(getProvisioningUI(), op, op.getSelectedUpdates(), null); @@ -148,7 +155,9 @@ public class UpdateWizardTest extends WizardTest { * directly on the resolution page */ public void testUpdateWizardResolvedSkipSelections() { - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {main}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(main); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); UpdateWizard wizard = new UpdateWizard(getProvisioningUI(), op, op.getSelectedUpdates(), null); wizard.setSkipSelectionsPage(true); @@ -168,8 +177,9 @@ public class UpdateWizardTest extends WizardTest { * Tests the wizard when multiple versions are available. */ public void testBug277554MultipleVersions() { - - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {main}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(main); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); UpdateWizard wizard = new UpdateWizard(getProvisioningUI(), op, op.getSelectedUpdates(), null); ProvisioningWizardDialog dialog = new ProvisioningWizardDialog(ProvUI.getDefaultParentShell(), wizard); diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java index 8b605be07..a740e891e 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/operations/SizingTest.java @@ -39,7 +39,7 @@ public class SizingTest extends AbstractProvisioningUITest { String profileId = "testSimpleSizing"; IProfile testProfile = createProfile(profileId); ProfileChangeRequest request = new ProfileChangeRequest(testProfile); - request.addInstallableUnits(new IInstallableUnit[] {f1}); + request.add(f1); IProvisioningPlan plan = null; plan = getSession().getPlanner().getProvisioningPlan(request, new ProvisioningContext(), getMonitor()); long size = ProvisioningSession.SIZE_NOTAPPLICABLE; diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/planning/UpdatePlanning.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/planning/UpdatePlanning.java index 7e4260c42..bb854f395 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/planning/UpdatePlanning.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/planning/UpdatePlanning.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.planning; -import java.util.Arrays; +import org.eclipse.equinox.p2.planner.IProfileChangeRequest; + +import java.util.ArrayList; import java.util.HashSet; import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; @@ -56,19 +58,23 @@ public class UpdatePlanning extends AbstractProvisioningUITest { public void testChooseUpdateOverPatch() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, a120WithDifferentId, a130, firstPatchForA1, patchFora2}); install(a1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); ProfileChangeRequest request = op.getProfileChangeRequest(); - assertTrue("1.0", request.getAddedInstallableUnits().length == 1); - assertTrue("1.1", request.getAddedInstallableUnits()[0].equals(a130)); - assertTrue("1.2", request.getRemovedInstallableUnits().length == 1); - assertTrue("1.3", request.getRemovedInstallableUnits()[0].equals(a1)); + assertTrue("1.0", request.getAdditions().size() == 1); + assertTrue("1.1", request.getAdditions().iterator().next().equals(a130)); + assertTrue("1.2", request.getRemovals().size() == 1); + assertTrue("1.3", request.getRemovals().iterator().next().equals(a1)); } public void testForcePatchOverUpdate() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, a120WithDifferentId, a130, firstPatchForA1, patchFora2}); install(a1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); Update[] updates = op.getPossibleUpdates(); Update firstPatch = null; @@ -82,21 +88,23 @@ public class UpdatePlanning extends AbstractProvisioningUITest { op.setSelectedUpdates(new Update[] {firstPatch}); op.resolveModal(getMonitor()); ProfileChangeRequest request = op.getProfileChangeRequest(); - assertTrue("1.0", request.getAddedInstallableUnits().length == 1); - assertTrue("1.1", request.getAddedInstallableUnits()[0].equals(firstPatchForA1)); - assertTrue("1.2", request.getRemovedInstallableUnits().length == 0); + assertTrue("1.0", request.getAdditions().size() == 1); + assertTrue("1.1", request.getAdditions().iterator().next().equals(firstPatchForA1)); + assertTrue("1.2", request.getRemovals().size() == 0); } public void testRecognizePatchIsInstalled() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, a120WithDifferentId, a130, firstPatchForA1, patchFora2}); install(a1, true, false); install(firstPatchForA1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); - ProfileChangeRequest request = op.getProfileChangeRequest(); + IProfileChangeRequest request = op.getProfileChangeRequest(); // update was favored, that would happen even if patch was not installed - assertTrue("1.0", request.getAddedInstallableUnits().length == 1); - assertTrue("1.1", request.getAddedInstallableUnits()[0].equals(a130)); + assertTrue("1.0", request.getAdditions().size() == 1); + assertTrue("1.1", request.getAdditions().iterator().next().equals(a130)); // the patch is not being shown to the user because we figured out it was already installed // The elements showing are a130 and a120WithDifferentId assertEquals("1.2", 2, op.getPossibleUpdates().length); @@ -105,7 +113,9 @@ public class UpdatePlanning extends AbstractProvisioningUITest { public void testChooseNotTheNewest() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, a120WithDifferentId, a130, firstPatchForA1, patchFora2}); install(a1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); Update[] updates = op.getPossibleUpdates(); Update notNewest = null; @@ -118,10 +128,10 @@ public class UpdatePlanning extends AbstractProvisioningUITest { assertNotNull(".99", notNewest); op.setSelectedUpdates(new Update[] {notNewest}); op.resolveModal(getMonitor()); - ProfileChangeRequest request = op.getProfileChangeRequest(); + IProfileChangeRequest request = op.getProfileChangeRequest(); // selected was favored - assertTrue("1.0", request.getAddedInstallableUnits().length == 1); - assertTrue("1.1", request.getAddedInstallableUnits()[0].equals(a120WithDifferentId)); + assertTrue("1.0", request.getAdditions().size() == 1); + assertTrue("1.1", request.getAdditions().iterator().next().equals(a120WithDifferentId)); // The two updates and the patch were recognized assertEquals("1.2", 3, op.getPossibleUpdates().length); } @@ -129,13 +139,15 @@ public class UpdatePlanning extends AbstractProvisioningUITest { public void testChooseLatestPatches() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, firstPatchForA1, secondPatchForA1, thirdPatchForA1}); install(a1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); - ProfileChangeRequest request = op.getProfileChangeRequest(); + IProfileChangeRequest request = op.getProfileChangeRequest(); // the latest two patches were selected HashSet chosen = new HashSet(); - assertTrue("1.0", request.getAddedInstallableUnits().length == 2); - chosen.addAll(Arrays.asList(request.getAddedInstallableUnits())); + assertTrue("1.0", request.getAdditions().size() == 2); + chosen.addAll(request.getAdditions()); assertTrue("1.1", chosen.contains(secondPatchForA1)); assertTrue("1.2", chosen.contains(thirdPatchForA1)); @@ -145,12 +157,14 @@ public class UpdatePlanning extends AbstractProvisioningUITest { public void testLatestHasDifferentId() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, firstPatchForA1, secondPatchForA1, thirdPatchForA1, a120WithDifferentId, a130, a140WithDifferentId}); install(a1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); - ProfileChangeRequest request = op.getProfileChangeRequest(); + IProfileChangeRequest request = op.getProfileChangeRequest(); // update 140 was recognized as the latest even though it had a different id - assertTrue("1.0", request.getAddedInstallableUnits().length == 1); - assertTrue("1.1", request.getAddedInstallableUnits()[0].equals(a140WithDifferentId)); + assertTrue("1.0", request.getAdditions().size() == 1); + assertTrue("1.1", request.getAdditions().iterator().next().equals(a140WithDifferentId)); // All three patches and all three updates can be chosen assertEquals("1.2", 6, op.getPossibleUpdates().length); } @@ -159,7 +173,10 @@ public class UpdatePlanning extends AbstractProvisioningUITest { public void testRemoveSelectionAfterResolve() throws ProvisionException { createTestMetdataRepository(new IInstallableUnit[] {a1, a130, b1, b12}); install(a1, true, false); - UpdateOperation op = getProvisioningUI().getUpdateOperation(new IInstallableUnit[] {a1, b1}, null); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a1); + iusInvolved.add(b1); + UpdateOperation op = getProvisioningUI().getUpdateOperation(iusInvolved, null); op.resolveModal(getMonitor()); Update[] updates = op.getSelectedUpdates(); assertEquals("1.0", 2, updates.length); diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryProviderTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryProviderTests.java index 064f85a62..3fe46b448 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryProviderTests.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryProviderTests.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.ui.query; +import java.util.ArrayList; import java.util.HashMap; import org.eclipse.equinox.internal.p2.ui.model.*; import org.eclipse.equinox.p2.core.ProvisionException; @@ -67,7 +68,9 @@ public class QueryProviderTests extends AbstractProvisioningUITest { IUElementListRoot root = new IUElementListRoot(); AvailableIUElement element = new AvailableIUElement(root, a, TESTPROFILE, getPolicy().getShowDrilldownRequirements()); root.setChildren(new Object[] {element}); - InstallOperation op = new InstallOperation(getSession(), new IInstallableUnit[] {a}); + ArrayList<IInstallableUnit> iusInvolved = new ArrayList<IInstallableUnit>(); + iusInvolved.add(a); + InstallOperation op = new InstallOperation(getSession(), iusInvolved); op.setProfileId(TESTPROFILE); op.resolveModal(getMonitor()); IQueryable queryable = op.getProvisioningPlan().getAdditions(); diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java index a5d45e9f4..4f2fd7e7e 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableArtifactRepositoryManagerTest.java @@ -43,7 +43,7 @@ public class QueryableArtifactRepositoryManagerTest extends AbstractQueryTest { public void testQuery() { QueryableArtifactRepositoryManager manager = getQueryableManager(); - IQueryResult result = manager.query(new RepositoryLocationQuery(), getMonitor()); + IQueryResult result = manager.locationsQueriable().query(new RepositoryLocationQuery(), getMonitor()); assertTrue(queryResultSize(result) == repoCount); } diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java index 8dbf8bf76..1dcda22d3 100644 --- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/QueryableMetadataRepositoryManagerTest.java @@ -184,7 +184,7 @@ public class QueryableMetadataRepositoryManagerTest extends AbstractQueryTest { // RepoLocationQuery must cause repository URI's to be collected and no repository // loading should occur. - result = manager.query(new RepositoryLocationQuery(), getMonitor()); + result = manager.locationsQueriable().query(new RepositoryLocationQuery(), getMonitor()); assertEquals("2.0", 3, queryResultSize(result)); assertContains("2.1", result, existing); assertContains("2.1", result, nonExisting); |