| Index: tests/isolate/src/APIv2_unresolvedPortsTest.dart
|
| diff --git a/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart b/tests/isolate/src/APIv2_unresolvedPortsTest.dart
|
| similarity index 78%
|
| rename from tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
|
| rename to tests/isolate/src/APIv2_unresolvedPortsTest.dart
|
| index 88074e5cd1bec9efd73fd98dd6130b8a164da48f..76bf2a603ac584b23238d95050e2437e033c3983 100644
|
| --- a/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
|
| +++ b/tests/isolate/src/APIv2_unresolvedPortsTest.dart
|
| @@ -4,13 +4,15 @@
|
|
|
| // spawns multiple isolates and sends unresolved ports between them.
|
| #library('unresolved_ports');
|
| -#import('dart:dom'); // import added so test.dart can treat this as a webtest.
|
| #import('dart:isolate');
|
| #import('../../../lib/unittest/unittest.dart');
|
| -#import('../../../lib/unittest/dom_config.dart');
|
|
|
| -// This is similar to APIv2_unresolvedPortsStandaloneTest but using
|
| -// 'unittest.dart' so it can run to completion in browsers.
|
| +// This test does the following:
|
| +// - main spawns two isolates: 'tim' and 'beth'
|
| +// - 'tim' spawns an isolate: 'bob'
|
| +// - main starts a message chain:
|
| +// main -> beth -> tim -> bob -> main
|
| +// by giving 'beth' a send-port to 'tim'.
|
|
|
| bethIsolate() {
|
| port.receive((msg, reply) => msg[1].send(
|
| @@ -29,17 +31,15 @@ bobIsolate() {
|
| }
|
|
|
| main() {
|
| - useDomConfiguration();
|
| - asyncTest('Message chain with unresolved ports', 1, () {
|
| + test('Message chain with unresolved ports', () {
|
| ReceivePort port = new ReceivePort();
|
| - port.receive((msg, _) {
|
| + port.receive(expectAsync2((msg, _) {
|
| expect(msg).equals('main says: Beth, find out if Tim is coming.'
|
| + '\nBeth says: Tim are you coming? And Bob?'
|
| + '\nTim says: Can you tell "main" that we are all coming?'
|
| + '\nBob says: we are all coming!');
|
| port.close();
|
| - callbackDone();
|
| - });
|
| + }));
|
|
|
| SendPort tim = spawnFunction(timIsolate);
|
| SendPort beth = spawnFunction(bethIsolate);
|
|
|