From 39ca8a383c51a4edf4837d6b927771fac58a354a Mon Sep 17 00:00:00 2001 From: Volker Berlin Date: Sat, 24 Mar 2018 19:12:15 +0100 Subject: [PATCH] use AbstractBaseTest --- .../runtime/AbstractBaseTest.java | 41 +++++++++++++++++++ .../jwebassembly/runtime/CallFunctions.java | 19 +-------- .../jwebassembly/runtime/MathOperations.java | 20 +-------- 3 files changed, 45 insertions(+), 35 deletions(-) create mode 100644 test/de/inetsoftware/jwebassembly/runtime/AbstractBaseTest.java diff --git a/test/de/inetsoftware/jwebassembly/runtime/AbstractBaseTest.java b/test/de/inetsoftware/jwebassembly/runtime/AbstractBaseTest.java new file mode 100644 index 0000000..a7e6f2a --- /dev/null +++ b/test/de/inetsoftware/jwebassembly/runtime/AbstractBaseTest.java @@ -0,0 +1,41 @@ +package de.inetsoftware.jwebassembly.runtime; + +import java.util.ArrayList; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import de.inetsoftware.jwebassembly.ScriptEngine; +import de.inetsoftware.jwebassembly.WasmRule; + +/** + * @author Volker Berlin + */ +@RunWith( Parameterized.class ) +public abstract class AbstractBaseTest { + + private final WasmRule wasm; + + private final ScriptEngine script; + + private final String method; + + private final Object[] params; + + protected AbstractBaseTest( WasmRule wasm, ScriptEngine script, String method, Object[] params ) { + this.wasm = wasm; + this.script = script; + this.method = method; + this.params = params; + } + + protected static void addParam( ArrayList list, ScriptEngine script, String method, Object ...params ) { + list.add( new Object[]{script, method, params} ); + } + + @Test + public void test() { + wasm.test( script, method, params ); + } +} diff --git a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java index e59c600..de04f70 100644 --- a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java +++ b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java @@ -32,19 +32,13 @@ import de.inetsoftware.jwebassembly.WasmRule; * @author Volker Berlin */ @RunWith(Parameterized.class) -public class CallFunctions { +public class CallFunctions extends AbstractBaseTest { @ClassRule public static WasmRule rule = new WasmRule( TestClass.class ); - private final ScriptEngine script; - private final String method; - private final Object[] params; - public CallFunctions( ScriptEngine script, String method, Object[] params ) { - this.script = script; - this.method = method; - this.params = params; + super( rule, script, method, params ); } @Parameters(name="{0}-{1}") @@ -57,15 +51,6 @@ public class CallFunctions { return list; } - private static void addParam( ArrayList list, ScriptEngine script, String method, Object ...params ) { - list.add( new Object[]{script, method, params} ); - } - - @Test - public void test() { - rule.test( script, method, params ); - } - static class TestClass { @Export diff --git a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java index 65713b4..1568371 100644 --- a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java +++ b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Collection; import org.junit.ClassRule; -import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -32,19 +31,13 @@ import de.inetsoftware.jwebassembly.WasmRule; * @author Volker Berlin */ @RunWith(Parameterized.class) -public class MathOperations { +public class MathOperations extends AbstractBaseTest { @ClassRule public static WasmRule rule = new WasmRule( TestClass.class ); - private final ScriptEngine script; - private final String method; - private final Object[] params; - public MathOperations( ScriptEngine script, String method, Object[] params ) { - this.script = script; - this.method = method; - this.params = params; + super( rule, script, method, params ); } @Parameters(name="{0}-{1}") @@ -73,15 +66,6 @@ public class MathOperations { return list; } - private static void addParam( ArrayList list, ScriptEngine script, String method, Object ...params ) { - list.add( new Object[]{script, method, params} ); - } - - @Test - public void test() { - rule.test( script, method, params ); - } - static class TestClass { @Export