Index: mojo/dart/apptests/dart_apptests/lib/src/echo_apptests.dart |
diff --git a/mojo/dart/apptests/dart_apptests/lib/src/echo_apptests.dart b/mojo/dart/apptests/dart_apptests/lib/src/echo_apptests.dart |
index 6937ed0925f9a896720cef7c98c0bcbe5055197c..65b5a8b683a5415f20bab6cd37c4ed960549e811 100644 |
--- a/mojo/dart/apptests/dart_apptests/lib/src/echo_apptests.dart |
+++ b/mojo/dart/apptests/dart_apptests/lib/src/echo_apptests.dart |
@@ -15,67 +15,62 @@ import 'package:_mojo_for_test_only/test/echo_service.mojom.dart'; |
echoApptests(Application application, String url) { |
group('Echo Service Apptests', () { |
test('String', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var v = await echoProxy.echoString("foo"); |
+ var v = await echo.echoString("foo"); |
expect(v.value, equals("foo")); |
- var q = await echoProxy.echoString("quit"); |
+ var q = await echo.echoString("quit"); |
expect(q.value, equals("quit")); |
- await echoProxy.close(); |
+ await echo.close(); |
}); |
test('Empty String', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var v = await echoProxy.echoString(""); |
+ var v = await echo.echoString(""); |
expect(v.value, equals("")); |
- var q = await echoProxy.echoString("quit"); |
+ var q = await echo.echoString("quit"); |
expect(q.value, equals("quit")); |
- await echoProxy.close(); |
+ await echo.close(); |
}); |
test('Null String', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var v = await echoProxy.echoString(null); |
+ var v = await echo.echoString(null); |
expect(v.value, equals(null)); |
- var q = await echoProxy.echoString("quit"); |
+ var q = await echo.echoString("quit"); |
expect(q.value, equals("quit")); |
- await echoProxy.close(); |
+ await echo.close(); |
}); |
test('Delayed Success', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
var milliseconds = 100; |
var watch = new Stopwatch()..start(); |
- var v = await echoProxy.delayedEchoString("foo", milliseconds); |
+ var v = await echo.delayedEchoString("foo", milliseconds); |
var elapsed = watch.elapsedMilliseconds; |
expect(v.value, equals("foo")); |
expect(elapsed, greaterThanOrEqualTo(milliseconds)); |
- var q = await echoProxy.echoString("quit"); |
+ var q = await echo.echoString("quit"); |
expect(q.value, equals("quit")); |
- await echoProxy.close(); |
+ await echo.close(); |
}); |
test('Delayed Close', () { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
var milliseconds = 100; |
- echoProxy.responseOrError(echoProxy.delayedEchoString( |
+ echo.responseOrError(echo.delayedEchoString( |
"quit", milliseconds)).then((result) { |
fail('This future should not complete.'); |
}, onError: (e) { |
@@ -83,107 +78,99 @@ echoApptests(Application application, String url) { |
}); |
return new Future.delayed( |
- new Duration(milliseconds: 10), () => echoProxy.close()); |
+ new Duration(milliseconds: 10), () => echo.close()); |
}); |
test('Swap', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
for (int i = 0; i < 10; i++) { |
- var v = |
- await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ var v = await echo.responseOrError(echo.echoString("foo")); |
expect(v.value, equals("foo")); |
} |
- echoProxy.ctrl.errorFuture.then((e) { |
- fail("echoProxy: $e"); |
+ echo.ctrl.errorFuture.then((e) { |
+ fail("echo: $e"); |
}); |
// Trigger an implementation swap in the echo server. |
- echoProxy.swap(); |
+ echo.swap(); |
- expect(echoProxy.ctrl.isBound, isTrue); |
+ expect(echo.ctrl.isBound, isTrue); |
for (int i = 0; i < 10; i++) { |
- var v = |
- await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ var v = await echo.responseOrError(echo.echoString("foo")); |
expect(v.value, equals("foo")); |
} |
- var q = await echoProxy.responseOrError(echoProxy.echoString("quit")); |
+ var q = await echo.responseOrError(echo.echoString("quit")); |
expect(q.value, equals("quit")); |
- await echoProxy.close(); |
+ await echo.close(); |
}); |
test('Multiple Error Checks Success', () { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
List<Future> futures = []; |
for (int i = 0; i < 100; i++) { |
- var f = echoProxy.responseOrError(echoProxy.echoString("foo")) |
- .then((r) { |
+ var f = echo.responseOrError(echo.echoString("foo")).then((r) { |
expect(r.value, equals("foo")); |
}, onError: (e) { |
fail('There should be no errors'); |
}); |
futures.add(f); |
} |
- return Future.wait(futures).whenComplete(() => echoProxy.close()); |
+ return Future.wait(futures).whenComplete(() => echo.close()); |
}); |
test('Multiple Error Checks Fail', () { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
List<Future> futures = []; |
var milliseconds = 100; |
for (int i = 0; i < 100; i++) { |
- var f = echoProxy.responseOrError( |
- echoProxy.delayedEchoString("foo", milliseconds)).then((_) { |
+ var f = echo.responseOrError( |
+ echo.delayedEchoString("foo", milliseconds)).then((_) { |
fail('This call should fail'); |
}, onError: (e) { |
expect(e is ProxyError, isTrue); |
}); |
futures.add(f); |
} |
- return echoProxy.close().then((_) => Future.wait(futures)); |
+ return echo.close().then((_) => Future.wait(futures)); |
}); |
test('Uncaught Call Closed', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
// Do a normal call. |
- var v = await echoProxy.echoString("foo"); |
+ var v = await echo.echoString("foo"); |
expect(v.value, equals("foo")); |
// Close the proxy. |
- await echoProxy.close(); |
+ await echo.close(); |
// Try to do another call, which should not return. |
- echoProxy.echoString("foo").then((_) { |
+ echo.echoString("foo").then((_) { |
fail('This should be unreachable'); |
}); |
}); |
test('Catch Call Closed', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
// Do a normal call. |
- var v = await echoProxy.echoString("foo"); |
+ var v = await echo.echoString("foo"); |
expect(v.value, equals("foo")); |
// Close the proxy. |
- await echoProxy.close(); |
+ await echo.close(); |
// Try to do another call, which should fail. |
bool caughtException = false; |
try { |
- v = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ v = await echo.responseOrError(echo.echoString("foo")); |
fail('This should be unreachable'); |
} on ProxyError catch (e) { |
caughtException = true; |
@@ -192,20 +179,19 @@ echoApptests(Application application, String url) { |
}); |
test('Catch Call Sequence Closed Twice', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
// Do a normal call. |
- var v = await echoProxy.echoString("foo"); |
+ var v = await echo.echoString("foo"); |
expect(v.value, equals("foo")); |
// Close the proxy. |
- await echoProxy.close(); |
+ await echo.close(); |
// Try to do another call, which should fail. |
bool caughtException = false; |
try { |
- v = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ v = await echo.responseOrError(echo.echoString("foo")); |
fail('This should be unreachable'); |
} on ProxyError catch (e) { |
caughtException = true; |
@@ -215,7 +201,7 @@ echoApptests(Application application, String url) { |
// Make sure we can catch an error more than once. |
caughtException = false; |
try { |
- v = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ v = await echo.responseOrError(echo.echoString("foo")); |
fail('This should be unreachable'); |
} on ProxyError catch (e) { |
caughtException = true; |
@@ -224,26 +210,23 @@ echoApptests(Application application, String url) { |
}); |
test('Catch Call Parallel Closed Twice', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
// Do a normal call. |
- var v = await echoProxy.echoString("foo"); |
+ var v = await echo.echoString("foo"); |
expect(v.value, equals("foo")); |
// Close the proxy. |
- await echoProxy.close(); |
+ await echo.close(); |
// Queue up two calls after the close, and make sure they both fail. |
- var f1 = echoProxy.responseOrError(echoProxy.echoString("foo")) |
- .then((_) { |
+ var f1 = echo.responseOrError(echo.echoString("foo")).then((_) { |
fail('This should be unreachable'); |
}, onError: (e) { |
expect(e is ProxyError, isTrue); |
}); |
- var f2 = echoProxy.responseOrError(echoProxy.echoString("foo")) |
- .then((_) { |
+ var f2 = echo.responseOrError(echo.echoString("foo")).then((_) { |
fail('This should be unreachable'); |
}, onError: (e) { |
expect(e is ProxyError, isTrue); |
@@ -253,41 +236,38 @@ echoApptests(Application application, String url) { |
}); |
test('Unbind, close', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var r = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ var r = await echo.responseOrError(echo.echoString("foo")); |
expect(r.value, equals("foo")); |
- var endpoint = echoProxy.ctrl.unbind(); |
- await echoProxy.close(); |
+ var endpoint = echo.ctrl.unbind(); |
+ await echo.close(); |
endpoint.close(); |
}); |
test('Unbind, rebind to same', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var r = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ var r = await echo.responseOrError(echo.echoString("foo")); |
expect(r.value, equals("foo")); |
- var endpoint = echoProxy.ctrl.unbind(); |
- echoProxy.ctrl.bind(endpoint); |
+ var endpoint = echo.ctrl.unbind(); |
+ echo.ctrl.bind(endpoint); |
- r = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ r = await echo.responseOrError(echo.echoString("foo")); |
expect(r.value, equals("foo")); |
- await echoProxy.close(); |
+ await echo.close(); |
}); |
test('Unbind, rebind to different', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var r = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ var r = await echo.responseOrError(echo.echoString("foo")); |
expect(r.value, equals("foo")); |
- var endpoint = echoProxy.ctrl.unbind(); |
+ var endpoint = echo.ctrl.unbind(); |
var differentEchoProxy = new EchoServiceProxy.fromEndpoint(endpoint); |
r = await differentEchoProxy.responseOrError( |
@@ -298,15 +278,14 @@ echoApptests(Application application, String url) { |
}); |
test('Unbind, rebind to different, close original', () async { |
- var echoProxy = |
- new EchoServiceProxy.connectToService(application, "mojo:dart_echo"); |
+ var echo = EchoService.connectToService(application, "mojo:dart_echo"); |
- var r = await echoProxy.responseOrError(echoProxy.echoString("foo")); |
+ var r = await echo.responseOrError(echo.echoString("foo")); |
expect(r.value, equals("foo")); |
- var endpoint = echoProxy.ctrl.unbind(); |
+ var endpoint = echo.ctrl.unbind(); |
var differentEchoProxy = new EchoServiceProxy.fromEndpoint(endpoint); |
- await echoProxy.close(); |
+ await echo.close(); |
r = await differentEchoProxy.responseOrError( |
differentEchoProxy.echoString("foo")); |