Skip to content

GitLab

T
tangled
Commit 5ae112d1 authored by Gang Wu's avatar Gang Wu Committed by Commit Bot
Browse files
Options

Reland "[Omnibox] Use ActivityState to check if we are in browser mode" 

This is a reland of be1e9636

Update the test to run on UI thread.

Original change's description:
> [Omnibox] Use ActivityState to check if we are in browser mode
>
>
> In multi windows mode, check if we are in browser mode by WindowAndroid
> is not working, should check ActivityState instead.
>
> Bug: 1102640
> Change-Id: I35a720a2aa6f337cc9f9ae43e39d83c9368fcb5a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2286478
> Commit-Queue: Gang Wu <gangwu@chromium.org>
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#786636}

Bug: 1102640
Change-Id: Iefba5a5d0c181535bd7fb86cf0e073be2ebdbcdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293074Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788816}
parent fc80da8e
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 52 deletions
chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
View file @ 5ae112d1
......@@ -20,6 +20,7 @@ import androidx.annotation.Px;
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.ActivityState;
import org.chromium.base.Callback;
import org.chromium.base.ContextUtils;
import org.chromium.base.IntentUtils;
......@@ -578,7 +579,8 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi
// When invoked directly from a browser, we want to trigger switch to tab animation.
// If invoded from other activitiies, ex. searchActivity, we do not need to trigger the
// animation since Android will show the animation for switching apps.
if (mWindowAndroid.equals(tab.getWindowAndroid())) {
if (tab.getWindowAndroid().getActivityState() != ActivityState.STOPPED
&& tab.getWindowAndroid().getActivityState() != ActivityState.DESTROYED) {
// TODO(1097292): Do not use Activity to get TabModelSelector.
assert tab.getWindowAndroid().getActivity().get() instanceof ChromeActivity;
......@@ -589,13 +591,13 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi
chromeActivity.getTabModelSelector().getCurrentModel().setIndex(
tabIndex, TabSelectionType.FROM_OMNIBOX);
} else {
// Browser is in background, bring to to foreground and switch to the tab.
Intent newIntent = ChromeIntentUtil.createBringTabToFrontIntent(tab.getId());
if (newIntent != null) {
newIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
IntentUtils.safeStartActivity(ContextUtils.getApplicationContext(), newIntent);
}
}
recordMetrics(position, WindowOpenDisposition.SWITCH_TO_TAB, suggestion);
}
......
chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/suggestions/SwitchToTabTest.java
View file @ 5ae112d1
......@@ -8,7 +8,6 @@ import android.app.Activity;
import android.app.Instrumentation;
import android.app.Instrumentation.ActivityMonitor;
import android.content.Intent;
import android.os.Build;
import android.support.test.InstrumentationRegistry;
import android.util.Pair;
import android.view.ViewGroup;
......@@ -24,8 +23,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.ActivityState;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.flags.ChromeSwitches;
......@@ -42,6 +42,7 @@ import org.chromium.chrome.test.util.WaitForFocusHelper;
import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
import org.chromium.content_public.browser.test.util.Criteria;
import org.chromium.content_public.browser.test.util.CriteriaHelper;
import org.chromium.content_public.browser.test.util.CriteriaNotSatisfiedException;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.content_public.browser.test.util.TestTouchUtils;
import org.chromium.net.test.EmbeddedTestServer;
......@@ -94,30 +95,47 @@ public class SwitchToTabTest {
*
* @param activity The Activity which url_bar is in.
* @param locationBarLayout The layout which omnibox suggestions will show in.
* @param text The text will be typed into url_bar.
* @param input The text will be typed into url_bar.
* @param expectedMatchUrl The expected url to visit after clicking tab switch button.
*/
private void typeAndWaitForTabMatchSuggestions(Activity activity,
LocationBarLayout locationBarLayout, String input) throws InterruptedException {
private void typeAndClickMatchingTabMatchSuggestion(Activity activity,
LocationBarLayout locationBarLayout, String input, String expectedMatchUrl)
throws InterruptedException {
typeInOmnibox(activity, input);
OmniboxTestUtils.waitForOmniboxSuggestions(locationBarLayout);
// waitForOmniboxSuggestions only wait until one suggestion shows up, we need to wait util
// autocomplete return more suggestions.
CriteriaHelper.pollUiThread(() -> {
Criteria.checkThat(findFirstTabMatchOmniboxSuggestion(locationBarLayout).first,
Matchers.not(INVALID_INDEX));
Pair<Integer, OmniboxSuggestion> matchSuggestion =
findFirstTabMatchOmniboxSuggestion(locationBarLayout);
Criteria.checkThat(matchSuggestion.first, Matchers.not(INVALID_INDEX));
Criteria.checkThat(
matchSuggestion.second.getUrl().getSpec(), Matchers.is(expectedMatchUrl));
OmniboxSuggestionsDropdown suggestionsDropdown =
AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
locationBarLayout.getAutocompleteCoordinator());
try {
clickSuggestionActionAt(suggestionsDropdown, matchSuggestion.first);
} catch (InterruptedException e) {
throw new CriteriaNotSatisfiedException(e);
}
});
}
/**
* Find the first switch to tab suggestion in the omnibox suggestion list, and return the
* suggestion and its index.
* suggestion and its index. This method needs to run on the UI thread.
*
* @param locationBarLayout The layout which omnibox suggestions will show in.
* @return The the first switch to tab suggestion's index, and the suggesstion.
* @return The first switch to tab suggestion's index, and the suggesstion.
*/
private Pair<Integer, OmniboxSuggestion> findFirstTabMatchOmniboxSuggestion(
LocationBarLayout locationBarLayout) {
ThreadUtils.assertOnUiThread();
OmniboxSuggestionsDropdown suggestionsDropdown =
AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
locationBarLayout.getAutocompleteCoordinator());
......@@ -171,9 +189,6 @@ public class SwitchToTabTest {
@Test
@MediumTest
@DisableIf.Build(message = "https://crbug.com/1101433",
sdk_is_greater_than = Build.VERSION_CODES.LOLLIPOP_MR1,
sdk_is_less_than = Build.VERSION_CODES.N)
@EnableFeatures("OmniboxTabSwitchSuggestions")
public void
testSwitchToTabSuggestion() throws InterruptedException {
......@@ -189,20 +204,8 @@ public class SwitchToTabTest {
LocationBarLayout locationBarLayout =
(LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
typeAndWaitForTabMatchSuggestions(
mActivityTestRule.getActivity(), locationBarLayout, "about");
Pair<Integer, OmniboxSuggestion> matchSuggestion =
findFirstTabMatchOmniboxSuggestion(locationBarLayout);
Assert.assertNotEquals(INVALID_INDEX, (int) matchSuggestion.first);
Assert.assertNotNull("No Switch to Tab suggestion returned.", matchSuggestion.second);
Assert.assertEquals(matchSuggestion.second.getUrl().getSpec(), testHttpsUrl1);
OmniboxSuggestionsDropdown suggestionsDropdown =
AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
locationBarLayout.getAutocompleteCoordinator());
clickSuggestionActionAt(suggestionsDropdown, (int) matchSuggestion.first);
typeAndClickMatchingTabMatchSuggestion(
mActivityTestRule.getActivity(), locationBarLayout, "about", testHttpsUrl1);
CriteriaHelper.pollUiThread(() -> {
Tab tab = mActivityTestRule.getActivity().getActivityTab();
......@@ -235,17 +238,18 @@ public class SwitchToTabTest {
mActivityTestRule.typeInOmnibox("about", false);
OmniboxTestUtils.waitForOmniboxSuggestions(locationBarLayout);
Pair<Integer, OmniboxSuggestion> matchSuggestion =
findFirstTabMatchOmniboxSuggestion(locationBarLayout);
CriteriaHelper.pollUiThread(() -> {
Pair<Integer, OmniboxSuggestion> matchSuggestion =
findFirstTabMatchOmniboxSuggestion(locationBarLayout);
Assert.assertNull(
"Should no Switch to Incognito Tab from normal tab.", matchSuggestion.second);
Criteria.checkThat(matchSuggestion.first, Matchers.is(INVALID_INDEX));
});
}
@Test
@MediumTest
@EnableFeatures("OmniboxTabSwitchSuggestions")
public void testSwitchToTabInSearchActiviy() throws InterruptedException {
public void testSwitchToTabInSearchActivity() throws InterruptedException {
mTestServer = EmbeddedTestServer.createAndStartHTTPSServer(
InstrumentationRegistry.getInstrumentation().getContext(),
ServerCertificate.CERT_OK);
......@@ -257,30 +261,26 @@ public class SwitchToTabTest {
mActivityTestRule.loadUrlInNewTab(testHttpsUrl3);
final SearchActivity searchActivity = startSearchActivity();
CriteriaHelper.pollUiThread(() -> {
Tab tab = mActivityTestRule.getActivity().getActivityTab();
Criteria.checkThat(tab, Matchers.notNullValue());
// Make sure chrome fully in background.
Criteria.checkThat(tab.getWindowAndroid().getActivityState(),
Matchers.isOneOf(ActivityState.STOPPED, ActivityState.DESTROYED));
});
final LocationBarLayout locationBarLayout =
(LocationBarLayout) searchActivity.findViewById(R.id.search_location_bar);
typeAndWaitForTabMatchSuggestions(searchActivity, locationBarLayout, "about");
Pair<Integer, OmniboxSuggestion> matchSuggestion =
findFirstTabMatchOmniboxSuggestion(locationBarLayout);
Assert.assertNotEquals(INVALID_INDEX, (int) matchSuggestion.first);
Assert.assertNotNull("No Switch to Tab suggestion returned.", matchSuggestion.second);
Assert.assertEquals(matchSuggestion.second.getUrl().getSpec(), testHttpsUrl1);
OmniboxSuggestionsDropdown suggestionsDropdown =
AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
locationBarLayout.getAutocompleteCoordinator());
clickSuggestionActionAt(suggestionsDropdown, (int) matchSuggestion.first);
typeAndClickMatchingTabMatchSuggestion(
searchActivity, locationBarLayout, "about", testHttpsUrl1);
CriteriaHelper.pollUiThread(() -> {
Tab tab = mActivityTestRule.getActivity().getActivityTab();
if (tab == null) return false;
// Make sure tab is in either upload page or result page. cannot only verify one of
// them since on fast device tab jump to result page really quick but on slow device
// may stay on upload page for a really long time.
return tab.getUrlString().equals(testHttpsUrl1);
Criteria.checkThat(tab, Matchers.notNullValue());
Criteria.checkThat(tab.getUrlString(), Matchers.is(testHttpsUrl1));
// Make sure tab is loaded and in foreground.
Criteria.checkThat(
tab.getWindowAndroid().getActivityState(), Matchers.is(ActivityState.RESUMED));
});
}
}
content/public/test/android/javatests/src/org/chromium/content_public/browser/test/util/TestTouchUtils.java
View file @ 5ae112d1
......@@ -203,7 +203,7 @@ public class TestTouchUtils {
* @param v The view to call performClick on.
*/
public static void performClickOnMainSync(Instrumentation instrumentation, final View v) {
instrumentation.runOnMainSync(() -> v.performClick());
TestThreadUtils.runOnUiThreadBlocking(() -> { v.performClick(); });
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment