backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

use fix test script names

Browse Source
This commit is contained in:
Volker Berlin 2020-06-14 15:37:11 +02:00
parent 9af8e21ccf
commit adcc60ee07
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/de/inetsoftware/jwebassembly/WasmRule.java
View File

@ -280,7 +280,8 @@ public class WasmRule extends TemporaryFolder {
File scriptFile = scriptFiles.get( script ); File scriptFile = scriptFiles.get( script );
if( scriptFile == null ) { if( scriptFile == null ) {
compile( script ); compile( script );
scriptFile = createScript( "nodetest.js", "{test}", script.name() ); scriptFile = createScript( script, "nodetest.js", "{test}", script.name() );
scriptFiles.put( script, scriptFile );
} }
return scriptFile; return scriptFile;
} }
@ -298,7 +299,8 @@ public class WasmRule extends TemporaryFolder {
File scriptFile = scriptFiles.get( script ); File scriptFile = scriptFiles.get( script );
if( scriptFile == null ) { if( scriptFile == null ) {
compile( script ); compile( script );
scriptFile = createScript( "WatTest.js", "{test}", script.name() ); scriptFile = createScript( script, "WatTest.js", "{test}", script.name() );
scriptFiles.put( script, scriptFile );
if( !npmWabtNightly ) { if( !npmWabtNightly ) {
npmWabtNightly = true; npmWabtNightly = true;
@ -357,7 +359,7 @@ public class WasmRule extends TemporaryFolder {
execute( processBuilder ); execute( processBuilder );
// create the node script // create the node script
scriptFile = createScript( "nodetest.js", "{test}", script.name() ); scriptFile = createScript( script, "nodetest.js", "{test}", script.name() );
} }
return scriptFile; return scriptFile;
} }
@ -385,6 +387,8 @@ public class WasmRule extends TemporaryFolder {
/** /**
* Load a script resource, patch it and save it * Load a script resource, patch it and save it
* *
* @param script
* the script engine
* @param name * @param name
* the template resource name * the template resource name
* @param placeholder * @param placeholder
@ -395,13 +399,13 @@ public class WasmRule extends TemporaryFolder {
* @throws IOException * @throws IOException
* if any IO error occur * if any IO error occur
*/ */
private File createScript( String name, String placeholder, String value ) throws IOException { private File createScript( ScriptEngine script, String name, String placeholder, String value ) throws IOException {
File file = File.createTempFile( "wasm", name, getRoot() ); File file = newFile( script.name() + "Test.js" );
URL scriptUrl = getClass().getResource( name ); URL scriptUrl = getClass().getResource( name );
String script = readStream( scriptUrl.openStream() ); String template = readStream( scriptUrl.openStream() );
script = script.replace( placeholder, value ); template = template.replace( placeholder, value );
try (FileOutputStream scriptStream = new FileOutputStream( file )) { try (FileOutputStream scriptStream = new FileOutputStream( file )) {
scriptStream.write( script.getBytes( StandardCharsets.UTF_8 ) ); scriptStream.write( template.getBytes( StandardCharsets.UTF_8 ) );
} }
return file; return file;
} }
@ -628,15 +632,15 @@ public class WasmRule extends TemporaryFolder {
File file = compile( script ); File file = compile( script );
if( gc ) { if( gc ) {
if( binary ) { if( binary ) {
scriptFile = createScript( "SpiderMonkeyTest.js", "{test.wasm}", file.getName() ); scriptFile = createScript( script, "SpiderMonkeyTest.js", "{test.wasm}", file.getName() );
} else { } else {
scriptFile = createScript( "SpiderMonkeyWatTest.js", "{test}", script.name() ); scriptFile = createScript( script, "SpiderMonkeyWatTest.js", "{test}", script.name() );
} }
} else { } else {
if( binary ) { if( binary ) {
scriptFile = createScript( "SpiderMonkeyTest.js", "{test.wasm}", file.getName() ); scriptFile = createScript( script, "SpiderMonkeyTest.js", "{test.wasm}", file.getName() );
} else { } else {
scriptFile = createScript( "SpiderMonkeyWatTest.js", "{test}", script.name() ); scriptFile = createScript( script, "SpiderMonkeyWatTest.js", "{test}", script.name() );
} }
} }
scriptFiles.put( script, scriptFile ); scriptFiles.put( script, scriptFile );