OpenJDK / jdk / jdk
changeset 59242:1d1c57304400
8244620: Fix test WinUpgradeUUIDTest failures in Mach5
Reviewed-by: asemenyuk, prr
| author | herrick |
|---|---|
| date | Mon, 11 May 2020 15:29:52 -0400 |
| parents | a135cb86e111 |
| children | 34a299b47cd0 |
| files | test/jdk/ProblemList.txt test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/jdk/ProblemList.txt Mon May 11 18:49:01 2020 +0000 +++ b/test/jdk/ProblemList.txt Mon May 11 15:29:52 2020 -0400 @@ -897,7 +897,6 @@ # core_tools tools/jlink/JLinkReproducibleTest.java 8217166 windows-all -tools/jpackage/windows/WinUpgradeUUIDTest.java#id1 8244620 windows-all ############################################################################
--- a/test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java Mon May 11 18:49:01 2020 +0000 +++ b/test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java Mon May 11 15:29:52 2020 -0400 @@ -182,19 +182,25 @@ void assertEquals(PackageTest x, PackageTest y) { var entryX = propertyValues().get(x); var entryY = propertyValues().get(y); - TKit.assertEquals(entryX.getValue(), entryY.getValue(), + // if MsiBundler is not supported, these will be null + if (entryX != null && entryY != null) { + TKit.assertEquals(entryX.getValue(), entryY.getValue(), String.format( "Check %s is the same for %s and %s command lines", propertyName(), entryX.getKey(), entryY.getKey())); + } } void assertNotEquals(PackageTest x, PackageTest y) { var entryX = propertyValues().get(x); var entryY = propertyValues().get(y); - TKit.assertNotEquals(entryX.getValue(), entryY.getValue(), + // if MsiBundler is not supported, these will be null + if (entryX != null && entryY != null) { + TKit.assertNotEquals(entryX.getValue(), entryY.getValue(), String.format( "Check %s is different for %s and %s command lines", propertyName(), entryX.getKey(), entryY.getKey())); + } } protected abstract String propertyName();