From 487d5c05c2f305e54cc3d7efa709b1f72c62f750 Mon Sep 17 00:00:00 2001 From: Christopher Best Date: Mon, 28 Oct 2013 15:43:12 -0400 Subject: [PATCH] use dart:convert to replace dart:json --- lib/logging_handlers_shared.dart | 2 -- test/shared/shared_test.dart | 2 +- test/shared/src/transformer_tests.dart | 16 ++++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/logging_handlers_shared.dart b/lib/logging_handlers_shared.dart index 111e8fa..1a3b800 100644 --- a/lib/logging_handlers_shared.dart +++ b/lib/logging_handlers_shared.dart @@ -1,7 +1,5 @@ library logging_handlers_shared; -import 'dart:json'; - import 'package:logging/logging.dart'; import 'package:intl/intl.dart'; diff --git a/test/shared/shared_test.dart b/test/shared/shared_test.dart index 5c72b18..5dd1dcf 100644 --- a/test/shared/shared_test.dart +++ b/test/shared/shared_test.dart @@ -3,7 +3,7 @@ library shared_test; import 'package:logging_handlers/logging_handlers_shared.dart'; import 'package:unittest/unittest.dart'; import 'package:logging/logging.dart'; -import 'dart:json'; +import 'dart:convert'; part 'src/transformer_tests.dart'; diff --git a/test/shared/src/transformer_tests.dart b/test/shared/src/transformer_tests.dart index 3c02d28..e851bc2 100644 --- a/test/shared/src/transformer_tests.dart +++ b/test/shared/src/transformer_tests.dart @@ -96,10 +96,10 @@ runMapTransformerTests() { var logRecord = new LogRecord(Level.INFO, message, loggerName, time); var impl = new MapTransformer(); - var map = impl.transform(logRecord); // convert the logRecord to a map - String json = stringify(map); // convert the map to json with dart:json - Map map2 = parse(json); // convert the json back to a map - + var map = impl.transform(logRecord); // convert the logRecord to a map + String json = JSON.encode(map); // convert the map to json with dart:json + Map map2 = JSON.decode(json); // convert the json back to a map + expect(map2["message"], equals(logRecord.message)); expect(map2["loggerName"], equals(logRecord.loggerName)); expect(map2["level"], equals(logRecord.level.name)); @@ -123,10 +123,10 @@ runMapTransformerTests() { "Exception text"); var impl = new MapTransformer(); - var map = impl.transform(logRecord); // convert the logRecord to a map - String json = stringify(map); // convert the map to json with dart:json - Map map2 = parse(json); // convert the json back to a map - + var map = impl.transform(logRecord); // convert the logRecord to a map + String json = JSON.encode(map); // convert the map to json with dart:json + Map map2 = JSON.decode(json); // convert the json back to a map + expect(map2["message"], equals(logRecord.message)); expect(map2["loggerName"], equals(logRecord.loggerName)); expect(map2["level"], equals(logRecord.level.name));