Revert "Added a composable waitForCondition Driver/extension API (#37736)" (#38815)

This reverts commit 8edc3f76.

packages/flutter_driver/lib/src/common/find.dart

@@ -106,6 +106,52 @@ class WaitForAbsentResult extends Result {
   Map<String, dynamic> toJson() => <String, dynamic>{};
 }
 
+/// A Flutter Driver command that waits until there are no more transient callbacks in the queue.
+class WaitUntilNoTransientCallbacks extends Command {
+  /// Creates a command that waits for there to be no transient callbacks.
+  const WaitUntilNoTransientCallbacks({ Duration timeout }) : super(timeout: timeout);
+
+  /// Deserializes this command from the value generated by [serialize].
+  WaitUntilNoTransientCallbacks.deserialize(Map<String, String> json)
+    : super.deserialize(json);
+
+  @override
+  String get kind => 'waitUntilNoTransientCallbacks';
+}
+
+/// A Flutter Driver command that waits until the frame is synced.
+class WaitUntilNoPendingFrame extends Command {
+  /// Creates a command that waits until there's no pending frame scheduled.
+  const WaitUntilNoPendingFrame({ Duration timeout }) : super(timeout: timeout);
+
+  /// Deserializes this command from the value generated by [serialize].
+  WaitUntilNoPendingFrame.deserialize(Map<String, String> json)
+    : super.deserialize(json);
+
+  @override
+  String get kind => 'waitUntilNoPendingFrame';
+}
+
+/// A Flutter Driver command that waits until the Flutter engine rasterizes the
+/// first frame.
+///
+/// {@template flutter.frame_rasterized_vs_presented}
+/// Usually, the time that a frame is rasterized is very close to the time that
+/// it gets presented on the display. Specifically, rasterization is the last
+/// expensive phase of a frame that's still in Flutter's control.
+/// {@endtemplate}
+class WaitUntilFirstFrameRasterized extends Command {
+  /// Creates this command.
+  const WaitUntilFirstFrameRasterized({ Duration timeout }) : super(timeout: timeout);
+
+  /// Deserializes this command from the value generated by [serialize].
+  WaitUntilFirstFrameRasterized.deserialize(Map<String, String> json)
+      : super.deserialize(json);
+
+  @override
+  String get kind => 'waitUntilFirstFrameRasterized';
+}
+
 /// Base class for Flutter Driver finders, objects that describe how the driver
 /// should search for elements.
 abstract class SerializableFinder {

packages/flutter_driver/lib/src/driver/driver.dart

@@ -28,7 +28,6 @@ import '../common/render_tree.dart';
 import '../common/request_data.dart';
 import '../common/semantics.dart';
 import '../common/text.dart';
-import '../common/wait.dart';
 import 'common.dart';
 import 'timeline.dart';
 
@@ -492,17 +491,12 @@ class FlutterDriver {
     await _sendCommand(WaitForAbsent(finder, timeout: timeout));
   }
 
-  /// Waits until the given [waitCondition] is satisfied.
-  Future<void> waitForCondition(WaitCondition waitCondition, {Duration timeout}) async {
-    await _sendCommand(WaitForCondition(waitCondition, timeout: timeout));
-  }
-
   /// Waits until there are no more transient callbacks in the queue.
   ///
   /// Use this method when you need to wait for the moment when the application
   /// becomes "stable", for example, prior to taking a [screenshot].
   Future<void> waitUntilNoTransientCallbacks({ Duration timeout }) async {
-    await _sendCommand(WaitForCondition(const NoTransientCallbacksCondition(), timeout: timeout));
+    await _sendCommand(WaitUntilNoTransientCallbacks(timeout: timeout));
   }
 
   /// Waits until the next [Window.onReportTimings] is called.
@@ -510,7 +504,7 @@ class FlutterDriver {
   /// Use this method to wait for the first frame to be rasterized during the
   /// app launch.
   Future<void> waitUntilFirstFrameRasterized() async {
-    await _sendCommand(const WaitForCondition(FirstFrameRasterizedCondition()));
+    await _sendCommand(const WaitUntilFirstFrameRasterized());
   }
 
   Future<DriverOffset> _getOffset(SerializableFinder finder, OffsetType type, { Duration timeout }) async {

packages/flutter_driver/lib/src/extension/extension.dart

@@ -29,7 +29,6 @@ import '../common/render_tree.dart';
 import '../common/request_data.dart';
 import '../common/semantics.dart';
 import '../common/text.dart';
-import '../common/wait.dart';
 
 const String _extensionMethodName = 'driver';
 const String _extensionMethod = 'ext.flutter.$_extensionMethodName';
@@ -113,10 +112,9 @@ class FlutterDriverExtension {
       'tap': _tap,
       'waitFor': _waitFor,
       'waitForAbsent': _waitForAbsent,
-      'waitForCondition': _waitForCondition,
-      'waitUntilNoTransientCallbacks': _waitUntilNoTransientCallbacks, // ignore: deprecated_member_use_from_same_package
-      'waitUntilNoPendingFrame': _waitUntilNoPendingFrame, // ignore: deprecated_member_use_from_same_package
-      'waitUntilFirstFrameRasterized': _waitUntilFirstFrameRasterized, // ignore: deprecated_member_use_from_same_package
+      'waitUntilNoTransientCallbacks': _waitUntilNoTransientCallbacks,
+      'waitUntilNoPendingFrame': _waitUntilNoPendingFrame,
+      'waitUntilFirstFrameRasterized': _waitUntilFirstFrameRasterized,
       'get_semantics_id': _getSemanticsId,
       'get_offset': _getOffset,
       'get_diagnostics_tree': _getDiagnosticsTree,
@@ -136,10 +134,9 @@ class FlutterDriverExtension {
       'tap': (Map<String, String> params) => Tap.deserialize(params),
       'waitFor': (Map<String, String> params) => WaitFor.deserialize(params),
       'waitForAbsent': (Map<String, String> params) => WaitForAbsent.deserialize(params),
-      'waitForCondition': (Map<String, String> params) => WaitForCondition.deserialize(params),
-      'waitUntilNoTransientCallbacks': (Map<String, String> params) => WaitUntilNoTransientCallbacks.deserialize(params), // ignore: deprecated_member_use_from_same_package
-      'waitUntilNoPendingFrame': (Map<String, String> params) => WaitUntilNoPendingFrame.deserialize(params), // ignore: deprecated_member_use_from_same_package
-      'waitUntilFirstFrameRasterized': (Map<String, String> params) => WaitUntilFirstFrameRasterized.deserialize(params), // ignore: deprecated_member_use_from_same_package
+      'waitUntilNoTransientCallbacks': (Map<String, String> params) => WaitUntilNoTransientCallbacks.deserialize(params),
+      'waitUntilNoPendingFrame': (Map<String, String> params) => WaitUntilNoPendingFrame.deserialize(params),
+      'waitUntilFirstFrameRasterized': (Map<String, String> params) => WaitUntilFirstFrameRasterized.deserialize(params),
       'get_semantics_id': (Map<String, String> params) => GetSemanticsId.deserialize(params),
       'get_offset': (Map<String, String> params) => GetOffset.deserialize(params),
       'get_diagnostics_tree': (Map<String, String> params) => GetDiagnosticsTree.deserialize(params),
@@ -226,7 +223,6 @@ class FlutterDriverExtension {
   }
 
   // This can be used to wait for the first frame being rasterized during app launch.
-  @Deprecated('This method has been deprecated in favor of _waitForCondition.')
   Future<Result> _waitUntilFirstFrameRasterized(Command command) async {
     await WidgetsBinding.instance.waitUntilFirstFrameRasterized;
     return null;
@@ -374,14 +370,6 @@ class FlutterDriverExtension {
     return const WaitForAbsentResult();
   }
 
-  Future<Result> _waitForCondition(Command command) async {
-    assert(command != null);
-    final WaitForCondition waitForConditionCommand = command;
-    await waitForConditionCommand.condition.wait();
-    return null;
-  }
-
-  @Deprecated('This method has been deprecated in favor of _waitForCondition.')
   Future<Result> _waitUntilNoTransientCallbacks(Command command) async {
     if (SchedulerBinding.instance.transientCallbackCount != 0)
       await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0);
@@ -405,9 +393,6 @@ class FlutterDriverExtension {
   /// `set_frame_sync` method. See [FlutterDriver.runUnsynchronized] for more
   /// details on how to do this. Note, disabling frame sync will require the
   /// test author to use some other method to avoid flakiness.
-  ///
-  /// This method has been deprecated in favor of [_waitForCondition].
-  @Deprecated('This method has been deprecated in favor of _waitForCondition.')
   Future<Result> _waitUntilNoPendingFrame(Command command) async {
     await _waitUntilFrame(() {
       return SchedulerBinding.instance.transientCallbackCount == 0

packages/flutter_driver/test/flutter_driver_test.dart

@@ -6,7 +6,6 @@ import 'dart:async';
 
 import 'package:flutter_driver/src/common/error.dart';
 import 'package:flutter_driver/src/common/health.dart';
-import 'package:flutter_driver/src/common/wait.dart';
 import 'package:flutter_driver/src/driver/driver.dart';
 import 'package:flutter_driver/src/driver/timeline.dart';
 import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
@@ -249,41 +248,12 @@ void main() {
       });
     });
 
-    group('waitForCondition', () {
-      test('sends the wait for NoPendingFrameCondition command', () async {
-        when(mockIsolate.invokeExtension(any, any)).thenAnswer((Invocation i) {
-          expect(i.positionalArguments[1], <String, dynamic>{
-            'command': 'waitForCondition',
-            'timeout': _kSerializedTestTimeout,
-            'conditionName': 'NoPendingFrameCondition',
-          });
-          return makeMockResponse(<String, dynamic>{});
-        });
-        await driver.waitForCondition(const NoPendingFrameCondition(), timeout: _kTestTimeout);
-      });
-
-      test('sends the waitForCondition of combined conditions command', () async {
-        when(mockIsolate.invokeExtension(any, any)).thenAnswer((Invocation i) {
-          expect(i.positionalArguments[1], <String, dynamic>{
-            'command': 'waitForCondition',
-            'timeout': _kSerializedTestTimeout,
-            'conditionName': 'CombinedCondition',
-            'conditions': '[{"conditionName":"NoPendingFrameCondition"},{"conditionName":"NoTransientCallbacksCondition"}]',
-          });
-          return makeMockResponse(<String, dynamic>{});
-        });
-        const WaitCondition combinedCondition = CombinedCondition(<WaitCondition>[NoPendingFrameCondition(), NoTransientCallbacksCondition()]);
-        await driver.waitForCondition(combinedCondition, timeout: _kTestTimeout);
-      });
-    });
-
     group('waitUntilNoTransientCallbacks', () {
       test('sends the waitUntilNoTransientCallbacks command', () async {
         when(mockIsolate.invokeExtension(any, any)).thenAnswer((Invocation i) {
           expect(i.positionalArguments[1], <String, dynamic>{
-            'command': 'waitForCondition',
+            'command': 'waitUntilNoTransientCallbacks',
             'timeout': _kSerializedTestTimeout,
-            'conditionName': 'NoTransientCallbacksCondition',
           });
           return makeMockResponse(<String, dynamic>{});
         });

packages/flutter_driver/test/src/extension_test.dart

@@ -12,7 +12,6 @@ import 'package:flutter_driver/src/common/find.dart';
 import 'package:flutter_driver/src/common/geometry.dart';
 import 'package:flutter_driver/src/common/request_data.dart';
 import 'package:flutter_driver/src/common/text.dart';
-import 'package:flutter_driver/src/common/wait.dart';
 import 'package:flutter_driver/src/extension/extension.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -29,18 +28,18 @@ void main() {
     });
 
     testWidgets('returns immediately when transient callback queue is empty', (WidgetTester tester) async {
-      extension.call(const WaitUntilNoTransientCallbacks().serialize()) // ignore: deprecated_member_use_from_same_package
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
+      extension.call(const WaitUntilNoTransientCallbacks().serialize())
+        .then<void>(expectAsync1((Map<String, dynamic> r) {
+          result = r;
+        }));
 
       await tester.idle();
       expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
+          result,
+          <String, dynamic>{
+            'isError': false,
+            'response': null,
+          },
       );
     });
 
@@ -49,10 +48,10 @@ void main() {
         // Intentionally blank. We only care about existence of a callback.
       });
 
-      extension.call(const WaitUntilNoTransientCallbacks().serialize()) // ignore: deprecated_member_use_from_same_package
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
+      extension.call(const WaitUntilNoTransientCallbacks().serialize())
+        .then<void>(expectAsync1((Map<String, dynamic> r) {
+          result = r;
+        }));
 
       // Nothing should happen until the next frame.
       await tester.idle();
@@ -61,11 +60,11 @@ void main() {
       // NOW we should receive the result.
       await tester.pump();
       expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
+          result,
+          <String, dynamic>{
+            'isError': false,
+            'response': null,
+          },
       );
     });
 
@@ -77,173 +76,6 @@ void main() {
     });
   });
 
-  group('waitForCondition', () {
-    FlutterDriverExtension extension;
-    Map<String, dynamic> result;
-    int messageId = 0;
-    final List<String> log = <String>[];
-
-    setUp(() {
-      result = null;
-      extension = FlutterDriverExtension((String message) async { log.add(message); return (messageId += 1).toString(); }, false);
-    });
-
-    testWidgets('waiting for NoTransientCallbacksCondition returns immediately when transient callback queue is empty', (WidgetTester tester) async {
-      extension.call(const WaitForCondition(NoTransientCallbacksCondition()).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      await tester.idle();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-
-    testWidgets('waiting for NoTransientCallbacksCondition returns until no transient callbacks', (WidgetTester tester) async {
-      SchedulerBinding.instance.scheduleFrameCallback((_) {
-        // Intentionally blank. We only care about existence of a callback.
-      });
-
-      extension.call(const WaitForCondition(NoTransientCallbacksCondition()).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      // Nothing should happen until the next frame.
-      await tester.idle();
-      expect(result, isNull);
-
-      // NOW we should receive the result.
-      await tester.pump();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-
-    testWidgets('waiting for NoPendingFrameCondition returns immediately when frame is synced', (
-        WidgetTester tester) async {
-      extension.call(const WaitForCondition(NoPendingFrameCondition()).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      await tester.idle();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-
-    testWidgets('waiting for NoPendingFrameCondition returns until no pending scheduled frame', (WidgetTester tester) async {
-      SchedulerBinding.instance.scheduleFrame();
-
-      extension.call(const WaitForCondition(NoPendingFrameCondition()).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      // Nothing should happen until the next frame.
-      await tester.idle();
-      expect(result, isNull);
-
-      // NOW we should receive the result.
-      await tester.pump();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-
-    testWidgets(
-        'waiting for combined conditions returns immediately', (WidgetTester tester) async {
-      const WaitCondition combinedCondition = CombinedCondition(<WaitCondition>[NoTransientCallbacksCondition(), NoPendingFrameCondition()]);
-      extension.call(const WaitForCondition(combinedCondition).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      await tester.idle();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-
-    testWidgets(
-        'waiting for combined conditions returns until no transient callbacks', (WidgetTester tester) async {
-      SchedulerBinding.instance.scheduleFrame();
-      SchedulerBinding.instance.scheduleFrameCallback((_) {
-        // Intentionally blank. We only care about existence of a callback.
-      });
-
-      const WaitCondition combinedCondition = CombinedCondition(<WaitCondition>[NoTransientCallbacksCondition(), NoPendingFrameCondition()]);
-      extension.call(const WaitForCondition(combinedCondition).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      // Nothing should happen until the next frame.
-      await tester.idle();
-      expect(result, isNull);
-
-      // NOW we should receive the result.
-      await tester.pump();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-
-    testWidgets(
-        'waiting for combined conditions returns until no pending scheduled frame', (WidgetTester tester) async {
-      SchedulerBinding.instance.scheduleFrame();
-      SchedulerBinding.instance.scheduleFrameCallback((_) {
-        // Intentionally blank. We only care about existence of a callback.
-      });
-
-      const WaitCondition combinedCondition = CombinedCondition(<WaitCondition>[NoPendingFrameCondition(), NoTransientCallbacksCondition()]);
-      extension.call(const WaitForCondition(combinedCondition).serialize())
-          .then<void>(expectAsync1((Map<String, dynamic> r) {
-        result = r;
-      }));
-
-      // Nothing should happen until the next frame.
-      await tester.idle();
-      expect(result, isNull);
-
-      // NOW we should receive the result.
-      await tester.pump();
-      expect(
-        result,
-        <String, dynamic>{
-          'isError': false,
-          'response': null,
-        },
-      );
-    });
-  });
-
   group('getSemanticsId', () {
     FlutterDriverExtension extension;
     setUp(() {
@@ -513,7 +345,7 @@ void main() {
 
     testWidgets('returns immediately when frame is synced', (
         WidgetTester tester) async {
-      extension.call(const WaitUntilNoPendingFrame().serialize()) // ignore: deprecated_member_use_from_same_package
+      extension.call(const WaitUntilNoPendingFrame().serialize())
           .then<void>(expectAsync1((Map<String, dynamic> r) {
         result = r;
       }));
@@ -534,7 +366,7 @@ void main() {
         // Intentionally blank. We only care about existence of a callback.
       });
 
-      extension.call(const WaitUntilNoPendingFrame().serialize()) // ignore: deprecated_member_use_from_same_package
+      extension.call(const WaitUntilNoPendingFrame().serialize())
           .then<void>(expectAsync1((Map<String, dynamic> r) {
         result = r;
       }));
@@ -558,7 +390,7 @@ void main() {
         'waits until no pending scheduled frame', (WidgetTester tester) async {
       SchedulerBinding.instance.scheduleFrame();
 
-      extension.call(const WaitUntilNoPendingFrame().serialize()) // ignore: deprecated_member_use_from_same_package
+      extension.call(const WaitUntilNoPendingFrame().serialize())
           .then<void>(expectAsync1((Map<String, dynamic> r) {
         result = r;
       }));

packages/flutter_driver/test/src/wait_test.dart

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter_driver/src/common/wait.dart';
-
-import '../common.dart';
-
-void main() {
-  group('WaitForCondition', () {
-    test('WaitForCondition serialize', () {
-      expect(
-          const WaitForCondition(NoTransientCallbacksCondition()).serialize(),
-          <String, String>{'command': 'waitForCondition', 'conditionName': 'NoTransientCallbacksCondition'});
-    });
-
-    test('WaitForCondition serialize with timeout', () {
-      expect(
-          const WaitForCondition(NoTransientCallbacksCondition(), timeout: Duration(milliseconds: 10)).serialize(),
-          <String, String>{'command': 'waitForCondition', 'timeout': '10', 'conditionName': 'NoTransientCallbacksCondition'});
-    });
-
-    test('WaitForCondition deserialize', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'command': 'waitForCondition',
-        'conditionName': 'NoTransientCallbacksCondition',
-      };
-      final WaitForCondition waitForCondition = WaitForCondition.deserialize(jsonMap);
-      expect(waitForCondition.kind, 'waitForCondition');
-      expect(waitForCondition.condition, equals(const NoTransientCallbacksCondition()));
-    });
-
-    test('WaitForCondition deserialize with timeout', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'command': 'waitForCondition',
-        'timeout': '10',
-        'conditionName': 'NoTransientCallbacksCondition',
-      };
-      final WaitForCondition waitForCondition = WaitForCondition.deserialize(jsonMap);
-      expect(waitForCondition.kind, 'waitForCondition');
-      expect(waitForCondition.condition, equals(const NoTransientCallbacksCondition()));
-      expect(waitForCondition.timeout, equals(const Duration(milliseconds: 10)));
-    });
-  });
-
-  group('NoTransientCallbacksCondition', () {
-    test('NoTransientCallbacksCondition serialize', () {
-      expect(
-          const NoTransientCallbacksCondition().serialize(),
-          <String, String>{'conditionName': 'NoTransientCallbacksCondition'});
-    });
-
-    test('NoTransientCallbacksCondition deserialize', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'conditionName': 'NoTransientCallbacksCondition',
-      };
-      final NoTransientCallbacksCondition condition =
-          NoTransientCallbacksCondition.deserialize(jsonMap);
-      expect(condition, equals(const NoTransientCallbacksCondition()));
-      expect(condition.serialize(), equals(jsonMap));
-    });
-
-    test('NoTransientCallbacksCondition deserialize error', () {
-      expect(
-          () => NoTransientCallbacksCondition.deserialize(<String, String>{'conditionName': 'Unknown'}),
-          throwsA(predicate<SerializationException>((SerializationException e) =>
-              e.message == 'Error occurred during deserializing the NoTransientCallbacksCondition JSON string: {conditionName: Unknown}')));
-    });
-  });
-
-  group('NoPendingFrameCondition', () {
-    test('NoPendingFrameCondition serialize', () {
-      expect(const NoPendingFrameCondition().serialize(), <String, String>{
-        'conditionName': 'NoPendingFrameCondition',
-      });
-    });
-
-    test('NoPendingFrameCondition deserialize', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'conditionName': 'NoPendingFrameCondition',
-      };
-      final NoPendingFrameCondition condition =
-          NoPendingFrameCondition.deserialize(jsonMap);
-      expect(condition, equals(const NoPendingFrameCondition()));
-      expect(condition.serialize(), equals(jsonMap));
-    });
-
-    test('NoPendingFrameCondition deserialize error', () {
-      expect(
-          () => NoPendingFrameCondition.deserialize(<String, String>{'conditionName': 'Unknown'}),
-          throwsA(predicate<SerializationException>((SerializationException e) =>
-              e.message == 'Error occurred during deserializing the NoPendingFrameCondition JSON string: {conditionName: Unknown}')));
-    });
-  });
-
-  group('FirstFrameRasterizedCondition', () {
-    test('FirstFrameRasterizedCondition serialize', () {
-      expect(
-          const FirstFrameRasterizedCondition().serialize(),
-          <String, String>{'conditionName': 'FirstFrameRasterizedCondition'});
-    });
-
-    test('FirstFrameRasterizedCondition deserialize', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'conditionName': 'FirstFrameRasterizedCondition',
-      };
-      final FirstFrameRasterizedCondition condition =
-          FirstFrameRasterizedCondition.deserialize(jsonMap);
-      expect(condition, equals(const FirstFrameRasterizedCondition()));
-      expect(condition.serialize(), equals(jsonMap));
-    });
-
-    test('FirstFrameRasterizedCondition deserialize error', () {
-      expect(
-          () => FirstFrameRasterizedCondition.deserialize(<String, String>{'conditionName': 'Unknown'}),
-          throwsA(predicate<SerializationException>((SerializationException e) =>
-              e.message == 'Error occurred during deserializing the FirstFrameRasterizedCondition JSON string: {conditionName: Unknown}')));
-    });
-  });
-
-  group('CombinedCondition', () {
-    test('CombinedCondition serialize', () {
-      const CombinedCondition combinedCondition =
-          CombinedCondition(<WaitCondition>[
-        NoTransientCallbacksCondition(),
-        NoPendingFrameCondition()
-      ]);
-
-      expect(combinedCondition.serialize(), <String, String>{
-        'conditionName': 'CombinedCondition',
-        'conditions':
-            '[{"conditionName":"NoTransientCallbacksCondition"},{"conditionName":"NoPendingFrameCondition"}]',
-      });
-    });
-
-    test('CombinedCondition serialize - empty condition list', () {
-      const CombinedCondition combinedCondition = CombinedCondition(<WaitCondition>[]);
-
-      expect(combinedCondition.serialize(), <String, String>{
-        'conditionName': 'CombinedCondition',
-        'conditions': '[]',
-      });
-    });
-
-    test('CombinedCondition deserialize - empty condition list', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'conditionName': 'CombinedCondition',
-        'conditions': '[]',
-      };
-      final CombinedCondition condition = CombinedCondition.deserialize(jsonMap);
-      expect(condition.conditions, equals(<WaitCondition>[]));
-      expect(condition.serialize(), equals(jsonMap));
-    });
-
-    test('CombinedCondition deserialize', () {
-      final Map<String, String> jsonMap = <String, String>{
-        'conditionName': 'CombinedCondition',
-        'conditions':
-            '[{"conditionName":"NoPendingFrameCondition"},{"conditionName":"NoTransientCallbacksCondition"}]',
-      };
-      final CombinedCondition condition =
-          CombinedCondition.deserialize(jsonMap);
-      expect(
-          condition.conditions,
-          equals(<WaitCondition>[
-            const NoPendingFrameCondition(),
-            const NoTransientCallbacksCondition(),
-          ]));
-      expect(condition.serialize(), jsonMap);
-    });
-
-    test('CombinedCondition deserialize - no condition list', () {
-      final CombinedCondition condition =
-          CombinedCondition.deserialize(<String, String>{'conditionName': 'CombinedCondition',});
-      expect(condition.conditions, equals(<WaitCondition>[]));
-      expect(condition.serialize(), <String, String>{
-        'conditionName': 'CombinedCondition',
-        'conditions': '[]',
-      });
-    });
-
-    test('CombinedCondition deserialize error', () {
-      expect(
-          () => CombinedCondition.deserialize(<String, String>{'conditionName': 'Unknown'}),
-          throwsA(predicate<SerializationException>((SerializationException e) =>
-              e.message == 'Error occurred during deserializing the CombinedCondition JSON string: {conditionName: Unknown}')));
-    });
-
-    test('CombinedCondition deserialize error - Unknown condition type', () {
-      expect(
-          () {
-            return CombinedCondition.deserialize(<String, String>{
-                'conditionName': 'CombinedCondition',
-                'conditions':
-                    '[{"conditionName":"UnknownCondition"},{"conditionName":"NoTransientCallbacksCondition"}]',
-            });
-          },
-          throwsA(predicate<SerializationException>((SerializationException e) =>
-              e.message == 'Unsupported wait condition UnknownCondition in the JSON string {conditionName: UnknownCondition}')));
-    });
-  });
-}