From ce1890fc21e750144cd1039a3ca7586ddc77adc4 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Wed, 15 Mar 2023 12:43:43 +0100 Subject: [PATCH 1/2] JDK-8304063 --- .../jdk/tools/jpackage/share/AppLauncherEnvTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java index 6e7d35d37b7d9..fcd1a49c44045 100644 --- a/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java +++ b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -83,8 +83,14 @@ public static void test() throws Exception { final String expectedEnvVarValue = Optional.ofNullable(System.getenv( envVarName)).orElse("") + File.pathSeparator + appDir; - TKit.assertEquals(expectedEnvVarValue, actualEnvVarValue, String.format( - "Check value of %s env variable", envVarName)); + String msg = String.format("Check value of %s env variable", envVarName); + if (TKit.isLinux()) { + if (! actualEnvVarValue.endsWith(expectedEnvVarValue)) { + TKit.assertTrue(false, msg); + } + } else { + TKit.assertEquals(expectedEnvVarValue, actualEnvVarValue, msg); + } final String javaLibraryPath = getValue.apply(2, "java.library.path"); TKit.assertTrue( From d1066109a12299fb8112f0ed2dd043168f3fbfb1 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Thu, 16 Mar 2023 10:02:33 +0100 Subject: [PATCH 2/2] redo check --- .../tools/jpackage/share/AppLauncherEnvTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java index fcd1a49c44045..cc52b285fbe37 100644 --- a/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java +++ b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Optional; import java.util.function.BiFunction; +import java.util.stream.Stream; import jdk.jpackage.test.JPackageCommand; import jdk.jpackage.test.Annotations.Test; import jdk.jpackage.test.Executor; @@ -83,14 +84,10 @@ public static void test() throws Exception { final String expectedEnvVarValue = Optional.ofNullable(System.getenv( envVarName)).orElse("") + File.pathSeparator + appDir; - String msg = String.format("Check value of %s env variable", envVarName); - if (TKit.isLinux()) { - if (! actualEnvVarValue.endsWith(expectedEnvVarValue)) { - TKit.assertTrue(false, msg); - } - } else { - TKit.assertEquals(expectedEnvVarValue, actualEnvVarValue, msg); - } + TKit.assertTextStream(expectedEnvVarValue) + .predicate(TKit.isLinux() ? String::endsWith : String::equals) + .label(String.format("value of %s env variable", envVarName)) + .apply(Stream.of(actualEnvVarValue)); final String javaLibraryPath = getValue.apply(2, "java.library.path"); TKit.assertTrue(