eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 00:24:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

The $ substitution should happen when processing the URL. When text/plain MIME type is requested, return plain String, not a JSON object.

Browse Source
This commit is contained in:
Jaroslav Tulach 2015-09-06 10:42:10 +02:00
parent b4ba3719d0
commit d06ca2d2a2
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ public final class KnockoutFXTest extends KnockoutTCK implements Transfer {
private static Class<?> browserClass; private static Class<?> browserClass;
private static Fn.Presenter browserContext; private static Fn.Presenter browserContext;
private KO4J ko4j = new KO4J(); private KO4J ko4j = new KO4J();
private Map<String, String> urlMap = new HashMap<>(); private final Map<String, Request> urlMap = new HashMap<>();
public KnockoutFXTest() { public KnockoutFXTest() {
} }
@ -112,7 +112,7 @@ public final class KnockoutFXTest extends KnockoutTCK implements Transfer {
public URI prepareURL(String content, String mimeType, String[] parameters) { public URI prepareURL(String content, String mimeType, String[] parameters) {
try { try {
String url = "http://localhost/dynamic/" + urlMap.size(); String url = "http://localhost/dynamic/" + urlMap.size();
urlMap.put(url, content); urlMap.put(url, new Request(content, mimeType, parameters));
return new URI(url); return new URI(url);
} catch (URISyntaxException ex) { } catch (URISyntaxException ex) {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);
@ -140,10 +140,30 @@ public final class KnockoutFXTest extends KnockoutTCK implements Transfer {
throw new IllegalArgumentException("This mock does not support JSONP calls"); 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); Request data = urlMap.get(url);
if (data != null) { if (data != null) {
String content = data.content;
for (int i = 0;; i++) {
String find = "$" + i;
int at = content.indexOf(find);
if (at == -1) {
break;
}
String value = data.parameters[i];
if (value.equals("http.method")) {
value = call.getMethod();
}
if (value.equals("http.requestBody")) {
value = call.getMessage();
}
content = content.substring(0, at) + value + content.substring(at + find.length());
}
try { try {
call.notifySuccess(toJSON(new ByteArrayInputStream(data.getBytes()))); if (data.mimeType.equals("text/plain")) {
call.notifySuccess(content);
} else {
call.notifySuccess(toJSON(new ByteArrayInputStream(content.getBytes())));
}
} catch (IOException e) { } catch (IOException e) {
call.notifyError(e); call.notifyError(e);
} }
@ -151,4 +171,16 @@ public final class KnockoutFXTest extends KnockoutTCK implements Transfer {
call.notifyError(new IllegalStateException()); call.notifyError(new IllegalStateException());
} }
} }
private static final class Request {
final String content;
final String mimeType;
final String[] parameters;
public Request(String content, String mimeType, String[] parameters) {
this.content = content;
this.mimeType = mimeType;
this.parameters = parameters;
}
}
} }