extraInfo -> data

Author: CareF

packages/e2e/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.6.1
 
-* Added `extraInfo` in the reported json.
+* Added `data` in the reported json.
 
 ## 0.6.0
 

packages/e2e/lib/common.dart

@@ -12,18 +12,15 @@ class Response {
   final bool _allTestsPassed;
 
   /// The extra information to be added along side the test result.
-  ///
-  /// Specially `'result'` and `'failureDetails'` keys are occupied, and will
-  /// be ignored.
-  Map<String, dynamic> extraInfo;
+  Map<String, dynamic> data;
 
   /// Constructor to use for positive response.
-  Response.allTestsPassed({this.extraInfo})
+  Response.allTestsPassed({this.data})
       : this._allTestsPassed = true,
         this._failureDetails = null;
 
   /// Constructor for failure response.
-  Response.someTestsFailed(this._failureDetails, {this.extraInfo})
+  Response.someTestsFailed(this._failureDetails, {this.data})
       : this._allTestsPassed = false;
 
   /// Whether the test ran successfully or not.
@@ -37,19 +34,11 @@ class Response {
   List<Failure> get failureDetails => _failureDetails;
 
   /// Serializes this message to a JSON map.
-  String toJson() {
-    final Map<String, dynamic> result = <String, dynamic>{};
-    result['result'] = allTestsPassed.toString();
-    result['failureDetails'] = _failureDetailsAsString();
-    if (extraInfo != null) {
-      extraInfo.forEach((String key, dynamic value) {
-        if (key != 'result' && key != 'failureDetails') {
-          result[key] = value;
-        }
+  String toJson() => json.encode(<String, dynamic>{
+        'result': allTestsPassed.toString(),
+        'failureDetails': _failureDetailsAsString(),
+        if (data != null) 'data': data
       });
-    }
-    return json.encode(result);
-  }
 
   /// Deserializes the result from JSON.
   static Response fromJson(String source) {
@@ -59,11 +48,11 @@ class Response {
     final dynamic detail = responseJson['failureDetails'];
     responseJson.remove('failureDetails');
     if (result == 'true') {
-      return Response.allTestsPassed(extraInfo: responseJson);
+      return Response.allTestsPassed(data: responseJson);
     } else {
       return Response.someTestsFailed(
         _failureDetailsFromJson(detail),
-        extraInfo: responseJson,
+        data: responseJson,
       );
     }
   }

packages/e2e/lib/e2e.dart

@@ -78,18 +78,18 @@ class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding {
 
   static Map<String, String> _results = <String, String>{};
 
-  Map<String, dynamic> _reports;
+  Map<String, dynamic> _data;
 
   /// Add fields to the reported result.
   ///
-  /// The values in `report` should be json-serializable objects.
+  /// The values in `data` should be json-serializable objects.
   ///
-  /// For keys in `report` that's previously added, it will over write the
+  /// For keys in `data` that's previously added, it will over write the
   /// original values.
-  void addReportResult(Map<String, dynamic> report) {
-    _reports ??= <String, dynamic>{};
-    report.forEach((String key, dynamic value) {
-      _reports[key] = value;
+  void addData(Map<String, dynamic> data) {
+    _data ??= <String, dynamic>{};
+    data.forEach((String key, dynamic value) {
+      _data[key] = value;
     });
   }
 
@@ -105,10 +105,10 @@ class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding {
           final bool allTestsPassed = await _allTestsPassed.future;
           response = <String, String>{
             'message': allTestsPassed
-                ? Response.allTestsPassed(extraInfo: _reports).toJson()
+                ? Response.allTestsPassed(data: _data).toJson()
                 : Response.someTestsFailed(
                     _failureMethodsDetails,
-                    extraInfo: _reports,
+                    data: _data,
                   ).toJson(),
           };
           break;

packages/e2e/pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.6.1
 homepage: https://github.com/flutter/plugins/tree/master/packages/e2e
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.2.2 <3.0.0"
   flutter: ">=1.12.13+hotfix.5 <2.0.0"
 
 dependencies: