infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-12 00:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8353545: Improve debug info for StartOptionTest

Browse Source 
Reviewed-by: asotona
This commit is contained in:
Jan Lahoda 2025-04-02 13:19:08 +00:00
parent 4f97c4c036
commit 23eb648cae
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/langtools/jdk/jshell/StartOptionTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2025, 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
@ -89,18 +89,34 @@ public class StartOptionTest {
}
protected void check(ByteArrayOutputStream str, Consumer<String> checkOut, String label) {
byte[] bytes = str.toByteArray();
str.reset();
String out = new String(bytes, StandardCharsets.UTF_8);
out = stripAnsi(out);
out = out.replaceAll("[\r\n]+", "\n");
if (checkOut != null) {
checkOut.accept(out);
} else {
assertEquals(out, "", label + ": Expected empty -- ");
try {
byte[] bytes = str.toByteArray();
str.reset();
String out = new String(bytes, StandardCharsets.UTF_8);
out = stripAnsi(out);
out = out.replaceAll("[\r\n]+", "\n");
if (checkOut != null) {
checkOut.accept(out);
} else {
assertEquals(out, "", label + ": Expected empty -- ");
}
} catch (Throwable t) {
logOutput("cmdout", cmdout);
logOutput("cmderr", cmderr);
logOutput("console", console);
logOutput("userout", userout);
logOutput("usererr", usererr);
throw t;
}
}
private void logOutput(String outName, ByteArrayOutputStream out) {
System.err.println(outName + ": " +
new String(out.toByteArray(),
StandardCharsets.UTF_8));
}
protected void checkExit(int ec, Consumer<Integer> checkCode) {
if (checkCode != null) {
checkCode.accept(ec);