From 01ab665681b7f532f2cbd728553bf278797330fb Mon Sep 17 00:00:00 2001
From: Volker Berlin <volker.berlin@googlemail.com>
Date: Sun, 25 Mar 2018 12:57:58 +0200
Subject: [PATCH] first tests for control flow operations like "if"

---
 test/de/inetsoftware/jwebassembly/ScriptEngine.java          | 4 ++--
 test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java | 5 ++---
 .../de/inetsoftware/jwebassembly/runtime/MathOperations.java | 5 ++---
 test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/de/inetsoftware/jwebassembly/ScriptEngine.java b/test/de/inetsoftware/jwebassembly/ScriptEngine.java
index af665ff..da19668 100644
--- a/test/de/inetsoftware/jwebassembly/ScriptEngine.java
+++ b/test/de/inetsoftware/jwebassembly/ScriptEngine.java
@@ -25,8 +25,8 @@ public enum ScriptEngine {
     NodeJS,
     SpiderMonkey;
 
-    public static Collection<Object[]> testParams() {
-        Object[][] val = {{ScriptEngine.SpiderMonkey},{ScriptEngine.NodeJS}};
+    public static Collection<ScriptEngine[]> testParams() {
+        ScriptEngine[][] val = {{ScriptEngine.SpiderMonkey},{ScriptEngine.NodeJS}};
         return Arrays.asList(val);
     }
 }
diff --git a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
index de04f70..5f43ac1 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
@@ -31,7 +31,6 @@ import de.inetsoftware.jwebassembly.WasmRule;
 /**
  * @author Volker Berlin
  */
-@RunWith(Parameterized.class)
 public class CallFunctions extends AbstractBaseTest {
     
     @ClassRule
@@ -44,8 +43,8 @@ public class CallFunctions extends AbstractBaseTest {
     @Parameters(name="{0}-{1}")
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( Object[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = (ScriptEngine)val[0];
+        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
+            ScriptEngine script = val[0];
             addParam( list, script, "intCall" );
         }
         return list;
diff --git a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
index 1568371..84c0c9c 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
@@ -30,7 +30,6 @@ import de.inetsoftware.jwebassembly.WasmRule;
 /**
  * @author Volker Berlin
  */
-@RunWith(Parameterized.class)
 public class MathOperations extends AbstractBaseTest {
     
     @ClassRule
@@ -43,8 +42,8 @@ public class MathOperations extends AbstractBaseTest {
     @Parameters(name="{0}-{1}")
     public static Collection<Object[]> data() {
         ArrayList<Object[]> list = new ArrayList<>();
-        for( Object[] val : ScriptEngine.testParams() ) {
-            ScriptEngine script = (ScriptEngine)val[0];
+        for( ScriptEngine[] val : ScriptEngine.testParams() ) {
+            ScriptEngine script = val[0];
             addParam( list, script, "intConst" );
             addParam( list, script, "floatConst" );
             addParam( list, script, "doubleConst" );
diff --git a/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java b/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java
index 80e85c0..dff4cfc 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java
@@ -49,7 +49,7 @@ public class RuntimeErrors {
     }
 
     @Parameters( name = "{0}" )
-    public static Collection<Object[]> data() {
+    public static Collection<ScriptEngine[]> data() {
         return ScriptEngine.testParams();
     }