Skip to content

Commit 6012e8d

Browse files
committed
8350808: Small typos in JShell method SnippetEvent.toString()
Reviewed-by: jlahoda
1 parent 661bd5b commit 6012e8d

File tree

2 files changed

+67
-4
lines changed

2 files changed

+67
-4
lines changed

src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2025, 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
@@ -148,9 +148,9 @@ public String toString() {
148148
",previousStatus=" + previousStatus +
149149
",status=" + status +
150150
",isSignatureChange=" + isSignatureChange +
151-
",causeSnippet" + causeSnippet +
152-
(value == null? "" : "value=" + value) +
153-
(exception == null? "" : "exception=" + exception) +
151+
",causeSnippet=" + causeSnippet +
152+
(value == null? "" : ",value=" + value) +
153+
(exception == null? "" : ",exception=" + exception) +
154154
")";
155155
}
156156
}
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/*
25+
* @test
26+
* @bug 8350808
27+
* @summary Check for proper formatting of SnippetEvent.toString()
28+
* @run testng SnippetEventToStringTest
29+
*/
30+
31+
import java.util.Map;
32+
import java.util.List;
33+
34+
import jdk.jshell.JShell;
35+
import jdk.jshell.SnippetEvent;
36+
import jdk.jshell.execution.LocalExecutionControlProvider;
37+
38+
import org.testng.annotations.DataProvider;
39+
import org.testng.annotations.Test;
40+
import static org.testng.Assert.assertEquals;
41+
42+
public class SnippetEventToStringTest {
43+
44+
@DataProvider(name = "cases")
45+
public String[][] sourceLevels() {
46+
return new String[][] {
47+
{ "*", ",causeSnippet=null" },
48+
{ "123", ",value=123" },
49+
{ "throw new Exception(\"foo\");", ",exception=jdk.jshell.EvalException: foo" }
50+
};
51+
}
52+
53+
@Test(dataProvider = "cases")
54+
private void verifySnippetEvent(String source, String match) {
55+
try (JShell jsh = JShell.builder().executionEngine(new LocalExecutionControlProvider(), Map.of()).build()) {
56+
List<SnippetEvent> result = jsh.eval(source);
57+
assertEquals(result.size(), 1);
58+
String string = result.get(0).toString();
59+
if (!string.contains(match))
60+
throw new AssertionError(String.format("\"%s\" not found in \"%s\"", match, string));
61+
}
62+
}
63+
}

0 commit comments

Comments
 (0)