Skip to content
Permalink
Browse files
8244620: Fix test WinUpgradeUUIDTest failures in Mach5
Reviewed-by: asemenyuk, prr
  • Loading branch information
Andy Herrick committed May 11, 2020
1 parent 7882592 commit 9253c29fd263e56145eea9e63c8dfe55ec448794
Showing 2 changed files with 8 additions and 3 deletions.
@@ -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

############################################################################

@@ -182,19 +182,25 @@ static abstract class PropertyVerifier {
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();

0 comments on commit 9253c29

Please sign in to comment.