Index: mojo/dart/test/bindings_generation_test.dart |
diff --git a/mojo/dart/test/bindings_generation_test.dart b/mojo/dart/test/bindings_generation_test.dart |
index 076b6992f704b5bca1947af118e751734bbbe2db..b367750283e48d1ffd5b5644d5374dfaba1678ac 100644 |
--- a/mojo/dart/test/bindings_generation_test.dart |
+++ b/mojo/dart/test/bindings_generation_test.dart |
@@ -13,9 +13,13 @@ import 'package:mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.da |
import 'package:mojo/public/interfaces/bindings/tests/test_structs.mojom.dart' as structs; |
import 'package:mojo/public/interfaces/bindings/tests/rect.mojom.dart' as rect; |
-class ProviderImpl extends sample.Provider { |
- ProviderImpl(core.MojoMessagePipeEndpoint endpoint) : super(endpoint) { |
- super.delegate = this; |
+class ProviderImpl implements sample.Provider { |
+ sample.ProviderStub _stub; |
+ |
+ ProviderImpl(core.MojoMessagePipeEndpoint endpoint) { |
+ _stub = new sample.ProviderStub.fromEndpoint(endpoint) |
+ ..delegate = this |
+ ..listen(); |
} |
echoString(String a, Function responseFactory) => |
@@ -33,14 +37,13 @@ class ProviderImpl extends sample.Provider { |
void providerIsolate(core.MojoMessagePipeEndpoint endpoint) { |
- var provider = new ProviderImpl(endpoint); |
- provider.listen(); |
+ new ProviderImpl(endpoint); |
} |
Future<bool> testCallResponse() { |
var pipe = new core.MojoMessagePipe(); |
- var client = new sample.ProviderProxy(pipe.endpoints[0]); |
+ var client = new sample.ProviderProxy.fromEndpoint(pipe.endpoints[0]); |
var c = new Completer(); |
Isolate.spawn(providerIsolate, pipe.endpoints[1]).then((_) { |
client.echoString("hello!").then((echoStringResponse) { |
@@ -49,7 +52,7 @@ Future<bool> testCallResponse() { |
client.echoStrings("hello", "mojo!").then((echoStringsResponse) { |
Expect.equals("hello", echoStringsResponse.a); |
Expect.equals("mojo!", echoStringsResponse.b); |
- client.close(); |
+ sample.ProviderProxyClose(client); |
c.complete(true); |
}); |
}); |
@@ -60,7 +63,7 @@ Future<bool> testCallResponse() { |
Future testAwaitCallResponse() async { |
var pipe = new core.MojoMessagePipe(); |
- var client = new sample.ProviderProxy(pipe.endpoints[0]); |
+ var client = new sample.ProviderProxy.fromEndpoint(pipe.endpoints[0]); |
var isolate = await Isolate.spawn(providerIsolate, pipe.endpoints[1]); |
var echoStringResponse = await client.echoString("hello!"); |
@@ -70,7 +73,7 @@ Future testAwaitCallResponse() async { |
Expect.equals("hello", echoStringsResponse.a); |
Expect.equals("mojo!", echoStringsResponse.b); |
- client.close(); |
+ sample.ProviderProxyClose(client); |
} |