From 359c800e5465d00fe37d8c2722d4808a0d6964e1 Mon Sep 17 00:00:00 2001
From: Jon Samwell <jonsamwell@gmail.com>
Date: Tue, 25 May 2021 17:16:27 +1000
Subject: [PATCH] chore(lint): various code liniting changes

---
 .flutter-plugins-dependencies                            | 2 +-
 .../configuration/flutter_driver_test_configuration.dart | 9 +++------
 lib/src/flutter/hooks/app_runner_hook.dart               | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index 9aa870a..b347b7a 100644
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-05-25 17:13:13.998769","version":"2.2.0"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Google\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-05-25 17:16:18.323118","version":"2.2.0"}
\ No newline at end of file
diff --git a/lib/src/flutter/configuration/flutter_driver_test_configuration.dart b/lib/src/flutter/configuration/flutter_driver_test_configuration.dart
index 61994e4..adaf781 100644
--- a/lib/src/flutter/configuration/flutter_driver_test_configuration.dart
+++ b/lib/src/flutter/configuration/flutter_driver_test_configuration.dart
@@ -146,9 +146,7 @@ class FlutterDriverTestConfiguration extends FlutterTestConfiguration {
     world = world ?? FlutterDriverWorld();
 
     final driver = await createFlutterDriver(
-      flutterConfig.runningAppProtocolEndpointUri != null &&
-              flutterConfig.runningAppProtocolEndpointUri != null &&
-              flutterConfig.runningAppProtocolEndpointUri!.isNotEmpty
+      flutterConfig.runningAppProtocolEndpointUri?.isNotEmpty ?? false
           ? flutterConfig.runningAppProtocolEndpointUri
           : null,
     );
@@ -204,15 +202,14 @@ class FlutterDriverTestConfiguration extends FlutterTestConfiguration {
   }
 
   void _ensureCorrectConfiguration() {
-    if (runningAppProtocolEndpointUri != null &&
-        runningAppProtocolEndpointUri!.isNotEmpty) {
+    if (runningAppProtocolEndpointUri?.isNotEmpty ?? false) {
       if (restartAppBetweenScenarios) {
         throw AssertionError(
           'Cannot restart app between scenarios if using runningAppProtocolEndpointUri',
         );
       }
 
-      if (targetDeviceId != null && targetDeviceId!.isNotEmpty) {
+      if (targetDeviceId?.isNotEmpty ?? false) {
         throw AssertionError(
           'Cannot target specific device id if using runningAppProtocolEndpointUri',
         );
diff --git a/lib/src/flutter/hooks/app_runner_hook.dart b/lib/src/flutter/hooks/app_runner_hook.dart
index e5da71b..a5ea002 100644
--- a/lib/src/flutter/hooks/app_runner_hook.dart
+++ b/lib/src/flutter/hooks/app_runner_hook.dart
@@ -60,8 +60,7 @@ class FlutterAppRunnerHook extends Hook {
   }
 
   Future<void> _runApp(FlutterDriverTestConfiguration config) async {
-    if (config.runningAppProtocolEndpointUri != null &&
-        config.runningAppProtocolEndpointUri!.isNotEmpty) {
+    if (config.runningAppProtocolEndpointUri?.isNotEmpty ?? false) {
       stdout.writeln(
         "Connecting to running Flutter app under test at '${config.runningAppProtocolEndpointUri}', "
         'this might take a few moments',