Skip to main content
summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions
AgeCommit message (Collapse)AuthorFilesLines
2018-03-20Bug 531345 - Publish product osgi.ee requirement according to <vm>I20180327-0805I20180327-0630I20180326-2000I20180325-2000I20180324-1500I20180323-2000I20180323-0355I20180322-2000I20180322-0645I20180322-0225I20180321-2000I20180320-2000Mickael Istria2-40/+89
Use the EE defined in the <vm> node of product definition to define some osgi.ee capability requirements in product metadata. Add tests to make sure JRE is still included while unit isn't directly referenced by product requirements. Change-Id: Ic2bd5c30215e9936201c70f7268e5c6068979405 Signed-off-by: Mickael Istria <mistria@redhat.com>
2018-02-26Bug 218650 - Parse the product <vm> settingI20180228-2000I20180227-2000Mickael Istria1-1/+11
Change-Id: I2aa1af9333619e0a078c8b8a1e7c90960876197d Signed-off-by: Mickael Istria <mistria@redhat.com>
2018-01-23Bug 530150 - Move JREAction default profile to Java 9S4_8_0_M5I20180124-2000I20180124-0800I20180123-2000I20180123-1010I20180123-0800Alexander Kurtakov2-6/+11
People not specifying EE will get some sane default, Java 6 is quire rare nowadays I would say. The version here sould be the maximum compatible profile so a.jre.javase installed allow installing bundles requiring this max profile. Change-Id: I96dfb0c900441c1bf9eccc8994a7425f456ccff7 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2018-01-22Revert "Revert "Bug 528387 - Dedicated xml elements for genericI20180122-2000Alexander Kurtakov2-66/+66
requirements"" This reverts commit 0e3caa9359428dcb20c1dc3a2c580fff64777d3d. Change-Id: Ifafe2feedb963b90f54a19b2e08a49d3b18d475a Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2018-01-22Revert "Bug 528387 - Dedicated xml elements for generic requirements"Thomas Watson2-66/+66
This reverts commit a7a99e1fa49938a8f62d44d5c443d38981afeace.
2018-01-16Bug 528387 - Dedicated xml elements for generic requirementsI20180119-0110I20180118-2000I20180117-2000Todor Boev2-66/+66
- Renamed IProvidedCapability.getAttributes() to getProperties(). This is in sync with other parts of p2 that use "properties" for such data. E.g. the IU properties. - Extended content.xml read/write with a new serialization format for requirements with the "requiredProperties" element. It is used to build an IRequirement that has a standard match expression that applies an LDAP filter to the capability properties. It was not possible to extend the existing "required" element in a way that will make old p2 builds ignore the extended version. - Extended the content.xml read/write shared properties handling logic with "type" attribute. Older p2 builds will ignore it and use strings. Also the "type" attribute only appears in the "properties" extension of "provides" which will be ignored by old p2 builds to begin with. - Some additional cleanup to the content.xml read/write - Increased the current content.xml format version from 1.1.0 to 1.2.0. Old p2 builds declare compatibility with [1.0.0, 2). - Made the handling of the property types supported by a capability safer. E.g. unknown types are converted to Strings. E.g. ProvidedCapability verifies that only supported types are used. - Made the handling of generic requirements reflect the real semantics. E.g. with correct handling of the resolution:=optional|mandatory flag rather than to declare everything optional to avoid breakages in older p2 builds. This is possible because the "requiredProperties" element is completely ignored by older builds. E.g. now if an extender or service is missing provisioning will fail as it is supposed to. - Added factory methods to MetadataFactory for LDAP based requirements. - Added a planner test for LDAP requirements - Cleaned up the AutomatedDirectorTest - Cleaned up some LDAP matching test cases. Change-Id: Ifff77b3ea4c9cea33fd236ed101b1f33c173891d Signed-off-by: Todor Boev <rinsvind@gmail.com>
2018-01-11Bug 529684 - Failures in testDefaultJavaProfile and testOSGiMinI20180116-2000I20180115-2000I20180114-2000I20180113-1500I20180112-2000I20180111-2000Thomas Watson1-3/+3
Change-Id: I03d36472ad57aa8f5a68d8e719a906e7c29efec8 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
2017-12-15Revert "Revert "Bug 528494 - Using the match operator for RequiredCapability""I20171215-0930I20171215-0215Alexander Kurtakov8-171/+294
This reverts commit 07c80afa6a12b3170e1b6b1dd5b7dadc775a501e. Revert the revert - issue is with multiple layers of features they need manual touching. Change-Id: I3b4b8f2d64ed02d79ffd7bd9c7c5b85b45f8bd21
2017-12-15Revert "Bug 528494 - Using the match operator for RequiredCapability"I20171215-0120Alexander Kurtakov8-294/+171
This reverts commit 72c083ed10a1cca83f00befbefc279af09779df0. To ensure that today's build failure is not caused by this change. Change-Id: I3e874183b62a3f6456afa00426f9efb230639b49
2017-12-13Bug 528494 - Using the match operator for RequiredCapabilityI20171214-2000Todor Boev8-171/+294
- Fixed the BundlesAction conversion of open ended OSGi version ranges to agree with the P2 open ended version ranges. - Fixed the publisher tests to rely less on IRequiredCapability Change-Id: Iaf1232bfe361ed4d6bb448cc0b210ddfe120569b Signed-off-by: Todor Boev <rinsvind@gmail.com>
2017-11-22Bug 527379 - Remove references to update.configuratorI20171128-0100I20171127-2000I20171126-2000I20171125-1500I20171124-2000I20171123-2000I20171122-2000Karsten Thoms1-9/+2
Change-Id: Iaba644ee46cb1adaad9c9d7359cceacf847d01fa Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-04Bug 313553 - Unentangle ProvidedCapability members and attributesTodor Boev1-2/+2
The members are the generic way for p2 queries to describe getters on objects. The capability attributes then participate in queries as the "attributes" member of a ProvidedCapability object. Fixed the IProvidedCapability to follow the OSGi convention that the attributes contain the name of the capability under a key equal to the capability namespace. This is cleaner than to introduce a new "name" attribute for the p2 name that can conflict with an incoming OSGi "name" attribute. Fixed the version of IProvidedCapability to follow the OSGi convention that capabilities with a version have a "version" attribute with a value of type an OSGi version object. Change-Id: Ic9b77c2d103216141035dc3fb5861ca99a3ddccd Signed-off-by: Todor Boev <rinsvind@gmail.com>
2017-09-29Bug 313553 - Capability: add handling to BundlesActionI20171002-2000Todor Boev1-2/+5
Update BundlesAction to publish the bundle generic capabilities. Fix BundlesActionTest to handle the newly published capabilities. Change-Id: I4b3d11b64706b4fc77b9084f27f8e1583f15580e Signed-off-by: Todor Boev <rinsvind@gmail.com>
2017-09-28Bug 313553 - Requirement: add handling to BundlesActionI20171001-2000I20170930-1500I20170929-2000I20170928-2000Todor Boev2-68/+97
Added publication of generic requirements. Fixed the requirement advice processing to ignore generic requirements. Fixed the BundlesActionTest to verify the newly published generic requirements Change-Id: I5351e12dbc92090717348e0c495c4993906d07fc Signed-off-by: Todor Boev <rinsvind@gmail.com>
2017-09-27Remove empty methods and useless overrides in p2.tests andI20170927-2000Alexander Kurtakov2-2/+0
suppresswarnings. Change-Id: Ia0b139c029a84b054ee741bf97606fbeea7b2576 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-20Bug 522466 - Fix generification warnings in p2.testsAlexander Kurtakov1-1/+1
Fix compiler warning introduced with previous commits. Change-Id: I8c95949c7719fe216f8503bece716ae74c7b6cfc Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-19Bug 522466 - Fix generification warnings in p2.testsI20170920-0100I20170919-2000Alexander Kurtakov3-8/+6
Yet another round. Change-Id: Idfcc6a717588ea423249b45ca37c18fc832aaad1 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-19Bug 522466 - Fix generification warnings in p2.tests Alexander Kurtakov6-36/+34
Round 3 Change-Id: Iecb11d4317c6859b60b6470a629a112735767da5 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-19Bug 522466 - Fix generification warnings in p2.tests Alexander Kurtakov7-55/+56
Second round. Change-Id: I624199cb119e374788521bf20189852e4c15d3cc Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-19Bug 522466 - Fix generification warnings in p2.tests Alexander Kurtakov5-44/+42
First round of generifying everything faced. Change-Id: I78bb9ce2655caf41da22235b0ac85ad6ad922365 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-19Bug 522466 - Fix generification warnings in p2.tests Alexander Kurtakov5-80/+77
Generification of most IQuery* related warnings possible and surrounding other generic warnings. Change-Id: I8516236c712722d7c40ea15c7334d7ba87b7e6b4 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-09-06Bug 313553 - Retrofit the JRE IU with generic osgi.ee capabilitiesTodor Boev1-8/+14
The osgi.ee capabilities can now match both old-style and generic requirements. Change-Id: Id39103123ff2f1ce9d33a353b92e918f706dfa34 Signed-off-by: Todor Boev <rinsvind@gmail.com>
2017-08-23Bug 521301 - Stop using deprecated p2 methods in p2 tests Alexander Kurtakov2-2/+2
Change-Id: I08b47ba0d4219f15b061b759c01f874747a496df Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-07-24Bug 514885 - Added test case for match type greaterOrEqualI20170725-2000Karsten Thoms1-0/+32
Change-Id: I53d9fc1e6ae314d21b76558700d913d344d12eb6 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-06-22Bug 518587 - Modernize o.e.equinox.p2.testsI20170623-0110I20170622-2000Alexander Kurtakov2-24/+8
Use try-with-resources. Change-Id: I6c1d3efb7f0fd4f5dd0f014d8801ec8e375355f9 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-06-21Bug 518587 - Modernize o.e.equinox.p2.testsI20170621-2000Alexander Kurtakov26-140/+180
Move to Java 8, enable more warnings and save actions and go through the codebase to minimize the warnings. Change-Id: I6283bfeef18e250f5283e80f7bfad38e6ef65415 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-05-05Bug 438584 - p2 unit tests not cleaning up after themselvesI20170510-0800I20170509-2000I20170509-1300I20170509-1100I20170509-0945I20170509-0800I20170508-2000I20170508-0800I20170507-2000I20170506-2000I20170505-2000Alexander Kurtakov1-0/+12
Change-Id: I651c22e089d17929f00ee086e3de6910ef901266 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2017-01-31Revert "Make Tycho's compiler use configuration from ↵Markus Keller2-2/+2
.settings/org.eclipse.jdt.core.prefs" This reverts commit 678bfa1aad9cf5fbe6a488d168763288acabb501. Change-Id: Ia1ec726e051392b3fefa753b6def2d937f68523e
2017-01-27Make Tycho's compiler use configuration from ↵I20170130-2000Mykola Nikishov2-2/+2
.settings/org.eclipse.jdt.core.prefs Change-Id: I60cd95811a1c12a8e961d05a1e4da077fc9a3c30 Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
2016-11-07Add tests for IPublisherInfo.A_NO_MD5 contractI20161108-0800Mykola Nikishov1-0/+17
When creating an artifact descriptor with PublisherHelper, createArtifactDescriptor(IPublisherInfo, IArtifactRepository, IArtifactKey, File) will generate MD5 hash if (info == null || (info.getArtifactOptions() & IPublisherInfo.A_NO_MD5) == 0) is true. As current tests cover only 1 out of 4 this condition's branches, add tests for missing branches that assert IPublisherInfo.A_NO_MD5 contract. Change-Id: I9912f01294cee8288a61520086d590f62524fff9 Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
2016-04-21Bug 336246 - Remove the metadata generatorY20160421-1000I20160424-2000Mykola Nikishov1-15/+0
With 439356b40487f691fc68c0c90eedce5d73d65c0f, references to MetadataGeneratorHelper's method had been replaced with a call to PublisherHelper. Now testGeneration*2 methods are just duplicates of existing ones (check testGenerationFolder vs testGenerationFile2). Remove tests that used to call MetadataGeneratorHelper's methods and are the same as the tests for PublisherHelper. Change-Id: I74670f196a5a2b3b24c8a6e36120e9885d9ea7d6 Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
2015-03-09Bug 461758 - [Mac] Branding iron should set CFBundleDisplayNameI20150311-1300I20150310-0800Pascal Rapicault1-1/+1
2015-03-04Bug 431116 - Releases for Mac OS X should be bundled as a proper "MacPascal Rapicault1-21/+8
App" and/or "Library" Change-Id: I2bdcc86960361f8268964b4e95bf0eb960dc3cd6 Signed-off-by: Pascal Rapicault <pascal@rapicorp.com>
2015-02-16373817 Add hasBundles and hasFeatures methodsTobias Oberlies1-0/+21
... so that the check for ignored product file content does not call getBundles and getFeatures. This makes it easier to override the latter methods to also expand version references with 'qualifier' literals. Bug: 373817 Change-Id: I18591dfe5b8abd014889374b22686501d0173ef4
2015-02-16428889 Don't include installMode="root" features in the product IUTobias Oberlies1-2/+27
- Ignore features marked with installMode="root" when publishing products. This attribute is currently only supported by Tycho (cf. bug 427563 for adding p2 support for this) and entails that the feature must *not* be referenced from the product IU. This is achieved with the changed implementation of getFeatures(). - This change allows to get rid of separate product file pre-processing steps in Tycho. Bug: 428889 Change-Id: Ib7aa666c6746fbf417fa7437a7fa7b6a95ebd51f
2013-12-10bug 423628 - False positives warnings in the official build.I20131211-0800I20131210-2000I20131210-0800Krzysztof Daniel1-33/+29
False positives are caused by projects settings being different than build settings. Typical example is that project is configured to warn about local variable hiding a field, and suppression is added, but the regular releng build is not configured to warn, and it finds unnecessary suppression. I have did following things: * fixed warnings that I was able to fix (renamed variables, added generics, comments, etc, etc). * reduced the number of warnings in tests * commented warnings that must not be suppresed in the workspace unless we want "Unnecessary @SuppressWarnings" at build time. Change-Id: Iab2c962e5c331eab170b5f6e08d9bb29d05f0cc4
2013-11-15Bug 421814 - Fix deprecated usages in tests.Alexander Kurtakov5-17/+5
Use Hamcrest matchers directly instead of via deprecated junit class. Change-Id: Iec5e4b6c482a85f5ed6b05020c1af85ec83d39ec Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2013-11-14Bug 421768 - Remove useless @SuppressWarnings.Alexander Kurtakov6-6/+6
Now that 1.5 is official it's better to get rid of some old warnings. Change-Id: I57a9fbb1872e92e81884ee4fac5ac1febfdf807a Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2013-11-14Bug 421771 - Don't use deprecated junit Assert.Alexander Kurtakov1-1/+1
Changing from junit.framework to org.junit is enough. Change-Id: I541d00c1dd6652003d4df51a66fb98d1e3342625 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2013-01-25331683 Publisher returns error status in case of invalid manifestv20130125-132342Jan Sievers1-1/+25
- BundlesAction will now return a multi-status with severity error (and details in child message(s)) in case of invalid MANIFEST or IOException. - Static helper methods createBundleDescription(), loadManifest() and basicLoadManifest() now throw BundleException and IOException instead of ignoring them. - Added corresponding ...IgnoringExceptions() methods (and marked them as deprecated) which preserve old behaviour and allow to adapt users of these methods as they see fit. Bug 331683
2012-12-09Bug 396136 - [publisher] Support for expression in update descriptor andv20121209-025907Pascal Rapicault1-1/+40
requirements
2012-10-30393051 Increment bundle version for change in dev branchv20121030-165213I20121031-2000I20121031-0800I20121030-2000Tobias Oberlies1-1/+1
- The version of org.eclipse.equinox.p2.publisher.eclipse has not been incremented in the Kepler branch yet. The last change included a fix, so according to http://wiki.eclipse.org/Version_Numbering, the service segment needs to be increased to the next hundred. - Also: Update year in copyright headers of touched files.
2012-10-30393051 Use case-insensitive dictionary in bundle publisherJan Sievers1-0/+1
Use the Dictionary implementation with case-insensitive getters org.eclipse.osgi.framework.util.Headers to parse the MANIFEST stream.
2012-10-01388566 Fix corner case when publishing a single osgi.ee capabilityTobias Oberlies1-8/+19
- Fix case where a profile only specifies a single version for an osgi.ee capability and hence uses the version:Version attribute instead of the more common version:List<Version> attribute. - Also: Fail if both version:Version and version:List<Version> is specified in a single system capability entry. Bug: 388566 JREAction: Publish osgi.ee capabilities in 'a.jre' IUs
2012-10-01388566 Copy EE profile files from org.eclipse.osgiTobias Oberlies1-7/+7
- Reset profile files included in o.e.e.p2.publisher to current state in org.eclipse.osge bundle. (Last change to these files was rt.equinox.framework commit d2f8703.) This adds the org.osgi.framework.system.capabilities property to all profiles, and fixes bug 386013. - Adapted tests that check for the total number of provided capabilities. Bug: 388566 JREAction: Publish osgi.ee capabilities in 'a.jre' IUs Bug: 386013 EE profile JavaSE-1.7 declares system packages that don't exist
2012-10-01388566 Refactorings in JREActionTestTobias Oberlies1-27/+24
- Check status of JREAction.
2012-09-28390361 Test that ProductAction fails if the result may be brokenv20120928-163700Tobias Oberlies1-6/+28
- Added test for fail fast behaviour of ProductAction in case of unknown inclusion filters. - Also: For callers that don't check the returned status, the behavior remains as before -> the missing filter issue may then be detected later when the product is installed. - Also: Improved messages. Bug: 390361 Published products are broken if included fragments are not in context
2012-09-28390361 Check for IUs created by product action using matchersTobias Oberlies2-39/+65
- Refactoring: use matchers for checking presence of certain IUs in the publisher result. - Extract common steps of getting a unique IU from the result into a method getUniquePublishedIU.
2012-09-28390361 Add JavaDoc to addContextIUTobias Oberlies4-16/+27
- Also: Use more common term "IU" instead of "unit"
2012-09-28390361 Consolidate product action test classesTobias Oberlies2-157/+75
- Refactoring: Moved all tests that a) don't require special setup and b) don't use test template methods into the ProductAction.

Back to the top