Avoid unnecessary `?.` operators in tests
Since we unconditionally initialize the fields in `setUp` and
`tearDown` runs only after a test, the variables should never
be `null`.
This will help with Null Safety, since we'll be able to use the
new `late` keyword for these and avoid warnings about the null
aware operators.
PiperOrigin-RevId: 322359905
diff --git a/test/async_alert_test.dart b/test/async_alert_test.dart
index d3af4b6..5200a3b 100644
--- a/test/async_alert_test.dart
+++ b/test/async_alert_test.dart
@@ -37,8 +37,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('no alert', () async {
diff --git a/test/async_command_event_test.dart b/test/async_command_event_test.dart
index 0cf17a1..dc749ee 100644
--- a/test/async_command_event_test.dart
+++ b/test/async_command_event_test.dart
@@ -40,8 +40,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
events.clear();
});
diff --git a/test/async_keyboard_test.dart b/test/async_keyboard_test.dart
index 5a9c23a..d35e9ac 100644
--- a/test/async_keyboard_test.dart
+++ b/test/async_keyboard_test.dart
@@ -44,8 +44,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('sendKeys -- once', () async {
diff --git a/test/async_logs_test.dart b/test/async_logs_test.dart
index c885891..c2874ff 100644
--- a/test/async_logs_test.dart
+++ b/test/async_logs_test.dart
@@ -38,8 +38,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('get logs', () async {
diff --git a/test/async_mouse_test.dart b/test/async_mouse_test.dart
index 4f34ed6..e2f980f 100644
--- a/test/async_mouse_test.dart
+++ b/test/async_mouse_test.dart
@@ -50,8 +50,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('moveTo element/click', () async {
diff --git a/test/async_navigation_test.dart b/test/async_navigation_test.dart
index 6777626..d57899a 100644
--- a/test/async_navigation_test.dart
+++ b/test/async_navigation_test.dart
@@ -34,8 +34,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('refresh', () async {
diff --git a/test/async_target_locator_test.dart b/test/async_target_locator_test.dart
index 772d93e..75bce6e 100644
--- a/test/async_target_locator_test.dart
+++ b/test/async_target_locator_test.dart
@@ -37,8 +37,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('frame index', () async {
diff --git a/test/async_web_driver_test.dart b/test/async_web_driver_test.dart
index 6eab0fb..c476fab 100644
--- a/test/async_web_driver_test.dart
+++ b/test/async_web_driver_test.dart
@@ -46,8 +46,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('get', () async {
diff --git a/test/async_web_element_test.dart b/test/async_web_element_test.dart
index c378a1d..0a6c9d9 100644
--- a/test/async_web_element_test.dart
+++ b/test/async_web_element_test.dart
@@ -55,8 +55,8 @@
});
tearDown(() async {
- await driver?.quit();
- await server?.close(force: true);
+ await driver.quit();
+ await server.close(force: true);
});
test('click', () async {
diff --git a/test/sync/alert.dart b/test/sync/alert.dart
index 5368987..2274b36 100644
--- a/test/sync/alert.dart
+++ b/test/sync/alert.dart
@@ -37,8 +37,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('no alert', () {
diff --git a/test/sync/command_event.dart b/test/sync/command_event.dart
index ea6f1cf..96dce97 100644
--- a/test/sync/command_event.dart
+++ b/test/sync/command_event.dart
@@ -42,7 +42,7 @@
events.clear();
driver = null;
- await server?.close(force: true);
+ await server.close(force: true);
});
test('handles exceptions', () {
diff --git a/test/sync/keyboard.dart b/test/sync/keyboard.dart
index 1709ada..cb2a1d8 100644
--- a/test/sync/keyboard.dart
+++ b/test/sync/keyboard.dart
@@ -43,8 +43,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('sendKeys -- once', () {
diff --git a/test/sync/logs.dart b/test/sync/logs.dart
index fd30fb9..82b6bdc 100644
--- a/test/sync/logs.dart
+++ b/test/sync/logs.dart
@@ -38,8 +38,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('get logs', () {
diff --git a/test/sync/mouse.dart b/test/sync/mouse.dart
index fe95015..bf0aaa6 100644
--- a/test/sync/mouse.dart
+++ b/test/sync/mouse.dart
@@ -49,8 +49,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('moveTo element/click', () {
diff --git a/test/sync/navigation.dart b/test/sync/navigation.dart
index 4cff5ef..26159e1 100644
--- a/test/sync/navigation.dart
+++ b/test/sync/navigation.dart
@@ -38,7 +38,7 @@
}
driver = null;
- await server?.close(force: true);
+ await server.close(force: true);
});
test('refresh', () async {
diff --git a/test/sync/sync_async_interop.dart b/test/sync/sync_async_interop.dart
index c9f6006..4410064 100644
--- a/test/sync/sync_async_interop.dart
+++ b/test/sync/sync_async_interop.dart
@@ -38,8 +38,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('sync to async driver works', () async {
diff --git a/test/sync/target_locator.dart b/test/sync/target_locator.dart
index 73dbee1..d12e288 100644
--- a/test/sync/target_locator.dart
+++ b/test/sync/target_locator.dart
@@ -37,8 +37,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('frame index', () {
diff --git a/test/sync/web_driver.dart b/test/sync/web_driver.dart
index fab23d7..4ee29c6 100644
--- a/test/sync/web_driver.dart
+++ b/test/sync/web_driver.dart
@@ -45,8 +45,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('get', () {
diff --git a/test/sync/web_element.dart b/test/sync/web_element.dart
index ab870bf..7d281f8 100644
--- a/test/sync/web_element.dart
+++ b/test/sync/web_element.dart
@@ -53,8 +53,8 @@
});
tearDown(() async {
- driver?.quit();
- await server?.close(force: true);
+ driver.quit();
+ await server.close(force: true);
});
test('click', () {
