Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MSHARED-1378] Cleanup of test code #117

Merged
merged 1 commit into from
Apr 5, 2024
Merged

[MSHARED-1378] Cleanup of test code #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ public Object evaluateScript(String script, Map<String, ?> globalVariables, Prin
}
}

if (classLoader != null) {
engine.setClassLoader(classLoader);
}
engine.setClassLoader(classLoader);

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

@Override
public void close() throws IOException {
if (classLoader != null) {
classLoader.close();
}
classLoader.close();
}
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public void setClassPath(List<String> classPath) {
* default encoding.
*/
public void setScriptEncoding(String encoding) {
this.encoding = (encoding != null && !encoding.isEmpty()) ? encoding : null;
this.encoding = encoding != null && !encoding.isEmpty() ? encoding : null;
}

/**
Expand Down
24 changes: 13 additions & 11 deletions src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,28 @@
*
* @author Benjamin Bentmann
*/
public class BeanShellScriptInterpreterTest {
class BeanShellScriptInterpreterTest {
@Test
public void testEvaluateScript() throws Exception {
void testEvaluateScript() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new BeanShellScriptInterpreter();
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript("System.out.print(\"Test\"); return true;", null, new PrintStream(out)));
try (ScriptInterpreter interpreter = new BeanShellScriptInterpreter()) {
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript("System.out.print(\"Test\"); return true;", null, new PrintStream(out)));
}
assertEquals("Test", out.toString());
}

@Test
public void testEvaluateScriptVars() throws Exception {
void testEvaluateScriptVars() throws Exception {
Map<String, Object> vars = new HashMap<>();
vars.put("testVar", "data");
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new BeanShellScriptInterpreter();
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript("System.out.print(testVar); return true;", vars, new PrintStream(out)));
try (ScriptInterpreter interpreter = new BeanShellScriptInterpreter()) {
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript("System.out.print(testVar); return true;", vars, new PrintStream(out)));
}
assertEquals("data", out.toString());
}
}
60 changes: 32 additions & 28 deletions src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,61 +35,65 @@
*
* @author Benjamin Bentmann
*/
public class GroovyScriptInterpreterTest {
class GroovyScriptInterpreterTest {
@Test
public void testEvaluateScript() throws Exception {
void testEvaluateScript() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
assertEquals(
Boolean.TRUE, interpreter.evaluateScript("print \"Test\"\nreturn true", null, new PrintStream(out)));
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript("print \"Test\"\nreturn true", null, new PrintStream(out)));
}
assertEquals("Test", out.toString());
}

@Test
public void testEvaluateScriptWithDefaultClassPath() throws Exception {
void testEvaluateScriptWithDefaultClassPath() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new GroovyScriptInterpreter();

assertEquals(
Boolean.TRUE,
interpreter.evaluateScript(
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
null,
new PrintStream(out)));
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript(
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
null,
new PrintStream(out)));
}

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

@Test
public void testEvaluateScriptWithCustomClassPath() throws Exception {
void testEvaluateScriptWithCustomClassPath() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {

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

assertEquals(
Boolean.TRUE,
interpreter.evaluateScript(
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
null,
new PrintStream(out)));
assertEquals(
Boolean.TRUE,
interpreter.evaluateScript(
"print getClass().getResource( \"/class-path.txt\" ).getPath().toURI().getPath()\nreturn true",
null,
new PrintStream(out)));
}

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

@Test
public void testEvaluateScriptVars() throws Exception {
void testEvaluateScriptVars() throws Exception {
Map<String, Object> vars = new HashMap<>();
vars.put("testVar", "data");
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
assertEquals(
Boolean.TRUE, interpreter.evaluateScript("print testVar\nreturn true", vars, new PrintStream(out)));
try (ScriptInterpreter interpreter = new GroovyScriptInterpreter()) {
assertEquals(
Boolean.TRUE, interpreter.evaluateScript("print testVar\nreturn true", vars, new PrintStream(out)));
}
assertEquals("data", out.toString());
}
}