stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8244620: Fix test WinUpgradeUUIDTest failures in Mach5

Browse Source 
Reviewed-by: asemenyuk, prr
This commit is contained in:
Andy Herrick 2020-05-11 15:29:52 -04:00
parent 78825925a5
commit 9253c29fd2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/jdk/ProblemList.txt
View File

@ -897,7 +897,6 @@ sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all
# core_tools
tools/jlink/JLinkReproducibleTest.java 8217166 windows-all
tools/jpackage/windows/WinUpgradeUUIDTest.java#id1 8244620 windows-all
############################################################################

10
test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java
View File

@ -182,19 +182,25 @@ public class WinUpgradeUUIDTest {
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();