| Index: tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
|
| diff --git a/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart b/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
|
| index 6335f6b5a71a70cb95c8f01413a11169d325016b..3cda3b70c20eb8dd8581546ea80698be7df2e2a8 100644
|
| --- a/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
|
| +++ b/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
|
| @@ -4,48 +4,48 @@
|
|
|
| // 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:dom'); // import added so test.dart can treat this as a webtest.
|
| #import('dart:isolate');
|
| -#import("../../../client/testing/unittest/unittest.dart");
|
| +#import('../../../client/testing/unittest/unittest.dart');
|
|
|
| -// This is similar as SpawnFromCodeAPIv2Test but using 'unittest.dart' so it can
|
| -// run to completion in browsers.
|
| +// This is similar to APIv2_unresolvedPortsStandaloneTest but using
|
| +// 'unittest.dart' so it can run to completion in browsers.
|
|
|
| -bethIsolate(ReceivePort port) {
|
| +bethIsolate() {
|
| port.receive((msg, reply) => msg[1].send(
|
| - "${msg[0]}\nBeth says: Tim are you coming? And Bob?", reply));
|
| + '${msg[0]}\nBeth says: Tim are you coming? And Bob?', reply));
|
| }
|
|
|
| -timIsolate(ReceivePort port) {
|
| - Isolate2 bob = new Isolate2.fromCode(bobIsolate);
|
| - port.receive((msg, reply) => bob.sendPort.send(
|
| - "$msg\nTim says: Can you tell 'main' that we are all coming?", reply));
|
| +timIsolate() {
|
| + SendPort bob = spawnFunction(bobIsolate);
|
| + port.receive((msg, reply) => bob.send(
|
| + '$msg\nTim says: Can you tell "main" that we are all coming?', reply));
|
| }
|
|
|
| -bobIsolate(ReceivePort port) {
|
| +bobIsolate() {
|
| port.receive((msg, reply) => reply.send(
|
| - "$msg\nBob says: we are all coming!"));
|
| + '$msg\nBob says: we are all coming!'));
|
| }
|
|
|
| main() {
|
| - asyncTest("Message chain with unresolved ports", 1, () {
|
| + asyncTest('Message chain with unresolved ports', 1, () {
|
| ReceivePort port = new ReceivePort();
|
| port.receive((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!");
|
| + 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();
|
| });
|
|
|
| - Isolate2 tim = new Isolate2.fromCode(timIsolate);
|
| - Isolate2 beth = new Isolate2.fromCode(bethIsolate);
|
| + SendPort tim = spawnFunction(timIsolate);
|
| + SendPort beth = spawnFunction(bethIsolate);
|
|
|
| - beth.sendPort.send(
|
| + beth.send(
|
| // because tim is created asynchronously, here we are sending an
|
| // unresolved port:
|
| - ["main says: Beth, find out if Tim is coming.", tim.sendPort],
|
| + ['main says: Beth, find out if Tim is coming.', tim],
|
| port.toSendPort());
|
| });
|
| }
|
|
|