commit 9fbe547036e00f04da78215622c9c093e83daed6
author yuanzhi <yuanzhi@google.com> Wed Jul 08 21:59:14 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Jul 08 21:59:14 2020 +0000
tree bbecfa85db659b32a4b9300367e34a6029321ac8
parent 53a8907a1f8118d069b224779d7ecb1732c7e279

[e2e] Use sl4f.setui facade for setting locale.

Bug: fxb/52618
Tested in GI patch.

Change-Id: I64f9a17bd5d360457db8d29b40d044b7e226c567
Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/399016
Commit-Queue: Yuan Zhi <yuanzhi@google.com>
Reviewed-by: Paul Faria <paulfaria@google.com>
Reviewed-by: Filip Filmar <fmil@google.com>
Testability-Review: Filip Filmar <fmil@google.com>

tests/e2e/BUILD.gn

diff --git a/tests/e2e/BUILD.gn b/tests/e2e/BUILD.gn
index df43d54..8f6dd00 100644
--- a/tests/e2e/BUILD.gn
+++ b/tests/e2e/BUILD.gn
@@ -48,9 +48,6 @@
     # Ermine tests use Flutter Driver, which only works in debug builds.
     deps += [
       ":experiences_ermine_session_shell_e2e_test($host_toolchain)",
-
-      # Used for intl tests.
-      "//garnet/bin/setui_client:setui_client",
     ]
   }
 }

tests/e2e/test/ermine_intl_test.dart

diff --git a/tests/e2e/test/ermine_intl_test.dart b/tests/e2e/test/ermine_intl_test.dart
index 23947b9..b170f47 100644
--- a/tests/e2e/test/ermine_intl_test.dart
+++ b/tests/e2e/test/ermine_intl_test.dart
@@ -4,19 +4,19 @@
 
 import 'package:flutter_driver/flutter_driver.dart';
 import 'package:flutter_driver_sl4f/flutter_driver_sl4f.dart';
-import 'package:sl4f/sl4f.dart';
+import 'package:sl4f/sl4f.dart' as sl4f;
 import 'package:test/test.dart';
 
 /// Tests that the DUT running ermine can do the following:
 ///   - Change locale via setui_client and that change takes effect
 void main() {
-  Sl4f sl4f;
+  sl4f.Sl4f sl4fDriver;
+  sl4f.SetUi setUi;
   FlutterDriverConnector connector;
   FlutterDriver driver;
 
   Future<void> setLocale(String localeId) async {
-    var result = await sl4f.ssh.run('run setui_client.cm intl -l $localeId');
-    expect(result.exitCode, 0);
+    await setUi.setLocale(localeId);
   }
 
   void findTextOnScreen(String text) {
@@ -24,10 +24,12 @@
   }
 
   setUpAll(() async {
-    sl4f = Sl4f.fromEnvironment();
-    await sl4f.startServer();
+    sl4fDriver = sl4f.Sl4f.fromEnvironment();
+    await sl4fDriver.startServer();
 
-    connector = FlutterDriverConnector(sl4f);
+    setUi = sl4f.SetUi(sl4fDriver);
+
+    connector = FlutterDriverConnector(sl4fDriver);
     await connector.initialize();
 
     // Check if ermine is running.
@@ -49,8 +51,8 @@
     // Any of these may end up being null if the test fails in setup.
     await driver?.close();
     await connector?.tearDown();
-    await sl4f?.stopServer();
-    sl4f?.close();
+    await sl4fDriver?.stopServer();
+    sl4fDriver?.close();
   });
 
   test('Locale can be switched and takes effect', () async {