Index: pkg/dart_messages/test/dart_messages_test.dart |
diff --git a/pkg/dart_messages/test/dart_messages_test.dart b/pkg/dart_messages/test/dart_messages_test.dart |
index b0ef4a529e2c1026194c1e06eec9789082821616..b05bc3f18217c8470ef19ece53203c369362500a 100644 |
--- a/pkg/dart_messages/test/dart_messages_test.dart |
+++ b/pkg/dart_messages/test/dart_messages_test.dart |
@@ -2,19 +2,19 @@ |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
-import 'dart:io'; |
+import 'dart:io' as io; |
import '../lib/shared_messages.dart'; |
void testJsonIsUpdated() { |
- var packageRoot = Platform.packageRoot; |
+ var packageRoot = io.Platform.packageRoot; |
if (packageRoot == null || packageRoot == "") { |
throw new UnsupportedError("This test requires a package root."); |
} |
var jsonUri = Uri.parse(packageRoot).resolve( |
'dart_messages/generated/shared_messages.json'); |
var jsonPath = jsonUri.toFilePath(); |
- var content = new File(jsonPath).readAsStringSync(); |
+ var content = new io.File(jsonPath).readAsStringSync(); |
if (messagesAsJson != content) { |
print("The content of the Dart messages and the corresponding JSON file"); |
print("is not the same."); |
@@ -26,7 +26,7 @@ void testJsonIsUpdated() { |
void testIdsAreUnique() { |
var usedIds = new Set(); |
for (var entry in MESSAGES.values) { |
- var id = entry.id; |
+ var id = "${entry.id}-${entry.subId}"; |
if (!usedIds.add(id)) { |
throw "Id appears twice: $id"; |
} |