Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4101)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

Issue 1354763003: [Contextual Search] Trigger the translation one-box. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable for non-English users, for now. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
index aff355a7474728e1f795dd67e188faceca2b0db6..6f621999041775c0c62f7cfa3c3373386987dc7d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
@@ -182,10 +182,11 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
private final boolean mDoPreventPreload;
private final int mStartAdjust;
private final int mEndAdjust;
+ private final String mContextLanguage;
public FakeResponseOnMainThread(boolean isNetworkUnavailable, int responseCode,
String searchTerm, String displayText, String alternateTerm,
- boolean doPreventPreload, int startAdjust, int endAdjudst) {
+ boolean doPreventPreload, int startAdjust, int endAdjudst, String contextLanguage) {
mIsNetworkUnavailable = isNetworkUnavailable;
mResponseCode = responseCode;
mSearchTerm = searchTerm;
@@ -194,13 +195,14 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
mDoPreventPreload = doPreventPreload;
mStartAdjust = startAdjust;
mEndAdjust = endAdjudst;
+ mContextLanguage = contextLanguage;
}
@Override
public void run() {
- mFakeServer.handleSearchTermResolutionResponse(
- mIsNetworkUnavailable, mResponseCode, mSearchTerm, mDisplayText,
- mAlternateTerm, mDoPreventPreload, mStartAdjust, mEndAdjust);
+ mFakeServer.handleSearchTermResolutionResponse(mIsNetworkUnavailable, mResponseCode,
+ mSearchTerm, mDisplayText, mAlternateTerm, mDoPreventPreload, mStartAdjust,
+ mEndAdjust, mContextLanguage);
}
}
@@ -211,20 +213,20 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
private void fakeResponse(boolean isNetworkUnavailable, int responseCode,
String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload) {
fakeResponse(isNetworkUnavailable, responseCode, searchTerm, displayText, alternateTerm,
- doPreventPreload, 0, 0);
+ doPreventPreload, 0, 0, "");
}
/**
* Fakes a server response with the parameters given.
* {@See ContextualSearchManager#handleSearchTermResolutionResponse}.
*/
- private void fakeResponse(boolean isNetworkUnavailable, int responseCode,
- String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload,
- int startAdjust, int endAdjust) {
+ private void fakeResponse(boolean isNetworkUnavailable, int responseCode, String searchTerm,
+ String displayText, String alternateTerm, boolean doPreventPreload, int startAdjust,
+ int endAdjust, String contextLanguage) {
if (mFakeServer.getSearchTermRequested() != null) {
- getInstrumentation().runOnMainSync(
- new FakeResponseOnMainThread(isNetworkUnavailable, responseCode, searchTerm,
- displayText, alternateTerm, doPreventPreload, startAdjust, endAdjust));
+ getInstrumentation().runOnMainSync(new FakeResponseOnMainThread(isNetworkUnavailable,
+ responseCode, searchTerm, displayText, alternateTerm, doPreventPreload,
+ startAdjust, endAdjust, contextLanguage));
}
}
@@ -1942,7 +1944,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
waitForPanelToPeekAndAssert();
fakeResponse(false, 200, "Intelligence", "United States Intelligence", "alternate-term",
- false, -14, 0);
+ false, -14, 0, "");
waitForSelectionToBe("United States Intelligence");
}
@@ -1982,4 +1984,25 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
waitForPanelToPeekAndAssert();
assertFalse(mPanelDelegate.isPeekPromoVisible());
}
+
+ /**
+ * Tests a simple Tap with language determination.
+ */
+ @SmallTest
+ @Feature({"ContextualSearch"})
+ @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
+ public void testTapWithLanguage() throws InterruptedException, TimeoutException {
+ clickWordNode("intelligence");
+
+ assertEquals("Intelligence", mFakeServer.getSearchTermRequested());
+ // Fake a German response. This will trigger the Contextual Search Manager to try
+ // to create a Search Uri that triggers Translate.
+ fakeResponse(
+ false, 200, "Intelligence", "display-text", "alternate-term", false, 0, 0, "de");
+ assertContainsParameters("Intelligence", "alternate-term");
+ waitForPanelToPeekAndAssert();
+ assertLoadedLowPriorityUrl();
pedro (no code reviews) 2015/10/23 08:50:36 Nit: We shouldn't care about the priority in this
Donn Denman 2015/10/28 22:17:15 Done.
+ // Make sure we tried to trigger tranlsate.
+ mFakeServer.getLoadedUrl().contains(ContextualSearchRequest.TLITE_SOURCE_LANGUAGE_PARAM);
pedro (no code reviews) 2015/10/23 08:50:36 We shouldn't know how the Request triggers the tra
Donn Denman 2015/10/28 22:17:15 Good point! Done.
+ }
}

Powered by Google App Engine
This is Rietveld 408576698