| 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 e1bddef2434b9bab8d4d8973ea0e96307de02441..5943fef7512c41090fb3cf1c9e92c6f2e385752f 100644
|
| --- a/mojo/dart/test/bindings_generation_test.dart
|
| +++ b/mojo/dart/test/bindings_generation_test.dart
|
| @@ -9,17 +9,17 @@ import 'mojo:bindings' as bindings;
|
| import 'mojo:core' as core;
|
|
|
| import 'package:mojo/dart/testing/expect.dart';
|
| -import 'package:mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.dart' as sample;
|
| -import 'package:mojo/public/interfaces/bindings/tests/test_structs.mojom.dart' as structs;
|
| +import 'package:mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.dart'
|
| + as sample;
|
| +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 implements sample.Provider {
|
| sample.ProviderStub _stub;
|
|
|
| ProviderImpl(core.MojoMessagePipeEndpoint endpoint) {
|
| - _stub = new sample.ProviderStub.fromEndpoint(endpoint)
|
| - ..delegate = this
|
| - ..listen();
|
| + _stub = new sample.ProviderStub.fromEndpoint(endpoint, impl: this);
|
| }
|
|
|
| echoString(String a, Function responseFactory) =>
|
| @@ -69,8 +69,7 @@ Future testAwaitCallResponse() async {
|
| var echoStringResponse = await client.ptr.echoString("hello!");
|
| Expect.equals("hello!", echoStringResponse.a);
|
|
|
| - var echoStringsResponse =
|
| - await client.ptr.echoStrings("hello", "mojo!");
|
| + var echoStringsResponse = await client.ptr.echoStrings("hello", "mojo!");
|
| Expect.equals("hello", echoStringsResponse.a);
|
| Expect.equals("mojo!", echoStringsResponse.b);
|
|
|
| @@ -79,18 +78,18 @@ Future testAwaitCallResponse() async {
|
|
|
|
|
| bindings.ServiceMessage messageOfStruct(bindings.Struct s) =>
|
| - s.serializeWithHeader(new bindings.MessageHeader(0));
|
| + s.serializeWithHeader(new bindings.MessageHeader(0));
|
|
|
|
|
| testSerializeNamedRegion() {
|
| var r = new rect.Rect()
|
| - ..x = 1
|
| - ..y = 2
|
| - ..width = 3
|
| - ..height = 4;
|
| + ..x = 1
|
| + ..y = 2
|
| + ..width = 3
|
| + ..height = 4;
|
| var namedRegion = new structs.NamedRegion()
|
| - ..name = "name"
|
| - ..rects = [r];
|
| + ..name = "name"
|
| + ..rects = [r];
|
| var message = messageOfStruct(namedRegion);
|
| var namedRegion2 = structs.NamedRegion.deserialize(message.payload);
|
| Expect.equals(namedRegion.name, namedRegion2.name);
|
| @@ -99,12 +98,12 @@ testSerializeNamedRegion() {
|
|
|
| testSerializeArrayValueTypes() {
|
| var arrayValues = new structs.ArrayValueTypes()
|
| - ..f0 = [0, 1, -1, 0x7f, -0x10]
|
| - ..f1 = [0, 1, -1, 0x7fff, -0x1000]
|
| - ..f2 = [0, 1, -1, 0x7fffffff, -0x10000000]
|
| - ..f3 = [0, 1, -1, 0x7fffffffffffffff, -0x1000000000000000]
|
| - ..f4 = [0.0, 1.0, -1.0, 4.0e9, -4.0e9]
|
| - ..f5 = [0.0, 1.0, -1.0, 4.0e9, -4.0e9];
|
| + ..f0 = [0, 1, -1, 0x7f, -0x10]
|
| + ..f1 = [0, 1, -1, 0x7fff, -0x1000]
|
| + ..f2 = [0, 1, -1, 0x7fffffff, -0x10000000]
|
| + ..f3 = [0, 1, -1, 0x7fffffffffffffff, -0x1000000000000000]
|
| + ..f4 = [0.0, 1.0, -1.0, 4.0e9, -4.0e9]
|
| + ..f5 = [0.0, 1.0, -1.0, 4.0e9, -4.0e9];
|
| var message = messageOfStruct(arrayValues);
|
| var arrayValues2 = structs.ArrayValueTypes.deserialize(message.payload);
|
| Expect.listEquals(arrayValues.f0, arrayValues2.f0);
|
|
|