From d17648a448980bb6df39ca89f9efe5fefdb55d5b Mon Sep 17 00:00:00 2001 From: Volker Berlin Date: Sun, 15 Sep 2019 10:45:29 +0200 Subject: [PATCH] Split structs test for NonGC and GC script engines because the different implementation state --- .../jwebassembly/runtime/StructsGC.java | 171 +++++++++++++++++ .../jwebassembly/runtime/StructsNonGC.java | 172 ++++++++++++++++++ 2 files changed, 343 insertions(+) create mode 100644 test/de/inetsoftware/jwebassembly/runtime/StructsGC.java create mode 100644 test/de/inetsoftware/jwebassembly/runtime/StructsNonGC.java diff --git a/test/de/inetsoftware/jwebassembly/runtime/StructsGC.java b/test/de/inetsoftware/jwebassembly/runtime/StructsGC.java new file mode 100644 index 0000000..abc4d86 --- /dev/null +++ b/test/de/inetsoftware/jwebassembly/runtime/StructsGC.java @@ -0,0 +1,171 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package de.inetsoftware.jwebassembly.runtime; + +import static org.junit.Assume.assumeTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; + +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runners.Parameterized.Parameters; + +import de.inetsoftware.jwebassembly.ScriptEngine; +import de.inetsoftware.jwebassembly.WasmRule; +import de.inetsoftware.jwebassembly.api.annotation.Export; +import de.inetsoftware.jwebassembly.api.annotation.Import; + +public class StructsGC extends AbstractBaseTest { + + @ClassRule + public static WasmRule rule = new WasmRule( TestClass.class, Abc.class ); + + public StructsGC( ScriptEngine script, String method, Object[] params ) { + super( rule, script, method, params ); + } + + @Parameters( name = "{0}-{1}" ) + public static Collection data() { + ArrayList list = new ArrayList<>(); + ScriptEngine[] engines = { ScriptEngine.SpiderMonkeyGC, ScriptEngine.SpiderMonkeyWatGC }; + for( ScriptEngine script : engines ) { + addParam( list, script, "isNull" ); + addParam( list, script, "isNotNull" ); + addParam( list, script, "isSame" ); + addParam( list, script, "isNotSame" ); + addParam( list, script, "simple" ); + addParam( list, script, "callSuperMethod" ); + //TODO addParam( list, script, "callVirtualMethod" ); + addParam( list, script, "useGlobalObject" ); + addParam( list, script, "multipleAssign" ); + } + rule.setTestParameters( list ); + return list; + } + + @Test + public void test() { + super.test(); + } + + static class TestClass { + + @Export + static boolean isNull() { + Object val = null; + return val == null; + } + + @Export + static boolean isNotNull() { + Object val = null; + return val != null; + } + + @Export + static boolean isSame() { + Object val1 = null; + Object val2 = null; + return val1 == val2; + } + + @Export + static boolean isNotSame() { + Object val1 = null; + Object val2 = null; + return val1 != val2; + } + + @Export + static int simple() { + Abc val = new Abc2(); + val.a = 63; + return val.a; + } + + /** + * Call a method that is declared in the super class of the instance + */ + @Export + static int callSuperMethod() { + Abc2 val = new Abc2(); + val.foo(); + return val.a; + } + @Import( js = "(i) => {console.log('log ' + i)}" ) + public static void print(int i) { + } + + /** + * Call an overridden method + */ + @Export + static int callVirtualMethod() { + Abc val = new Abc2(); + val.bar(); + return val.a; + } + + /** + * Access a object in a global/static variable. + */ + static Abc2 valGlobal; + @Export + static int useGlobalObject() { + valGlobal = new Abc2(); + valGlobal.foo(); + return valGlobal.a; + } + + /** + * Assign multiple with a field. There are complex stack operation + */ + @Export + static int multipleAssign() { + Abc2 val = new Abc2(); + for( int i = 0; i < 1_000; i++ ) { + val.a = 42; + // TODO + //val = val.abc = new Abc2(); + } + return val.a; + } + } + + static class Abc { + int a; + + long b; + + final void foo() { + a = 1; + } + + void bar() { + a = 2; + } + } + + static class Abc2 extends Abc { + Abc2 abc; + + void bar() { + a = 3; + } + } +} diff --git a/test/de/inetsoftware/jwebassembly/runtime/StructsNonGC.java b/test/de/inetsoftware/jwebassembly/runtime/StructsNonGC.java new file mode 100644 index 0000000..5edcade --- /dev/null +++ b/test/de/inetsoftware/jwebassembly/runtime/StructsNonGC.java @@ -0,0 +1,172 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package de.inetsoftware.jwebassembly.runtime; + +import static org.junit.Assume.assumeTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; + +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runners.Parameterized.Parameters; + +import de.inetsoftware.jwebassembly.ScriptEngine; +import de.inetsoftware.jwebassembly.WasmRule; +import de.inetsoftware.jwebassembly.api.annotation.Export; +import de.inetsoftware.jwebassembly.api.annotation.Import; + +public class StructsNonGC extends AbstractBaseTest { + + @ClassRule + public static WasmRule rule = new WasmRule( TestClass.class, Abc.class ); + + public StructsNonGC( ScriptEngine script, String method, Object[] params ) { + super( rule, script, method, params ); + } + + @Parameters( name = "{0}-{1}" ) + public static Collection data() { + ArrayList list = new ArrayList<>(); + ScriptEngine[] engines = ScriptEngine.testEngines(); + for( ScriptEngine script : engines ) { + addParam( list, script, "isNull" ); + addParam( list, script, "isNotNull" ); + addParam( list, script, "isSame" ); + addParam( list, script, "isNotSame" ); + addParam( list, script, "simple" ); + addParam( list, script, "callSuperMethod" ); + //TODO addParam( list, script, "callVirtualMethod" ); + addParam( list, script, "useGlobalObject" ); + addParam( list, script, "multipleAssign" ); + } + rule.setTestParameters( list ); + return list; + } + + @Test + public void test() { + assumeTrue( getScriptEngine() != ScriptEngine.Wat2Wasm ); // fixed in next WABT version https://github.com/WebAssembly/wabt/issues/1160 + super.test(); + } + + static class TestClass { + + @Export + static boolean isNull() { + Object val = null; + return val == null; + } + + @Export + static boolean isNotNull() { + Object val = null; + return val != null; + } + + @Export + static boolean isSame() { + Object val1 = null; + Object val2 = null; + return val1 == val2; + } + + @Export + static boolean isNotSame() { + Object val1 = null; + Object val2 = null; + return val1 != val2; + } + + @Export + static int simple() { + Abc val = new Abc2(); + val.a = 63; + return val.a; + } + + /** + * Call a method that is declared in the super class of the instance + */ + @Export + static int callSuperMethod() { + Abc2 val = new Abc2(); + val.foo(); + return val.a; + } + @Import( js = "(i) => {console.log('log ' + i)}" ) + public static void print(int i) { + } + + /** + * Call an overridden method + */ + @Export + static int callVirtualMethod() { + Abc val = new Abc2(); + val.bar(); + return val.a; + } + + /** + * Access a object in a global/static variable. + */ + static Abc2 valGlobal; + @Export + static int useGlobalObject() { + valGlobal = new Abc2(); + valGlobal.foo(); + return valGlobal.a; + } + + /** + * Assign multiple with a field. There are complex stack operation + */ + @Export + static int multipleAssign() { + Abc2 val = new Abc2(); + for( int i = 0; i < 1_000; i++ ) { + val.a = 42; + // TODO + //val = val.abc = new Abc2(); + } + return val.a; + } + } + + static class Abc { + int a; + + long b; + + final void foo() { + a = 1; + } + + void bar() { + a = 2; + } + } + + static class Abc2 extends Abc { + Abc2 abc; + + void bar() { + a = 3; + } + } +}