You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/05 17:55:43 UTC
[maven-script-interpreter] branch MSHARED-908 created (now a972e49)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-908
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git.
at a972e49 [MSHARED-908] Cleanup tests
This branch includes the following new commits:
new 3148c5f [MSHARED-908] Update JUnit to 4.13
new a972e49 [MSHARED-908] Cleanup tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-script-interpreter] 01/02: [MSHARED-908] Update JUnit to 4.13
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-908
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit 3148c5f864668c8577dcaec13a90bf15e4bd6398
Author: Slawomir Jaranowski <sl...@payu.pl>
AuthorDate: Sun May 31 15:49:10 2020 +0200
[MSHARED-908] Update JUnit to 4.13
Closes #2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5835f9e..c8f9fc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
[maven-script-interpreter] 02/02: [MSHARED-908] Cleanup tests
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-908
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit a972e4956c214f4af00f4f801f07f6130037a0ff
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 5 19:54:05 2020 +0200
[MSHARED-908] Cleanup tests
---
.../shared/scriptinterpreter/ScriptRunner.java | 10 +++++-----
.../BeanShellScriptInterpreterTest.java | 20 ++++++++++++--------
.../GroovyScriptInterpreterTest.java | 18 ++++++++++--------
.../shared/scriptinterpreter/ScriptRunnerTest.java | 21 ++++++++++++++-------
4 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
index 039273f..f17b398 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
@@ -79,11 +79,11 @@ public class ScriptRunner
throw new IllegalArgumentException( "missing logger" );
}
this.log = log;
- scriptInterpreters = new LinkedHashMap<String, ScriptInterpreter>();
+ scriptInterpreters = new LinkedHashMap<>();
scriptInterpreters.put( "bsh", new BeanShellScriptInterpreter() );
scriptInterpreters.put( "groovy", new GroovyScriptInterpreter() );
- globalVariables = new HashMap<String, Object>();
- classPath = new ArrayList<String>();
+ globalVariables = new HashMap<>();
+ classPath = new ArrayList<>();
}
public void addScriptInterpreter( String id, ScriptInterpreter scriptInterpreter )
@@ -122,7 +122,7 @@ public class ScriptRunner
*/
public void setClassPath( List<String> classPath )
{
- this.classPath = ( classPath != null ) ? new ArrayList<String>( classPath ) : new ArrayList<String>();
+ this.classPath = ( classPath != null ) ? new ArrayList<>( classPath ) : new ArrayList<String>();
}
/**
@@ -216,7 +216,7 @@ public class ScriptRunner
boolean failOnException )
throws IOException, RunFailureException
{
- Map<String, Object> globalVariables = new HashMap<String, Object>( this.globalVariables );
+ Map<String, Object> globalVariables = new HashMap<>( this.globalVariables );
globalVariables.put( "basedir", scriptFile.getParentFile() );
globalVariables.put( "context", context );
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
index f0f689d..89c947d 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
@@ -19,41 +19,45 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import junit.framework.TestCase;
+import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests the BeanShell interpreter facade.
*
* @author Benjamin Bentmann
*/
public class BeanShellScriptInterpreterTest
- extends TestCase
{
-
+ @Test
public void testEvaluateScript()
throws Exception
{
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new BeanShellScriptInterpreter();
- assertEquals( Boolean.TRUE, interpreter.evaluateScript( "System.out.print(\"Test\"); return true;", null,
- null, new PrintStream( out ) ) );
+ assertEquals( Boolean.TRUE,
+ interpreter.evaluateScript( "System.out.print(\"Test\"); return true;", null, null,
+ new PrintStream( out ) ) );
assertEquals( "Test", out.toString() );
}
+ @Test
public void testEvaluateScriptVars()
throws Exception
{
- Map<String, Object> vars = new HashMap<String, Object>();
+ 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;", null,
- vars, new PrintStream( out ) ) );
+ assertEquals( Boolean.TRUE,
+ interpreter.evaluateScript( "System.out.print(testVar); return true;", null, vars,
+ new PrintStream( out ) ) );
assertEquals( "data", out.toString() );
}
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
index ce2da68..6758051 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
@@ -19,41 +19,43 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import junit.framework.TestCase;
+import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests the Groovy interpreter facade.
*
* @author Benjamin Bentmann
*/
public class GroovyScriptInterpreterTest
- extends TestCase
{
-
+ @Test
public void testEvaluateScript()
throws Exception
{
ByteArrayOutputStream out = new ByteArrayOutputStream();
ScriptInterpreter interpreter = new GroovyScriptInterpreter();
- assertEquals( Boolean.TRUE, interpreter.evaluateScript( "print \"Test\"\nreturn true", null, null,
- new PrintStream( out ) ) );
+ assertEquals( Boolean.TRUE,
+ interpreter.evaluateScript( "print \"Test\"\nreturn true", null, null, new PrintStream( out ) ) );
assertEquals( "Test", out.toString() );
}
+ @Test
public void testEvaluateScriptVars()
throws Exception
{
- Map<String, Object> vars = new HashMap<String, Object>();
+ 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", null, vars,
- new PrintStream( out ) ) );
+ assertEquals( Boolean.TRUE,
+ interpreter.evaluateScript( "print testVar\nreturn true", null, vars, new PrintStream( out ) ) );
assertEquals( "data", out.toString() );
}
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
index 09166d7..d2c1c37 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
@@ -18,20 +18,22 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.maven.plugin.logging.SystemStreamLog;
import org.apache.maven.shared.utils.io.FileUtils;
+import org.junit.Test;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
+import static org.junit.Assert.assertTrue;
+
/**
* @author Olivier Lamy
*/
public class ScriptRunnerTest
- extends TestCase
{
+ @Test
public void testBeanshell()
throws Exception
{
@@ -50,10 +52,11 @@ public class ScriptRunnerTest
String logContent = FileUtils.fileRead( logFile );
assertTrue( logContent.contains( new File( "src/test/resources/bsh-test/verify.bsh" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );
- assertTrue( logContent.contains( "globalVar=Yeah baby it's rocks"));
+ assertTrue( logContent.contains( "globalVar=Yeah baby it's rocks" ) );
}
+ @Test
public void testBeanshellWithFile()
throws Exception
{
@@ -76,6 +79,7 @@ public class ScriptRunnerTest
}
+ @Test
public void testGroovy()
throws Exception
{
@@ -92,12 +96,14 @@ public class ScriptRunnerTest
new FileLogger( logFile ), "foo", true );
String logContent = FileUtils.fileRead( logFile );
- assertTrue( logContent.contains( new File( "src/test/resources/groovy-test/verify.groovy" ).getPath() ) );
+ assertTrue(
+ logContent.contains( new File( "src/test/resources/groovy-test/verify.groovy" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );
- assertTrue( logContent.contains( "globalVar=Yeah baby it's rocks"));
+ assertTrue( logContent.contains( "globalVar=Yeah baby it's rocks" ) );
}
+ @Test
public void testGroovyWithFile()
throws Exception
{
@@ -113,7 +119,8 @@ public class ScriptRunnerTest
new FileLogger( logFile ), "foo", true );
String logContent = FileUtils.fileRead( logFile );
- assertTrue( logContent.contains( new File( "src/test/resources/groovy-test/verify.groovy" ).getPath() ) );
+ assertTrue(
+ logContent.contains( new File( "src/test/resources/groovy-test/verify.groovy" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );
@@ -122,7 +129,7 @@ public class ScriptRunnerTest
private Map<String, ? extends Object> buildContext()
{
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
context.put( "foo", "bar" );
return context;
}