On Tue, 16 Dec 2025 03:23:12 GMT, Alexander Matveev <[email protected]> 
wrote:

>> Alexey Semenyuk has updated the pull request with a new target base due to a 
>> merge or a rebase. The pull request now contains seven commits:
>> 
>>  - Result: add unit tests, remove unused 
>> mapErrors(UnaryOperator<Collection<? extends Exception>>) function; better 
>> and more consistent error reporting based on testing
>>  - Result: replace create(Supplier<T>) with of(ThrowingSupplier<T, E>)
>>  - CustomInfoPListTest: fix local test failure:
>>    
>>    [22:38:21.786] TRACE: assertStringListEquals(): Check contents of 
>> [CustomInfoPListTest/testPackage.571a7829/vanilla/PackageCustomInfoPListTest.app/Contents/runtime/Contents/Info.plist]
>>  and 
>> [CustomInfoPListTest/testPackage.571a7829/unpacked-pkg/unpacked/Applications/PackageCustomInfoPListTest.app/Contents/runtime/Contents/Info.plist]
>>  plist files are the same
>>    [22:38:21.786] TRACE: assertStringListEquals( 1, 
>> /CFBundleDevelopmentRegion: en-US)
>>    [22:38:21.786] TRACE: assertStringListEquals( 2, /CFBundleExecutable: 
>> libjli.dylib)
>>    [22:38:21.786] TRACE: assertStringListEquals( 3, /CFBundleIdentifier: 
>> Hello)
>>    [22:38:21.787] TRACE: assertStringListEquals( 4, 
>> /CFBundleInfoDictionaryVersion: 7.0)
>>    [22:38:21.787] TRACE: assertStringListEquals( 5, /CFBundleName: 
>> PackageCustomInfoPListTest)
>>    [22:38:21.787] TRACE: assertStringListEquals( 6, /CFBundlePackageType: 
>> BNDL)
>>    [22:38:21.787] TRACE: assertStringListEquals( 7, 
>> /CFBundleShortVersionString: 1.0)
>>    [22:38:21.787] TRACE: assertStringListEquals( 8, /CFBundleSignature: ????)
>>    [22:38:21.787] TRACE: assertStringListEquals( 9, /CFBundleVersion: 1.0)
>>    [22:38:21.787] ERROR: Actual list is shorter than expected by 5 elements: 
>> Check contents of 
>> [CustomInfoPListTest/testPackage.571a7829/vanilla/PackageCustomInfoPListTest.app/Contents/runtime/Contents/Info.plist]
>>  and 
>> [CustomInfoPListTest/testPackage.571a7829/unpacked-pkg/unpacked/Applications/PackageCustomInfoPListTest.app/Contents/runtime/Contents/Info.plist]
>>  plist files are the same
>>    [22:38:21.787] [  FAILED  ] CustomInfoPListTest.testPackage(APP); 
>> checks=54
>>    Exception in thread "main" java.lang.AssertionError: Actual list is 
>> shorter than expected by 5 elements: Check contents of 
>> [CustomInfoPListTest/testPackage.571a7829/vanilla/PackageCustomInfoPListTest.app/Contents/runtime/Contents/Info.plist]
>>  and 
>> [CustomInfoPListTest/testPackage.571a7829/unpacked-pkg/unpacked/Applications/PackageCustomInfoPListTest.app/Contents/runtime/Contents/Info.plist]
>>  plist files are the same
>>            at jdk....
>
> test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java line 237:
> 
>> 235:                     throw ExceptionBox.unbox(ex);
>> 236:                 }
>> 237:             } catch (Exception|AssertionError t) {
> 
> Should we use space around `|` or not? I see some old cases when we do `catch 
> (ExceptionBox | InvocationTargetException ex)` and in new cases we do `catch 
> (Exception|AssertionError t)`.

Yes, we should. Will fix it

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/28731#discussion_r2621824785

Reply via email to