Skip to content

Commit 43123f4

Browse files
slawekjaranowskislawekjaranowski
committed
[MSHARED-1378] Cleanup of test code
- remove public classifier - use try with resources
1 parent eef92e6 commit 43123f4

File tree

4 files changed

+48
-46
lines changed

4 files changed

+48
-46
lines changed

‎src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,7 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin
128128
}
129129
}
130130

131-
if (classLoader != null) {
132-
engine.setClassLoader(classLoader);
133-
}
131+
engine.setClassLoader(classLoader);
134132

135133
if (globalVariables != null) {
136134
for (Map.Entry<String, ?> entry : globalVariables.entrySet()) {
@@ -159,8 +157,6 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin
159157

160158
@Override
161159
public void close() throws IOException {
162-
if (classLoader != null) {
163-
classLoader.close();
164-
}
160+
classLoader.close();
165161
}
166162
}

‎src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void setClassPath(List<String> classPath) {
111111
* default encoding.
112112
*/
113113
public void setScriptEncoding(String encoding) {
114-
this.encoding = (encoding != null && !encoding.isEmpty()) ? encoding : null;
114+
this.encoding = encoding != null && !encoding.isEmpty() ? encoding : null;
115115
}
116116

117117
/**

‎src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java

+13-11
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,28 @@
3232
*
3333
* @author Benjamin Bentmann
3434
*/
35-
public class BeanShellScriptInterpreterTest {
35+
class BeanShellScriptInterpreterTest {
3636
@Test
37-
public void testEvaluateScript() throws Exception {
37+
void testEvaluateScript() throws Exception {
3838
ByteArrayOutputStream out = new ByteArrayOutputStream();
39-
ScriptInterpreter interpreter = new BeanShellScriptInterpreter();
40-
assertEquals(
41-
Boolean.TRUE,
42-
interpreter.evaluateScript("System.out.print(\"Test\"); return true;", null, new PrintStream(out)));
39+
try (ScriptInterpreter interpreter = new BeanShellScriptInterpreter()) {
40+
assertEquals(
41+
Boolean.TRUE,
42+
interpreter.evaluateScript("System.out.print(\"Test\"); return true;", null, new PrintStream(out)));
43+
}
4344
assertEquals("Test", out.toString());
4445
}
4546

4647
@Test
47-
public void testEvaluateScriptVars() throws Exception {
48+
void testEvaluateScriptVars() throws Exception {
4849
Map<String, Object> vars = new HashMap<>();
4950
vars.put("testVar", "data");
5051
ByteArrayOutputStream out = new ByteArrayOutputStream();
51-
ScriptInterpreter interpreter = new BeanShellScriptInterpreter();
52-
assertEquals(
53-
Boolean.TRUE,
54-
interpreter.evaluateScript("System.out.print(testVar); return true;", vars, new PrintStream(out)));
52+
try (ScriptInterpreter interpreter = new BeanShellScriptInterpreter()) {
53+
assertEquals(
54+
Boolean.TRUE,
55+
interpreter.evaluateScript("System.out.print(testVar); return true;", vars, new PrintStream(out)));
56+
}
5557
assertEquals("data", out.toString());
5658
}
5759
}

‎src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java

+32-28
Original file line numberDiff line numberDiff line change
@@ -35,61 +35,65 @@
3535
*
3636
* @author Benjamin Bentmann
3737
*/
38-
public class GroovyScriptInterpreterTest {
38+
class GroovyScriptInterpreterTest {
3939
@Test
40-
public void testEvaluateScript() throws Exception {
40+
void testEvaluateScript() throws Exception {
4141
ByteArrayOutputStream out = new ByteArrayOutputStream();
42-
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
43-
assertEquals(
44-
Boolean.TRUE, interpreter.evaluateScript("print \"Test\"\nreturn true", null, new PrintStream(out)));
42+
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
43+
assertEquals(
44+
Boolean.TRUE,
45+
interpreter.evaluateScript("print \"Test\"\nreturn true", null, new PrintStream(out)));
46+
}
4547
assertEquals("Test", out.toString());
4648
}
4749

4850
@Test
49-
public void testEvaluateScriptWithDefaultClassPath() throws Exception {
51+
void testEvaluateScriptWithDefaultClassPath() throws Exception {
5052
ByteArrayOutputStream out = new ByteArrayOutputStream();
51-
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
52-
53-
assertEquals(
54-
Boolean.TRUE,
55-
interpreter.evaluateScript(
56-
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
57-
null,
58-
new PrintStream(out)));
53+
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
54+
assertEquals(
55+
Boolean.TRUE,
56+
interpreter.evaluateScript(
57+
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
58+
null,
59+
new PrintStream(out)));
60+
}
5961

6062
String testClassPath =
6163
new File("target/test-classes/class-path.txt").toURI().getPath();
6264
assertEquals(testClassPath, out.toString());
6365
}
6466

6567
@Test
66-
public void testEvaluateScriptWithCustomClassPath() throws Exception {
68+
void testEvaluateScriptWithCustomClassPath() throws Exception {
6769
ByteArrayOutputStream out = new ByteArrayOutputStream();
68-
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
70+
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
6971

70-
List<String> classPath = Collections.singletonList(new File("src/test-class-path").getAbsolutePath());
71-
interpreter.setClassPath(classPath);
72+
List<String> classPath = Collections.singletonList(new File("src/test-class-path").getAbsolutePath());
73+
interpreter.setClassPath(classPath);
7274

73-
assertEquals(
74-
Boolean.TRUE,
75-
interpreter.evaluateScript(
76-
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
77-
null,
78-
new PrintStream(out)));
75+
assertEquals(
76+
Boolean.TRUE,
77+
interpreter.evaluateScript(
78+
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
79+
null,
80+
new PrintStream(out)));
81+
}
7982

8083
String testClassPath =
8184
new File("src/test-class-path/class-path.txt").toURI().getPath();
8285
assertEquals(testClassPath, out.toString());
8386
}
8487

8588
@Test
86-
public void testEvaluateScriptVars() throws Exception {
89+
void testEvaluateScriptVars() throws Exception {
8790
Map<String, Object> vars = new HashMap<>();
8891
vars.put("testVar", "data");
8992
ByteArrayOutputStream out = new ByteArrayOutputStream();
90-
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
91-
assertEquals(
92-
Boolean.TRUE, interpreter.evaluateScript("print testVar\nreturn true", vars, new PrintStream(out)));
93+
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
94+
assertEquals(
95+
Boolean.TRUE, interpreter.evaluateScript("print testVar\nreturn true", vars, new PrintStream(out)));
96+
}
9397
assertEquals("data", out.toString());
9498
}
9599
}

0 commit comments

Comments
 (0)