File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
test/jdk/tools/jpackage/share Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change 11/*
2- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
2+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44 *
55 * This code is free software; you can redistribute it and/or modify it
2626import java .util .List ;
2727import java .util .Optional ;
2828import java .util .function .BiFunction ;
29+ import java .util .stream .Stream ;
2930import jdk .jpackage .test .JPackageCommand ;
3031import jdk .jpackage .test .Annotations .Test ;
3132import jdk .jpackage .test .Executor ;
@@ -83,8 +84,10 @@ public static void test() throws Exception {
8384 final String expectedEnvVarValue = Optional .ofNullable (System .getenv (
8485 envVarName )).orElse ("" ) + File .pathSeparator + appDir ;
8586
86- TKit .assertEquals (expectedEnvVarValue , actualEnvVarValue , String .format (
87- "Check value of %s env variable" , envVarName ));
87+ TKit .assertTextStream (expectedEnvVarValue )
88+ .predicate (TKit .isLinux () ? String ::endsWith : String ::equals )
89+ .label (String .format ("value of %s env variable" , envVarName ))
90+ .apply (Stream .of (actualEnvVarValue ));
8891
8992 final String javaLibraryPath = getValue .apply (2 , "java.library.path" );
9093 TKit .assertTrue (
You can’t perform that action at this time.
0 commit comments