firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Sky Mojo embedder singleton, restored network test

Browse Source 
Currently the embedder is just an encapsulation of the Mojo shell. Exposing an ApplicationConnection that encapsulates the ViewManager Embed SPs is next.

R=abarth@chromium.org, zra@google.com

Review URL: https://codereview.chromium.org/948463003
This commit is contained in:
Hans Muller 2015-02-20 15:07:29 -08:00
parent 914fb9ce76
commit db37e4280b
4 changed files with 45 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/src/flutter/tests/TestExpectations
View File

@ -42,4 +42,3 @@ crbug.com/2 modules/script-import.sky [ Skip ]
crbug.com/2 parser/script.sky [ Skip ] crbug.com/2 parser/script.sky [ Skip ]
crbug.com/2 services/iframe-embed-vmc.sky [ Skip ] crbug.com/2 services/iframe-embed-vmc.sky [ Skip ]
crbug.com/2 services/iframe-service-provider.sky [ Skip ] crbug.com/2 services/iframe-service-provider.sky [ Skip ]
crbug.com/2 services/network.sky [ Skip ]

4
engine/src/flutter/tests/services/event-sender.sky
View File

@ -3,7 +3,7 @@
<script> <script>
import "../resources/third_party/unittest/unittest.dart"; import "../resources/third_party/unittest/unittest.dart";
import "../resources/unit.dart"; import "../resources/unit.dart";
import "/sky/framework/shell.dart" as shell; import "/sky/framework/embedder.dart";
import "dart:sky"; import "dart:sky";
import "package:mojo/services/input_events/public/interfaces/input_event_constants.mojom.dart" as constants; import "package:mojo/services/input_events/public/interfaces/input_event_constants.mojom.dart" as constants;
import "package:mojo/services/input_events/public/interfaces/input_events.mojom.dart" as events; import "package:mojo/services/input_events/public/interfaces/input_events.mojom.dart" as events;
@ -20,7 +20,7 @@ void main() {
})); }));
var testHarness = new harness.TestHarnessProxy.unbound(); var testHarness = new harness.TestHarnessProxy.unbound();
shell.connectToService("mojo:sky_tester", testHarness); embedder.connectToService("mojo:sky_tester", testHarness);
var keyData = new events.KeyData(); var keyData = new events.KeyData();
keyData.windowsKeyCode = 0x41; keyData.windowsKeyCode = 0x41;
keyData.text = 0x41; keyData.text = 0x41;

15
engine/src/flutter/tests/services/network-expected.txt
View File

@ -1,9 +1,6 @@
CONSOLE: LOG: url => http://127.0.0.1:8000/sky/tests/services/resources/pass.txt CONSOLE: url => http://127.0.0.1:8000/sky/tests/services/resources/pass.txt
CONSOLE: LOG: status_line => HTTP/1.1 200 OK CONSOLE: status_line => HTTP/1.1 200 OK
CONSOLE: LOG: mime_type => text/plain CONSOLE: mime_type => text/plain
CONSOLE: LOG: read 31 bytes CONSOLE: read 31 bytes
Running 1 tests This is data from the network.
ok 1 Mojo network_service should be able to fetch text files
1 tests
1 pass
0 fail

90
engine/src/flutter/tests/services/network.sky
View File

@ -1,62 +1,46 @@
<html> #!mojo mojo:sky_viewer
<import src="../resources/chai.sky" /> <sky>
<import src="../resources/mocha.sky" />
<import src="/gen/mojo/public/interfaces/application/shell.mojom.sky" as="shellMojom" />
<import src="/gen/mojo/public/sky/connection.sky" as="connection" />
<import src="/gen/mojo/public/sky/core.sky" as="core" />
<import src="/gen/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
<import src="/gen/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
<import src="/gen/mojo/services/public/sky/shell.sky" as="shell" />
<script> <script>
const Shell = shell.Shell; import '/sky/framework/embedder.dart';
import 'dart:async';
import 'dart:mojo_bindings';
import 'dart:mojo_core';
import 'dart:typed_data';
import "dart:sky.internals" as internals;
describe('Mojo network_service', function() { import 'package:mojo/services/network/public/interfaces/network_service.mojom.dart';
this.enableTimeouts(false); import 'package:mojo/services/network/public/interfaces/url_loader.mojom.dart';
it('should be able to fetch text files', function(done) { Future<String> run(url) async {
var shellHandle = internals.takeShellProxyHandle(); var networkService = new NetworkServiceProxy.unbound();
var shellProxy = connection.bindHandleToProxy(shellHandle, shellMojom.Shell); embedder.connectToService("mojo:network_service", networkService);
var shell = new Shell(shellProxy);
var netService = shell.connectToService(
"mojo:network_service", net.NetworkService);
var urlLoader; var urlLoaderProxy = new UrlLoaderProxy.unbound();
netService.createURLLoader(function(urlLoaderProxy) { networkService.createUrlLoader(urlLoaderProxy);
urlLoader = urlLoaderProxy;
});
var urlRequest = new loader.URLRequest(); var urlRequest = new UrlRequest()
urlRequest.url = "http://127.0.0.1:8000/sky/tests/services/resources/pass.txt"; ..url = url
urlRequest.method = "GET"; ..autoFollowRedirects = true;
urlRequest.auto_follow_redirects = true; var urlResponse = await urlLoaderProxy.start(urlRequest);
var urlRequestPromise = urlLoader.start(urlRequest); urlLoaderProxy.close();
urlRequestPromise.then(function(result) { networkService.close();
if (result.response.error) {
assert.ok(false, "network request failed " + result.response.error.code + " " print("url => ${urlResponse.response.url}");
+ result.response.error.description); print("status_line => ${urlResponse.response.statusLine}");
done(); print("mime_type => ${urlResponse.response.mimeType}");
ByteData bodyData =
await DataPipeDrainer.drainHandle(urlResponse.response.body);
print("read ${bodyData.lengthInBytes} bytes");
return new String.fromCharCodes(new Uint8List.view(bodyData.buffer));
} }
console.log("url => " + result.response["url"]);
console.log("status_line => " + result.response["status_line"]);
console.log("mime_type => " + result.response["mime_type"]);
var start = Date.now(); main() async {
while (Date.now() - start < 3) {} var url = "http://127.0.0.1:8000/sky/tests/services/resources/pass.txt";
var result = await run(url);
var drainDataPromise = core.drainData(result.response.body); internals.notifyTestComplete(result);
drainDataPromise.then(function(result) { }
console.log("read " + result.buffer.byteLength + " bytes");
done();
}).catch(function() {
assert.ok(false, "core.drainData failed");
done();
});
}).catch(function() {
assert.ok(false, "start failed");
done();
});
});
});
</script> </script>
</html> </sky>