reorder the script engines for testing

This commit is contained in:
Volker Berlin 2019-08-27 18:25:31 +02:00
parent 8cd9d16a33
commit fd0a22121c
11 changed files with 31 additions and 33 deletions

View File

@ -15,7 +15,7 @@
*/
package de.inetsoftware.jwebassembly;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collection;
/**
@ -29,15 +29,23 @@ public enum ScriptEngine {
Wat2Wasm,
;
public static Collection<ScriptEngine[]> testParams() {
ScriptEngine[][] val = { //
{ ScriptEngine.SpiderMonkey }, //
{ ScriptEngine.NodeJS }, //
{ ScriptEngine.NodeWat }, //
{ ScriptEngine.SpiderMonkeyWat },//
{ ScriptEngine.Wat2Wasm }, //
public static ScriptEngine[] testEngines() {
ScriptEngine[] val = { //
SpiderMonkey, //
NodeJS, //
NodeWat, //
SpiderMonkeyWat,//
Wat2Wasm, //
};
return Arrays.asList(val);
return val;
}
public static Collection<ScriptEngine[]> testParams() {
ArrayList<ScriptEngine[]> val = new ArrayList<>();
for( ScriptEngine script : ScriptEngine.testEngines() ) {
val.add( new ScriptEngine[] { script } );
}
return val;
}
}

View File

@ -40,8 +40,7 @@ public class Arrays extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "length" );
addParam( list, script, "loopByte" );
addParam( list, script, "loopShort" );

View File

@ -42,8 +42,7 @@ public class CallFunctions extends AbstractBaseTest {
@Parameters(name="{0}-{1}")
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "intCall" );
addParam( list, script, "nativeCall" );
}

View File

@ -40,8 +40,7 @@ public class ControlFlowOperators extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "ifeq" );
addParam( list, script, "ifne" );
addParam( list, script, "iflt" );

View File

@ -1,5 +1,5 @@
/*
* Copyright 2018 Volker Berlin (i-net software)
* Copyright 2018 - 2019 Volker Berlin (i-net software)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -39,8 +39,7 @@ public class Exceptions extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "simple" );
addParam( list, script, "direct" );
addParam( list, script, "rethrow" );

View File

@ -40,8 +40,7 @@ public class MathAPI extends AbstractBaseTest {
@Parameters(name="{0}-{1}")
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "floatToIntBits" );
addParam( list, script, "intBitsToFloat" );
addParam( list, script, "doubleToLongBits" );

View File

@ -1,5 +1,5 @@
/*
* Copyright 2017 - 2018 Volker Berlin (i-net software)
* Copyright 2017 - 2019 Volker Berlin (i-net software)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,8 +40,7 @@ public class MathOperations extends AbstractBaseTest {
@Parameters(name="{0}-{1}")
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "intConst" );
addParam( list, script, "floatConst" );
addParam( list, script, "doubleConst" );

View File

@ -37,8 +37,7 @@ public class Stacks extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "dupInt" );
addParam( list, script, "dupFloat" );
addParam( list, script, "dupDouble" );

View File

@ -1,5 +1,5 @@
/*
* Copyright 2018 Volker Berlin (i-net software)
* Copyright 2018 - 2019 Volker Berlin (i-net software)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -37,8 +37,7 @@ public class StaticValues extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "abc" );
}
rule.setTestParameters( list );

View File

@ -1,5 +1,5 @@
/*
* Copyright 2018 Volker Berlin (i-net software)
* Copyright 2018 - 2019 Volker Berlin (i-net software)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,8 +40,7 @@ public class Structs extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "isNull" );
addParam( list, script, "isNotNull" );
addParam( list, script, "isSame" );

View File

@ -37,8 +37,7 @@ public class Wide extends AbstractBaseTest {
@Parameters( name = "{0}-{1}" )
public static Collection<Object[]> data() {
ArrayList<Object[]> list = new ArrayList<>();
for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0];
for( ScriptEngine script : ScriptEngine.testEngines() ) {
addParam( list, script, "thenBranch" );
addParam( list, script, "elseBranch" );
}