Revert "[fuchsia] Adds a test for clock change (flutter#19993)" (flut…

…ter#20790) This reverts commit 3fe49ec.
noga-dev · Aug 26, 2020 · 5952760 · 5952760
1 parent 619db58
commit 5952760
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 234 deletions.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -624,7 +624,6 @@ FILE: ../../../flutter/shell/common/serialization_callbacks.h
 FILE: ../../../flutter/shell/common/shell.cc
 FILE: ../../../flutter/shell/common/shell.h
 FILE: ../../../flutter/shell/common/shell_benchmarks.cc
-FILE: ../../../flutter/shell/common/shell_fuchsia_unittests.cc
 FILE: ../../../flutter/shell/common/shell_io_manager.cc
 FILE: ../../../flutter/shell/common/shell_io_manager.h
 FILE: ../../../flutter/shell/common/shell_test.cc

diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -263,16 +263,5 @@ if (enable_unittests) {
       "//flutter/shell/version",
       "//third_party/googletest:gmock",
     ]
-
-    if (is_fuchsia) {
-      sources += [ "shell_fuchsia_unittests.cc" ]
-
-      deps += [
-        "$fuchsia_sdk_root/fidl:fuchsia.intl",
-        "$fuchsia_sdk_root/fidl:fuchsia.settings",
-        "$fuchsia_sdk_root/pkg:fidl_cpp",
-        "$fuchsia_sdk_root/pkg:sys_cpp",
-      ]
-    }
   }
 }
diff --git a/shell/common/fixtures/shell_test.dart b/shell/common/fixtures/shell_test.dart
@@ -141,29 +141,12 @@ List<int> getFixtureImage() native 'GetFixtureImage';
 
 void notifyLocalTime(String string) native 'NotifyLocalTime';
 
-void waitFixture() native 'WaitFixture';
-
-// Return local date-time as a string, to an hour resolution.  So, "2020-07-23
-// 14:03:22" will become "2020-07-23 14".
-String localTimeAsString() {
+@pragma('vm:entry-point')
+void localtimesMatch() {
   final now = DateTime.now().toLocal();
   // This is: "$y-$m-$d $h:$min:$sec.$ms$us";
   final timeStr = now.toString();
   // Forward only "$y-$m-$d $h" for timestamp comparison.  Not using DateTime
   // formatting since package:intl is not available.
-  return timeStr.split(":")[0];
-}
-
-@pragma('vm:entry-point')
-void localtimesMatch() {
-  notifyLocalTime(localTimeAsString());
-}
-
-@pragma('vm:entry-point')
-void timezonesChange() {
-  notifyLocalTime(localTimeAsString());
-  waitFixture();
-  notifyLocalTime(localTimeAsString());
-  waitFixture();
-  notifyLocalTime(localTimeAsString());
+  notifyLocalTime(timeStr.split(":")[0]);
 }
diff --git a/shell/common/shell_fuchsia_unittests.cc b/shell/common/shell_fuchsia_unittests.cc
diff --git a/testing/fuchsia/meta/fuchsia_test.cmx b/testing/fuchsia/meta/fuchsia_test.cmx
@@ -11,14 +11,13 @@
     ],
     "services": [
       "fuchsia.accessibility.semantics.SemanticsManager",
+      "fuchsia.process.Launcher",
       "fuchsia.deprecatedtimezone.Timezone",
-      "fuchsia.logger.LogSink",
       "fuchsia.netstack.Netstack",
-      "fuchsia.process.Launcher",
-      "fuchsia.settings.Intl",
       "fuchsia.sysmem.Allocator",
-      "fuchsia.tracing.provider.Registry",
       "fuchsia.vulkan.loader.Loader",
+      "fuchsia.logger.LogSink",
+      "fuchsia.tracing.provider.Registry",
       "fuchsia.intl.PropertyProvider"
     ]
   }