Merge branch 'master' into cupertino_profile

dart-lang · Mar 27, 2024 · f6f79be · f6f79be
2 parents 173238b + 9fddb1c
commit f6f79be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/pkgs/http_profile/lib/src/http_client_request_profile.dart b/pkgs/http_profile/lib/src/http_client_request_profile.dart
@@ -115,10 +115,11 @@ final class HttpClientRequestProfile {
   }
 
   Map<String, dynamic /*String|int*/ >? get connectionInfo =>
-      requestData._data['connectionInfo'] == null
+      requestData._requestData['connectionInfo'] == null
           ? null
           : UnmodifiableMapView(
-              requestData._data['connectionInfo'] as Map<String, dynamic>,
+              requestData._requestData['connectionInfo']
+                  as Map<String, dynamic>,
             );
 
   /// Details about the request.

diff --git a/pkgs/http_profile/lib/src/http_profile_response_data.dart b/pkgs/http_profile/lib/src/http_profile_response_data.dart
@@ -68,9 +68,6 @@ final class HttpProfileResponseData {
   List<int> get bodyBytes =>
       UnmodifiableListView(_data['responseBodyBytes'] as List<int>);
 
-  Map<String, dynamic /*String|int*/ >? get connectionInfo =>
-      _responseData['connectionInfo'] as Map<String, dynamic>?;
-
   /// The response headers where duplicate headers are represented using a list
   /// of values.
   ///

diff --git a/pkgs/http_profile/test/http_client_request_profile_test.dart b/pkgs/http_profile/test/http_client_request_profile_test.dart
@@ -83,7 +83,7 @@ void main() {
     final responseData = backingMap['responseData'] as Map<String, dynamic>;
     expect(requestData['connectionInfo'], isNull);
     expect(responseData['connectionInfo'], isNull);
-    expect(profile.responseData.connectionInfo, isNull);
+    expect(profile.connectionInfo, isNull);
 
     profile.connectionInfo = {
       'localPort': 1285,
@@ -102,7 +102,7 @@ void main() {
     expect(connectionInfoFromRequestData['connectionPoolId'], '21x23');
     expect(connectionInfoFromResponseData['connectionPoolId'], '21x23');
 
-    final connectionInfoFromGetter = profile.responseData.connectionInfo!;
+    final connectionInfoFromGetter = profile.connectionInfo!;
     expect(connectionInfoFromGetter['localPort'], 1285);
     expect(connectionInfoFromGetter['remotePort'], 443);
     expect(connectionInfoFromGetter['connectionPoolId'], '21x23');
@@ -128,7 +128,7 @@ void main() {
     expect(connectionInfoFromRequestData['connectionPoolId'], '21x23');
     expect(connectionInfoFromResponseData['connectionPoolId'], '21x23');
 
-    final connectionInfoFromGetter = profile.responseData.connectionInfo!;
+    final connectionInfoFromGetter = profile.connectionInfo!;
     expect(connectionInfoFromGetter['localPort'], 1285);
     expect(connectionInfoFromGetter['remotePort'], 443);
     expect(connectionInfoFromGetter['connectionPoolId'], '21x23');
@@ -137,6 +137,6 @@ void main() {
 
     expect(requestData['connectionInfo'], isNull);
     expect(responseData['connectionInfo'], isNull);
-    expect(profile.responseData.connectionInfo, isNull);
+    expect(profile.connectionInfo, isNull);
   });
 }