TBR: mojo/syncbase: Fix tests.
Change-Id: I8080b4d54016a7ab6c3357e8c7f8fa3a75b542e3
diff --git a/dart/lib/src/nosql/database.dart b/dart/lib/src/nosql/database.dart
index 0288f28..fd026d3 100644
--- a/dart/lib/src/nosql/database.dart
+++ b/dart/lib/src/nosql/database.dart
@@ -70,7 +70,7 @@
stub.impl = new WatchGlobStreamImpl._fromStreamController(sc);
// TODO(aghassemi): Implement naming utilities such as Join in Dart and use them instead.
- var pattern = tableName + nameSeparator + prefix + '*';
+ var pattern = naming.join(tableName, prefix) + '*';
var req = new mojom.GlobRequest();
req.pattern = pattern;
req.resumeMarker = resumeMarker;
diff --git a/dart/lib/src/nosql/row.dart b/dart/lib/src/nosql/row.dart
index 40ac0e7..293fe5a 100644
--- a/dart/lib/src/nosql/row.dart
+++ b/dart/lib/src/nosql/row.dart
@@ -8,7 +8,7 @@
final String key;
SyncbaseRow._internal(_proxy, _parentFullName, key)
- : super._internal(_proxy, _parentFullName, relativeName,
+ : super._internal(_proxy, _parentFullName, key,
naming.join(_parentFullName, escape(key))),
this.key = key;
diff --git a/dart/test/integration/syncbase_app_test.dart b/dart/test/integration/syncbase_app_test.dart
index 604867d..5367851 100644
--- a/dart/test/integration/syncbase_app_test.dart
+++ b/dart/test/integration/syncbase_app_test.dart
@@ -14,7 +14,7 @@
test('getting a handle to an app', () {
var appName = utils.uniqueName('app');
var app = c.app(appName);
- expect(app.relativeName, equals(appName));
+ expect(app.name, equals(appName));
expect(app.fullName, equals(appName));
});
diff --git a/dart/test/integration/syncbase_database_test.dart b/dart/test/integration/syncbase_database_test.dart
index bf6b6b8..ce3a3dd 100644
--- a/dart/test/integration/syncbase_database_test.dart
+++ b/dart/test/integration/syncbase_database_test.dart
@@ -18,7 +18,7 @@
var app = c.app(utils.uniqueName('app'));
var dbName = utils.uniqueName('db');
var db = app.noSqlDatabase(dbName);
- expect(db.relativeName, equals(dbName));
+ expect(db.name, equals(dbName));
expect(db.fullName, equals(app.fullName + '/' + dbName));
});
@@ -50,7 +50,7 @@
// Start watching everything from now.
var resumeMarker = await db.getResumeMarker();
var prefix = '';
- var watchStream = db.watch(table.relativeName, prefix, resumeMarker);
+ var watchStream = db.watch(table.name, prefix, resumeMarker);
// Perform some operations while are watching.
var expectedChanges = new List<WatchChange>();
@@ -58,7 +58,7 @@
await table.put('row2', UTF8.encode('value2'));
resumeMarker = await db.getResumeMarker();
var expectedChange = new WatchChange();
- expectedChange.tableName = table.relativeName;
+ expectedChange.tableName = table.name;
expectedChange.rowName = 'row2';
expectedChange.changeType = WatchChangeTypes.put;
expectedChange.valueBytes = UTF8.encode('value2');
@@ -68,7 +68,7 @@
await table.delete('row2');
resumeMarker = await db.getResumeMarker();
expectedChange = new WatchChange();
- expectedChange.tableName = table.relativeName;
+ expectedChange.tableName = table.name;
expectedChange.rowName = 'row2';
expectedChange.changeType = WatchChangeTypes.delete;
expectedChange.valueBytes = new List<int>();
diff --git a/dart/test/integration/syncbase_row_test.dart b/dart/test/integration/syncbase_row_test.dart
index 7397f2c..598397b 100644
--- a/dart/test/integration/syncbase_row_test.dart
+++ b/dart/test/integration/syncbase_row_test.dart
@@ -21,7 +21,7 @@
var rowName = utils.uniqueName('row');
var row = table.row(rowName);
- expect(row.relativeName, equals(rowName));
+ expect(row.name, equals(rowName));
expect(row.fullName, equals(table.fullName + '/' + rowName));
});
diff --git a/dart/test/integration/syncbase_table_test.dart b/dart/test/integration/syncbase_table_test.dart
index a590885..cf5fd5b 100644
--- a/dart/test/integration/syncbase_table_test.dart
+++ b/dart/test/integration/syncbase_table_test.dart
@@ -18,7 +18,7 @@
var db = app.noSqlDatabase(utils.uniqueName('db'));
var tableName = utils.uniqueName('table');
var table = db.table(tableName);
- expect(table.relativeName, equals(tableName));
+ expect(table.name, equals(tableName));
expect(table.fullName, equals(db.fullName + '/' + tableName));
});
diff --git a/dart/test/integration/utils.dart b/dart/test/integration/utils.dart
index 068ba88..38f2efa 100644
--- a/dart/test/integration/utils.dart
+++ b/dart/test/integration/utils.dart
@@ -18,5 +18,5 @@
String uniqueName(String type) {
type ??= 'unknown';
_nameCounter++;
- return type + '-' + _nameCounter.toString();
+ return type + '_' + _nameCounter.toString();
}
