eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-09 00:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix passing of some DukeScript tests

Browse Source
This commit is contained in:
konsoletyper 2014-10-04 17:54:56 +04:00
parent 3a475d8726
commit 71343b910e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
teavm-core/src/main/java/org/teavm/tooling/TeaVMTestTool.java
View File

@ -370,7 +370,7 @@ public class TeaVMTestTool {
innerWriter.append("\n"); innerWriter.append("\n");
innerWriter.append("\nJUnitClient.run();"); innerWriter.append("\nJUnitClient.run();");
if (sourceMapsGenerated) { if (sourceMapsGenerated) {
String sourceMapsFileName = targetName + ".map"; String sourceMapsFileName = targetName.substring(targetName.lastIndexOf('/') + 1) + ".map";
innerWriter.append("\n//# sourceMappingURL=").append(sourceMapsFileName); innerWriter.append("\n//# sourceMappingURL=").append(sourceMapsFileName);
} }
} else { } else {

1
teavm-html4j/pom.xml
View File

@ -100,6 +100,7 @@
</transformers> </transformers>
<debugInformationGenerated>true</debugInformationGenerated> <debugInformationGenerated>true</debugInformationGenerated>
<sourceMapsGenerated>true</sourceMapsGenerated> <sourceMapsGenerated>true</sourceMapsGenerated>
<sourceFilesCopied>true</sourceFilesCopied>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

4
teavm-html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java
View File

@ -164,10 +164,12 @@ public final class KnockoutFXTest extends KnockoutTCK implements Transfer {
@Override @Override
public void loadJSON(JSONCall call) { public void loadJSON(JSONCall call) {
if (call.isJSONP()) {
throw new IllegalArgumentException("This mock does not support JSONP calls");
}
String url = call.composeURL(null); String url = call.composeURL(null);
String data = urlMap.get(url); String data = urlMap.get(url);
if (data != null) { if (data != null) {
data = "[" + data + "]";
try { try {
call.notifySuccess(toJSON(new ByteArrayInputStream(data.getBytes()))); call.notifySuccess(toJSON(new ByteArrayInputStream(data.getBytes())));
} catch (IOException e) { } catch (IOException e) {