mirror of
https://github.com/i-net-software/JWebAssembly.git
synced 2025-03-25 15:37:52 +01:00
Tests for Java 11 and Actions for Java 11
This commit is contained in:
parent
9c057261d8
commit
c5fcc2d561
@ -14,7 +14,14 @@
|
|||||||
<attribute name="test" value="true"/>
|
<attribute name="test" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
|
<classpathentry kind="src" output="bin/test" path="test11">
|
||||||
|
<attributes>
|
||||||
|
<attribute name="gradle_scope" value="test"/>
|
||||||
|
<attribute name="gradle_used_by_scope" value="test"/>
|
||||||
|
<attribute name="test" value="true"/>
|
||||||
|
</attributes>
|
||||||
|
</classpathentry>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
|
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
|
||||||
<classpathentry kind="output" path="bin/default"/>
|
<classpathentry kind="output" path="bin/default"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
17
.github/workflows/build11.yml
vendored
Normal file
17
.github/workflows/build11.yml
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
name: Build with Java 11
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- name: Set up JDK 11
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
java-version: '11'
|
||||||
|
distribution: 'temurin'
|
||||||
|
- name: Build with Gradle
|
||||||
|
run: gradle build --stacktrace
|
@ -1,4 +1,4 @@
|
|||||||
name: build
|
name: Build with Java 8
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
@ -12,6 +12,6 @@ jobs:
|
|||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: '8'
|
java-version: '8'
|
||||||
distribution: 'adopt'
|
distribution: 'temurin'
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
run: gradle build --stacktrace
|
run: gradle build --stacktrace
|
@ -5,7 +5,12 @@ plugins {
|
|||||||
id 'com.github.kt3k.coveralls' version '2.11.0' // Coverage
|
id 'com.github.kt3k.coveralls' version '2.11.0' // Coverage
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def majorJavaVersion = JavaVersion.current().getMajorVersion() as int
|
||||||
|
if( majorJavaVersion < 11 ) {
|
||||||
sourceCompatibility = 1.8
|
sourceCompatibility = 1.8
|
||||||
|
} else {
|
||||||
|
sourceCompatibility = 11
|
||||||
|
}
|
||||||
|
|
||||||
group 'de.inetsoftware'
|
group 'de.inetsoftware'
|
||||||
archivesBaseName = 'jwebassembly-compiler'
|
archivesBaseName = 'jwebassembly-compiler'
|
||||||
@ -43,6 +48,9 @@ sourceSets {
|
|||||||
test {
|
test {
|
||||||
java {
|
java {
|
||||||
srcDir 'test'
|
srcDir 'test'
|
||||||
|
if( majorJavaVersion >= 11 ) {
|
||||||
|
srcDir 'test11'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
resources {
|
resources {
|
||||||
srcDir 'test'
|
srcDir 'test'
|
||||||
|
@ -0,0 +1,83 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2023 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 java.lang.invoke.MethodHandles;
|
||||||
|
import java.lang.invoke.VarHandle;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import org.junit.ClassRule;
|
||||||
|
import org.junit.runners.Parameterized.Parameters;
|
||||||
|
|
||||||
|
import de.inetsoftware.jwebassembly.JWebAssembly;
|
||||||
|
import de.inetsoftware.jwebassembly.ScriptEngine;
|
||||||
|
import de.inetsoftware.jwebassembly.WasmRule;
|
||||||
|
import de.inetsoftware.jwebassembly.api.annotation.Export;
|
||||||
|
import de.inetsoftware.jwebassembly.web.DOMString;
|
||||||
|
import de.inetsoftware.jwebassembly.web.JSObject;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Volker Berlin
|
||||||
|
*/
|
||||||
|
public class VarHandleTest extends AbstractBaseTest {
|
||||||
|
|
||||||
|
@ClassRule
|
||||||
|
public static WasmRule rule = new WasmRule( TestClass.class );
|
||||||
|
|
||||||
|
public VarHandleTest( ScriptEngine script, String method, Object[] params ) {
|
||||||
|
super( rule, script, method, params );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Parameters( name = "{0}-{1}" )
|
||||||
|
public static Collection<Object[]> data() {
|
||||||
|
ArrayList<Object[]> list = new ArrayList<>();
|
||||||
|
for( ScriptEngine script : ScriptEngine.testEngines() ) {
|
||||||
|
addParam( list, script, "set" );
|
||||||
|
}
|
||||||
|
rule.setTestParameters( list );
|
||||||
|
JWebAssembly.LOGGER.setLevel( Level.FINE );
|
||||||
|
rule.setProperty( JWebAssembly.IGNORE_NATIVE, "true" );
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
static class TestClass {
|
||||||
|
|
||||||
|
private static final VarHandle STR;
|
||||||
|
static {
|
||||||
|
try {
|
||||||
|
MethodHandles.Lookup l = MethodHandles.lookup();
|
||||||
|
STR = l.findVarHandle(TestData.class, "str", String.class);
|
||||||
|
} catch (ReflectiveOperationException e) {
|
||||||
|
throw new ExceptionInInitializerError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Export
|
||||||
|
static DOMString set() {
|
||||||
|
TestData data = new TestData();
|
||||||
|
STR.set( data, "abc" );
|
||||||
|
return JSObject.domString( data.str );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static class TestData {
|
||||||
|
String str;
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user