Skip to content

GitLab

T
tangled
Commit 60162249 authored by Ted Choc's avatar Ted Choc Committed by Commit Bot
Browse files
Options

Replace OmniboxTest autocomplete growth tests w/ UrlBarTests. 

BUG=1027549,1062563

Change-Id: I1f950aa62f091776595be7234c7a92ac6b1b2c43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2116135
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: default avatarBrandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752635}
parent 96f47ebc
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 62 deletions
chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
View file @ 60162249
......@@ -356,68 +356,6 @@ public class OmniboxTest {
checkAutocompleteText(suggestionsMap, "test", "testing", 4, 7);
}
@Test
@DisableIf.Build(sdk_is_greater_than = Build.VERSION_CODES.O, message = "crbug.com/1027549")
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testGrowingAutocompleteTextResults()
throws InterruptedException, ExecutionException {
Map<String, List<SuggestionsResult>> suggestionsMap = buildSuggestionMap(
new TestSuggestionResultsBuilder()
.setTextShownFor("test")
.addSuggestions(new SuggestionsResultBuilder()
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"test", null)
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"testing", null)
.setAutocompleteText("i"))
.addSuggestions(new SuggestionsResultBuilder()
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"test", null)
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"testz", null)
.setAutocompleteText("in"))
.addSuggestions(new SuggestionsResultBuilder()
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"test", null)
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"testblarg", null)
.setAutocompleteText("ing for the win")));
checkAutocompleteText(suggestionsMap, "test", "testing for the win", 4, 19);
}
@Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@DisabledTest
public void testShrinkingAutocompleteTextResults()
throws InterruptedException, ExecutionException {
Map<String, List<SuggestionsResult>> suggestionsMap = buildSuggestionMap(
new TestSuggestionResultsBuilder()
.setTextShownFor("test")
.addSuggestions(new SuggestionsResultBuilder()
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"test", null)
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"testing", null)
.setAutocompleteText("ing is awesome"))
.addSuggestions(new SuggestionsResultBuilder()
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"test", null)
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"testz", null)
.setAutocompleteText("ing is hard"))
.addSuggestions(new SuggestionsResultBuilder()
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"test", null)
.addGeneratedSuggestion(OmniboxSuggestionType.SEARCH_HISTORY,
"testblarg", null)
.setAutocompleteText("ingz")));
checkAutocompleteText(suggestionsMap, "test", "testingz", 4, 8);
}
private void checkAutocompleteText(
Map<String, List<SuggestionsResult>> suggestionsMap,
final String textToType, final String expectedAutocompleteText,
......
chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java
View file @ 60162249
......@@ -12,6 +12,7 @@ import android.content.res.Resources;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.text.Editable;
import android.text.Selection;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.ViewGroup;
......@@ -200,6 +201,25 @@ public class UrlBarTest extends DummyUiActivityTestCase {
return getAutocompleteState(() -> mUrlBar.setSelection(selectionStart, selectionEnd));
}
private void assertAutocompleteSelectionRange(
int expectedSelectionStart, int expectedSelectionEnd) {
int[] selection = getSelectionRange();
Assert.assertEquals("Selection start did not match", expectedSelectionStart, selection[0]);
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SPANNABLE_INLINE_AUTOCOMPLETE)) {
Assert.assertEquals("Selection end did not match", expectedSelectionEnd, selection[1]);
}
}
private int[] getSelectionRange() {
return TestThreadUtils.runOnUiThreadBlockingNoException(() -> {
int[] selection = new int[2];
CharSequence text = mUrlBar.getText();
selection[0] = Selection.getSelectionStart(text);
selection[1] = Selection.getSelectionEnd(text);
return selection;
});
}
@Test
@SmallTest
@Feature({"Omnibox"})
......@@ -858,4 +878,30 @@ public class UrlBarTest extends DummyUiActivityTestCase {
setTextAndVerifyNoAutocomplete("");
Mockito.verify(listener).onTextChanged("", "");
}
@Test
@SmallTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testSetAutocompleteText_ShrinkingText() {
toggleFocusAndIgnoreImeOperations(mUrlBar, true);
setTextAndVerifyNoAutocomplete("test");
setAutocomplete("test", "ing is awesome");
setAutocomplete("test", "ing is hard");
setAutocomplete("test", "ingz");
assertAutocompleteSelectionRange(4, 8);
}
@Test
@SmallTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testSetAutocompleteText_GrowingText() {
toggleFocusAndIgnoreImeOperations(mUrlBar, true);
setTextAndVerifyNoAutocomplete("test");
setAutocomplete("test", "ingz");
setAutocomplete("test", "ing is hard");
setAutocomplete("test", "ing is awesome");
assertAutocompleteSelectionRange(4, 18);
}
}
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