From 7483665e6c229261fd70829f7de15c707d556826 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Thu, 27 Jun 2019 16:49:22 -0700
Subject: [PATCH] Re-enable embedder_unittests. (#9482)

This was disabled in https://github.com/flutter/engine/pull/6798 waiting for
a Dart SDK patch to land https://github.com/dart-lang/sdk/commit/e6d3a45b6a98ea36581ac375ec5cdd63dd829004
which has long since been addressed.
---
 .../embedder/tests/embedder_a11y_unittests.cc | 20 +++++++++++++------
 testing/run_tests.sh                          |  5 +++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/shell/platform/embedder/tests/embedder_a11y_unittests.cc
index eb83886ae0..b2bed0fb9b 100644
--- a/shell/platform/embedder/tests/embedder_a11y_unittests.cc
+++ b/shell/platform/embedder/tests/embedder_a11y_unittests.cc
@@ -21,7 +21,10 @@ namespace testing {
 
 using Embedder11yTest = testing::EmbedderTest;
 
-TEST_F(Embedder11yTest, A11yTreeIsConsistent) {
+// TODO: This test has been disabled as it is flaky (more reproducible in
+// profile more). Multiple calls to a11y changed handler in Dart code is
+// suspected. https://github.com/flutter/flutter/issues/35218
+TEST_F(Embedder11yTest, DISABLED_A11yTreeIsConsistent) {
   auto& context = GetEmbedderContext();
 
   fml::AutoResetWaitableEvent latch;
@@ -51,7 +54,8 @@ TEST_F(Embedder11yTest, A11yTreeIsConsistent) {
   // Wait for initial NotifySemanticsEnabled(false).
   callback = [&](Dart_NativeArguments args) {
     bool enabled = true;
-    Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    ASSERT_FALSE(Dart_IsError(handle));
     ASSERT_FALSE(enabled);
     latch.Signal();
   };
@@ -60,7 +64,8 @@ TEST_F(Embedder11yTest, A11yTreeIsConsistent) {
   // Enable semantics. Wait for NotifySemanticsEnabled(true).
   callback = [&](Dart_NativeArguments args) {
     bool enabled = false;
-    Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    ASSERT_FALSE(Dart_IsError(handle));
     ASSERT_TRUE(enabled);
     latch.Signal();
   };
@@ -71,7 +76,8 @@ TEST_F(Embedder11yTest, A11yTreeIsConsistent) {
   // Wait for initial accessibility features (reduce_motion == false)
   callback = [&](Dart_NativeArguments args) {
     bool enabled = true;
-    Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    ASSERT_FALSE(Dart_IsError(handle));
     ASSERT_FALSE(enabled);
     latch.Signal();
   };
@@ -80,7 +86,8 @@ TEST_F(Embedder11yTest, A11yTreeIsConsistent) {
   // Set accessibility features: (reduce_motion == true)
   callback = [&](Dart_NativeArguments args) {
     bool enabled = false;
-    Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    ASSERT_FALSE(Dart_IsError(handle));
     ASSERT_TRUE(enabled);
     latch.Signal();
   };
@@ -136,7 +143,8 @@ TEST_F(Embedder11yTest, A11yTreeIsConsistent) {
     ASSERT_EQ(42, node_id);
 
     int64_t action_id;
-    Dart_GetNativeIntegerArgument(args, 1, &action_id);
+    auto handle = Dart_GetNativeIntegerArgument(args, 1, &action_id);
+    ASSERT_FALSE(Dart_IsError(handle));
     ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
 
     Dart_Handle semantic_args = Dart_GetNativeArgument(args, 2);
diff --git a/testing/run_tests.sh b/testing/run_tests.sh
index 274c5a8839..36946316ce 100755
--- a/testing/run_tests.sh
+++ b/testing/run_tests.sh
@@ -24,8 +24,9 @@ fi
 # Switch to buildroot dir. Some tests assume paths relative to buildroot.
 cd "$BUILDROOT_DIR"
 
-# TODO(dnfield): Re-enable this when the upstream Dart changes that make it not be flaky land.
-# $HOST_DIR/embedder_unittests
+echo "Running embedder_unittests..."
+"$HOST_DIR/embedder_unittests"
+
 echo "Running flow_unittests..."
 "$HOST_DIR/flow_unittests"
 
-- 
GitLab