| Index: packages/usage/test/src/common.dart
|
| diff --git a/packages/usage/test/src/common.dart b/packages/usage/test/src/common.dart
|
| index 238ce6db1bbe9b0b74b1205751db3d39442fea27..77993942ff9495da65073672284d41252f78e1cd 100644
|
| --- a/packages/usage/test/src/common.dart
|
| +++ b/packages/usage/test/src/common.dart
|
| @@ -9,22 +9,20 @@ import 'dart:async';
|
| import 'package:test/test.dart';
|
| import 'package:usage/src/usage_impl.dart';
|
|
|
| -AnalyticsImplMock createMock({bool setOptIn: true}) =>
|
| - new AnalyticsImplMock('UA-0', setOptIn: setOptIn);
|
| +AnalyticsImplMock createMock({Map<String, dynamic> props}) =>
|
| + new AnalyticsImplMock('UA-0', props: props);
|
|
|
| -void was(Map m, String type) => expect(m['t'], type);
|
| -void has(Map m, String key) => expect(m[key], isNotNull);
|
| -void hasnt(Map m, String key) => expect(m[key], isNull);
|
| +was(Map m, String type) => expect(m['t'], type);
|
| +has(Map m, String key) => expect(m[key], isNotNull);
|
| +hasnt(Map m, String key) => expect(m[key], isNull);
|
|
|
| class AnalyticsImplMock extends AnalyticsImpl {
|
| MockProperties get mockProperties => properties;
|
| MockPostHandler get mockPostHandler => postHandler;
|
|
|
| - AnalyticsImplMock(String trackingId, {bool setOptIn: true}) :
|
| - super(trackingId, new MockProperties(), new MockPostHandler(),
|
| - applicationName: 'Test App', applicationVersion: '0.1') {
|
| - if (setOptIn) optIn = true;
|
| - }
|
| + AnalyticsImplMock(String trackingId, {Map<String, dynamic> props})
|
| + : super(trackingId, new MockProperties(props), new MockPostHandler(),
|
| + applicationName: 'Test App', applicationVersion: '0.1');
|
|
|
| Map<String, dynamic> get last => mockPostHandler.last;
|
| }
|
| @@ -32,18 +30,26 @@ class AnalyticsImplMock extends AnalyticsImpl {
|
| class MockProperties extends PersistentProperties {
|
| Map<String, dynamic> props = {};
|
|
|
| - MockProperties() : super('mock');
|
| + MockProperties([Map<String, dynamic> props]) : super('mock') {
|
| + if (props != null) this.props.addAll(props);
|
| + }
|
|
|
| - dynamic operator[](String key) => props[key];
|
| + @override
|
| + dynamic operator [](String key) => props[key];
|
|
|
| - void operator[]=(String key, dynamic value) {
|
| + @override
|
| + void operator []=(String key, dynamic value) {
|
| props[key] = value;
|
| }
|
| +
|
| + @override
|
| + void syncSettings() {}
|
| }
|
|
|
| class MockPostHandler extends PostHandler {
|
| List<Map<String, dynamic>> sentValues = [];
|
|
|
| + @override
|
| Future sendPost(String url, Map<String, dynamic> parameters) {
|
| sentValues.add(parameters);
|
|
|
| @@ -51,4 +57,7 @@ class MockPostHandler extends PostHandler {
|
| }
|
|
|
| Map<String, dynamic> get last => sentValues.last;
|
| +
|
| + @override
|
| + void close() {}
|
| }
|
|
|