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 3983773b88f2c23ebc465742e51dea7adc8d6c89..b0ef4a529e2c1026194c1e06eec9789082821616 100644 |
--- a/pkg/dart_messages/test/dart_messages_test.dart |
+++ b/pkg/dart_messages/test/dart_messages_test.dart |
@@ -2,7 +2,6 @@ |
// 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:convert'; |
import 'dart:io'; |
import '../lib/shared_messages.dart'; |
@@ -12,14 +11,14 @@ void testJsonIsUpdated() { |
if (packageRoot == null || packageRoot == "") { |
throw new UnsupportedError("This test requires a package root."); |
} |
- var jsonUri = |
- Uri.parse(packageRoot).resolve('dart_messages/shared_messages.json'); |
+ var jsonUri = Uri.parse(packageRoot).resolve( |
+ 'dart_messages/generated/shared_messages.json'); |
var jsonPath = jsonUri.toFilePath(); |
var content = new File(jsonPath).readAsStringSync(); |
- if (JSON.encode(MESSAGES) != content) { |
+ if (messagesAsJson != content) { |
print("The content of the Dart messages and the corresponding JSON file"); |
print("is not the same."); |
- print("Please run bin/json_converter to update the JSON file."); |
+ print("Please run bin/publish.dart to update the JSON file."); |
throw "Content is not the same"; |
} |
} |
@@ -27,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; |
if (!usedIds.add(id)) { |
throw "Id appears twice: $id"; |
} |