mojo/syncbase: Changing OnReturn to OnError since
watch call is long running and does not really return unless
there is an error and therefore OnError is a better name.
Also fixing the tests by escaping $ (which is reserved for
string interpolation in Dart)
MultiPart: 2/2
Change-Id: I55cea05d4973d2f2bfa0dffbea7cd3a624de66e3
diff --git a/dart/lib/src/nosql/database.dart b/dart/lib/src/nosql/database.dart
index fd026d3..6b0fe5b 100644
--- a/dart/lib/src/nosql/database.dart
+++ b/dart/lib/src/nosql/database.dart
@@ -147,8 +147,8 @@
}
// Called by the mojo proxy when the Go function call returns.
- // Watch technically never returns unless there is an error or it is canceled.
- onReturn(mojom.Error err) {
+ // Watch technically never returns unless there is an error.
+ OnError(mojom.Error err) {
if (isError(err)) {
sc.addError(err);
}
diff --git a/dart/test/integration/syncbase_row_test.dart b/dart/test/integration/syncbase_row_test.dart
index f1a1d81..e192e66 100644
--- a/dart/test/integration/syncbase_row_test.dart
+++ b/dart/test/integration/syncbase_row_test.dart
@@ -26,14 +26,14 @@
});
test('putting, getting and deleting row', () async {
- var app = c.app(utils.uniqueName('app/a$%b')); // symbols are okay
+ var app = c.app(utils.uniqueName('app/a\$%b')); // symbols are okay
await app.create(utils.emptyPerms());
var db = app.noSqlDatabase(utils.uniqueName('db'));
await db.create(utils.emptyPerms());
var table = db.table(utils.uniqueName('table'));
await table.create(utils.emptyPerms());
- var row = table.row(utils.uniqueName('row/a$%b')); // symbols are okay
+ var row = table.row(utils.uniqueName('row/a\$%b')); // symbols are okay
expect(await row.exists(), equals(false));
diff --git a/mojom/syncbase.mojom b/mojom/syncbase.mojom
index 0930c0a..93f306d 100644
--- a/mojom/syncbase.mojom
+++ b/mojom/syncbase.mojom
@@ -78,7 +78,7 @@
interface WatchGlobStream {
OnChange(WatchChange change);
- OnReturn(Error err);
+ OnError(Error err);
};
// TODO(sadovsky): Add schema version to all RPCs. See v.io/c/13734.
