[TTS] Add an ACK message to SelectWordAroundCaret.

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.contextualsearch;
 
 import android.content.Context;
 import android.net.Uri;
 import android.support.test.filters.SmallTest;
 import android.widget.LinearLayout;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManagerWrapper;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchInternalStateController.InternalState;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchSelectionController.SelectionType;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.SelectionClient;
 import org.chromium.content.browser.SelectionPopupController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
 import org.chromium.ui.touch_selection.SelectionEventType;
 
 import javax.annotation.Nullable;
@@ skipping 80 matching lines @@
         }
 
         @Override
         protected ContextualSearchRequest createContextualSearchRequest(
                 String query, String altTerm, String mid, boolean shouldPrefetch) {
             return new MockContextualSearchRequest(query, altTerm, shouldPrefetch);
         }
 
         @Override
         protected void nativeGatherSurroundingText(long nativeContextualSearchManager,
-                ContextualSearchContext contextualSearchContext, WebContents baseWebContents) {
-            getContextualSearchInternalStateController().notifyFinishedWorkOn(
-                    InternalState.GATHERING_SURROUNDINGS);
-        }
+                ContextualSearchContext contextualSearchContext, WebContents baseWebContents) {}
 
         /**
          * @return A stubbed ContentViewCore for mocking text selection.
          */
         public StubbedContentViewCore getBaseContentView() {
             return (StubbedContentViewCore) getSelectionController().getBaseContentView();
         }
     }
 
     // --------------------------------------------------------------------------------------------
@@ skipping 99 matching lines @@
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mContextualSearchClient.showUnhandledTapUIIfNeeded(0, 0);
                 mContextualSearchClient.onSelectionEvent(
                         SelectionEventType.SELECTION_HANDLES_CLEARED, 0, 0);
             }
         });
     }
 
-    private void mockSelectWordAroundCaretAck(final String text) {
+    /**
+     * Generates a call indicating that surrounding text and selection range are available.
+     */
+    private void generateTextSurroundingSelectionAvailable() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mContextualSearchManager.handleSelection(text, true, SelectionType.TAP, 0, 0);
+                // It only makes sense to send dummy data here because we can't easily control
+                // what's in the native context.
+                mContextualSearchManager.onTextSurroundingSelectionAvailable(
+                        "UTF-8", "unused", 0, 0);
             }
         });
     }
+
+    /**
+     * Generates an ACK for the SelectWordAroundCaret native call, which indicates that the select
+     * action has completed with the given result.
+     */
+    private void generateSelectWordAroundCaretAck() {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                // It only makes sense to send dummy data here because we can't easily control
+                // what's in the native context.
+                mContextualSearchManager.selectWordAroundCaretAck(true, 0, 0);
+            }
+        });
+    }
 
     // --------------------------------------------------------------------------------------------
 
     @Before
     public void setUp() throws Exception {
         mActivityTestRule.startMainActivityOnBlankPage();
         final ChromeActivity activity = mActivityTestRule.getActivity();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ skipping 17 matching lines @@
      */
     @Test
     @SmallTest
     @Feature({"ContextualSearch"})
     @Restriction(Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testLongpressFollowedByNonTextTap() {
         Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 0);
 
         // Fake a selection event.
         mockLongpressText("text");
+        // Generate the surrounding-text-available callback.
+        // Surrounding text is gathered for longpress due to icing integration.
+        generateTextSurroundingSelectionAvailable();
 
         Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 1);
         Assert.assertEquals(mPanelManager.getPanelHideCount(), 0);
         Assert.assertEquals(mContextualSearchManager.getSelectionController().getSelectedText(),
                 "text");
 
         // Fake tap on non-text.
         mockTapEmptySpace();
 
         Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 1);
         Assert.assertEquals(mPanelManager.getPanelHideCount(), 1);
         Assert.assertNull(mContextualSearchManager.getSelectionController().getSelectedText());
     }
 
     /**
      * Tests that a Tap gesture followed by tapping empty space closes the panel.
      */
     @Test
     @SmallTest
     @Feature({"ContextualSearch"})
     @Restriction(Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testTextTapFollowedByNonTextTap() {
         Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 0);
 
         // Fake a Tap event.
         mockTapText("text");
+        // Generate the surrounding-text-available callback.
+        generateTextSurroundingSelectionAvailable();
         // Right now the tap-processing sequence will stall at selectWordAroundCaret, so we need
-        // to prod it forward with a manual hack:
-        mockSelectWordAroundCaretAck("text");
+        // to prod it forward by generating an ACK:
+        generateSelectWordAroundCaretAck();
         Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 1);
         Assert.assertEquals(mPanelManager.getPanelHideCount(), 0);
     }
 }