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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java

Issue 2831823003: Convert ChromeActivityTestCaseBase direct children to JUnit4 (Closed)
Patch Set: rebase and convert newly added test Created 3 years, 8 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
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
index 1d00327090e7f321c5b0c8c41cc0aa1fdd4b365c..27d459ee660b785da76160c73722ebe35b6d6576 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
@@ -8,6 +8,7 @@ import static org.chromium.chrome.test.util.OmniboxTestUtils.buildSuggestionMap;
import android.os.Build;
import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.filters.SmallTest;
import android.support.v4.view.ViewCompat;
@@ -20,7 +21,14 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
+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.EnormousTest;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.FlakyTest;
@@ -29,9 +37,11 @@ import org.chromium.base.test.util.RetryOnFailure;
import org.chromium.base.test.util.ScalableTimeout;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
import org.chromium.chrome.browser.omnibox.LocationBarLayout.OmniboxSuggestionsList;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.chrome.test.util.OmniboxTestUtils;
import org.chromium.chrome.test.util.OmniboxTestUtils.SuggestionsResult;
@@ -41,6 +51,7 @@ import org.chromium.chrome.test.util.OmniboxTestUtils.TestSuggestionResultsBuild
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.KeyUtils;
+import org.chromium.content.browser.test.util.TouchCommon;
import org.chromium.content.browser.test.util.UiUtils;
import org.chromium.net.test.EmbeddedTestServer;
import org.chromium.ui.base.DeviceFormFactor;
@@ -56,15 +67,17 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Tests of the Omnibox.
*/
-public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
-
- public OmniboxTest() {
- super(ChromeActivity.class);
- }
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
+public class OmniboxTest {
+ @Rule
+ public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+ new ChromeActivityTestRule<>(ChromeActivity.class);
private void clearUrlBar() {
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
- assertNotNull(urlBar);
+ final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ Assert.assertNotNull(urlBar);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
@@ -78,40 +91,48 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
* Sanity check of Omnibox. The problem in http://b/5021723 would
* cause this to fail (hang or crash).
*/
+ @Test
@EnormousTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testSimpleUse() throws InterruptedException {
- typeInOmnibox("aaaaaaa", false);
+ mActivityTestRule.typeInOmnibox("aaaaaaa", false);
final LocationBarLayout locationBar =
- (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
+ (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
OmniboxTestUtils.waitForOmniboxSuggestions(locationBar);
- ChromeTabUtils.waitForTabPageLoadStart(getActivity().getActivityTab(), new Runnable() {
- @Override
- public void run() {
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
- KeyUtils.singleKeyEventView(getInstrumentation(), urlBar, KeyEvent.KEYCODE_ENTER);
- }
- }, ScalableTimeout.scaleTimeout(20));
+ ChromeTabUtils.waitForTabPageLoadStart(
+ mActivityTestRule.getActivity().getActivityTab(), new Runnable() {
+ @Override
+ public void run() {
+ final UrlBar urlBar =
+ (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ KeyUtils.singleKeyEventView(InstrumentationRegistry.getInstrumentation(),
+ urlBar, KeyEvent.KEYCODE_ENTER);
+ }
+ }, ScalableTimeout.scaleTimeout(20));
}
/**
* Test for checking whether soft input model switches with focus.
*/
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testFocusChangingSoftInputMode() throws InterruptedException {
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+ final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
CriteriaHelper.pollInstrumentationThread(Criteria.equals(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN, new Callable<Integer>() {
@Override
public Integer call() {
- return getActivity().getWindow().getAttributes().softInputMode;
+ return mActivityTestRule.getActivity()
+ .getWindow()
+ .getAttributes()
+ .softInputMode;
}
}));
@@ -120,7 +141,10 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE, new Callable<Integer>() {
@Override
public Integer call() {
- return getActivity().getWindow().getAttributes().softInputMode;
+ return mActivityTestRule.getActivity()
+ .getWindow()
+ .getAttributes()
+ .softInputMode;
}
}));
}
@@ -128,13 +152,14 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
/**
* Tests that focusing a url bar starts a zero suggest request.
*/
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testRequestZeroSuggestOnFocus() throws Exception {
final LocationBarLayout locationBar =
- (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+ (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
+ final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
ThreadUtils.runOnUiThreadBlocking(new Runnable(){
@Override
@@ -152,7 +177,7 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
locationBar.setAutocompleteController(controller);
}
});
- assertEquals("Should not have any zero suggest requests yet", 0,
+ Assert.assertEquals("Should not have any zero suggest requests yet", 0,
controller.numZeroSuggestRequests());
OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
@@ -164,23 +189,24 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
}
}));
- getInstrumentation().waitForIdleSync();
+ InstrumentationRegistry.getInstrumentation().waitForIdleSync();
- assertFalse(controller.isStartAutocompleteCalled());
+ Assert.assertFalse(controller.isStartAutocompleteCalled());
}
/**
* Tests that focusing a url bar starts a zero suggest request.
*/
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testRequestZeroSuggestAfterDelete() throws InterruptedException {
final LocationBarLayout locationBar =
- (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
- final ImageButton deleteButton = (ImageButton) getActivity().findViewById(
- R.id.delete_button);
+ (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
+ final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ final ImageButton deleteButton =
+ (ImageButton) mActivityTestRule.getActivity().findViewById(R.id.delete_button);
final OnSuggestionsReceivedListener emptySuggestionListener =
new OnSuggestionsReceivedListener() {
@@ -214,9 +240,9 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
// The click view below ends up clicking on the menu button underneath the delete button
// for some time after the delete button appears. Wait for UI to settle down before
// clicking.
- UiUtils.settleDownUI(getInstrumentation());
+ UiUtils.settleDownUI(InstrumentationRegistry.getInstrumentation());
- singleClickView(deleteButton);
+ TouchCommon.singleClickView(deleteButton);
CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
@Override
@@ -226,12 +252,13 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
}));
}
+ @Test
@MediumTest
@Feature({"Omnibox"})
public void testRequestZeroSuggestTypeAndBackspace() throws InterruptedException {
final LocationBarLayout locationBar =
- (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+ (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
+ final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
final OnSuggestionsReceivedListener emptySuggestionListener =
new OnSuggestionsReceivedListener() {
@@ -256,8 +283,9 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
}
});
- assertEquals("No calls to zero suggest yet", 0, controller.numZeroSuggestRequests());
- KeyUtils.singleKeyEventView(getInstrumentation(), urlBar, KeyEvent.KEYCODE_DEL);
+ Assert.assertEquals("No calls to zero suggest yet", 0, controller.numZeroSuggestRequests());
+ KeyUtils.singleKeyEventView(
+ InstrumentationRegistry.getInstrumentation(), urlBar, KeyEvent.KEYCODE_DEL);
CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
@Override
public Integer call() {
@@ -268,19 +296,21 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
// Sanity check that no text is displayed in the omnibox when on the NTP page and that the hint
// text is correct.
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testDefaultText() throws InterruptedException {
- startMainActivityFromLauncher();
+ mActivityTestRule.startMainActivityFromLauncher();
- final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+ final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
// Omnibox on NTP shows the hint text.
- assertNotNull(urlBar);
- assertEquals("Location bar has text.", "", urlBar.getText().toString());
- assertEquals("Location bar has incorrect hint.",
- getActivity().getResources().getString(R.string.search_or_type_url),
+ Assert.assertNotNull(urlBar);
+ Assert.assertEquals("Location bar has text.", "", urlBar.getText().toString());
+ Assert.assertEquals("Location bar has incorrect hint.",
+ mActivityTestRule.getActivity().getResources().getString(
+ R.string.search_or_type_url),
urlBar.getHint().toString());
// Type something in the omnibox.
@@ -293,30 +323,32 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
urlBar.setText("G");
}
});
- assertEquals("Location bar should have text.", "G", urlBar.getText().toString());
+ Assert.assertEquals("Location bar should have text.", "G", urlBar.getText().toString());
}
+ @Test
@MediumTest
@Feature({"Omnibox", "Main"})
@RetryOnFailure
- public void testAutoCompleteAndCorrectionLandscape() throws ExecutionException,
- InterruptedException {
+ public void testAutoCompleteAndCorrectionLandscape()
+ throws ExecutionException, InterruptedException {
// Default orientation for tablets is landscape. Default for phones is portrait.
int requestedOrientation = 1;
- if (DeviceFormFactor.isTablet(getActivity())) {
+ if (DeviceFormFactor.isTablet(mActivityTestRule.getActivity())) {
requestedOrientation = 0;
}
doTestAutoCompleteAndCorrectionForOrientation(requestedOrientation);
}
+ @Test
@MediumTest
@Feature({"Omnibox", "Main"})
@RetryOnFailure
- public void testAutoCompleteAndCorrectionPortrait() throws ExecutionException,
- InterruptedException {
+ public void testAutoCompleteAndCorrectionPortrait()
+ throws ExecutionException, InterruptedException {
// Default orientation for tablets is landscape. Default for phones is portrait.
int requestedOrientation = 0;
- if (DeviceFormFactor.isTablet(getActivity())) {
+ if (DeviceFormFactor.isTablet(mActivityTestRule.getActivity())) {
requestedOrientation = 1;
}
doTestAutoCompleteAndCorrectionForOrientation(requestedOrientation);
@@ -324,8 +356,8 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private void doTestAutoCompleteAndCorrectionForOrientation(
int orientation) throws ExecutionException, InterruptedException {
- getActivity().setRequestedOrientation(orientation);
- UiUtils.settleDownUI(getInstrumentation());
+ mActivityTestRule.getActivity().setRequestedOrientation(orientation);
+ UiUtils.settleDownUI(InstrumentationRegistry.getInstrumentation());
Map<String, List<SuggestionsResult>> suggestionsMap = buildSuggestionMap(
new TestSuggestionResultsBuilder()
@@ -361,6 +393,7 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
checkAutocompleteText(suggestionsMap, "mispellled", "mispellled", 10, 10);
}
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@@ -390,6 +423,7 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
checkAutocompleteText(suggestionsMap, "test", "testing", 4, 7);
}
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@@ -419,6 +453,7 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
checkAutocompleteText(suggestionsMap, "test", "testing for the win", 4, 19);
}
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@@ -453,8 +488,8 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
final String textToType, final String expectedAutocompleteText,
final int expectedAutocompleteStart, final int expectedAutocompleteEnd)
throws InterruptedException, ExecutionException {
-
- final TextView urlBarView = (TextView) getActivity().findViewById(R.id.url_bar);
+ final TextView urlBarView =
+ (TextView) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
@@ -464,7 +499,8 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
});
final LocationBarLayout locationBar =
- ((LocationBarLayout) getActivity().findViewById(R.id.location_bar));
+ ((LocationBarLayout) mActivityTestRule.getActivity().findViewById(
+ R.id.location_bar));
final Object suggestionsProcessedSignal = new Object();
final AtomicInteger suggestionsLeft = new AtomicInteger(
@@ -480,7 +516,7 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
if (remaining == 0) {
suggestionsProcessedSignal.notifyAll();
} else if (remaining < 0) {
- fail("Unexpected suggestions received");
+ Assert.fail("Unexpected suggestions received");
}
}
}
@@ -495,7 +531,8 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
}
});
- KeyUtils.typeTextIntoView(getInstrumentation(), urlBarView, textToType);
+ KeyUtils.typeTextIntoView(
+ InstrumentationRegistry.getInstrumentation(), urlBarView, textToType);
synchronized (suggestionsProcessedSignal) {
long endTime = SystemClock.uptimeMillis() + 3000;
@@ -512,10 +549,10 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
return urlBarView.getText();
}
});
- assertEquals("URL Bar text not autocompleted as expected.",
- expectedAutocompleteText, urlText.toString());
- assertEquals(expectedAutocompleteStart, Selection.getSelectionStart(urlText));
- assertEquals(expectedAutocompleteEnd, Selection.getSelectionEnd(urlText));
+ Assert.assertEquals("URL Bar text not autocompleted as expected.", expectedAutocompleteText,
+ urlText.toString());
+ Assert.assertEquals(expectedAutocompleteStart, Selection.getSelectionStart(urlText));
+ Assert.assertEquals(expectedAutocompleteEnd, Selection.getSelectionEnd(urlText));
}
/**
@@ -534,18 +571,18 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
for (int i = 0; i < 2; ++i) {
boolean instantOn = (i == 1);
- setNetworkPredictionEnabled(instantOn);
+ mActivityTestRule.setNetworkPredictionEnabled(instantOn);
for (int j = 0; j < 10; ++j) {
long before = System.currentTimeMillis();
- typeInOmnibox(text, true);
+ mActivityTestRule.typeInOmnibox(text, true);
if (instantOn) {
instantAverage += System.currentTimeMillis() - before;
} else {
noInstantAverage += System.currentTimeMillis() - before;
}
clearUrlBar();
- getInstrumentation().waitForIdleSync();
+ InstrumentationRegistry.getInstrumentation().waitForIdleSync();
}
}
instantAverage /= 10;
@@ -560,41 +597,44 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
* Test to verify security-icon "lock or globe" on visiting http and secured Urls.
* @EnormousTest
*/
+ @Test
@FlakyTest(message = "crbug.com/414353")
public void testSecurityIcon() throws InterruptedException {
EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartServer(
- getInstrumentation().getContext());
+ InstrumentationRegistry.getInstrumentation().getContext());
try {
final String testUrl = testServer.getURL("/chrome/test/data/android/omnibox/one.html");
final String securedExternalUrl = "https://www.google.com";
- ImageView navigationButton = (ImageView)
- getActivity().findViewById(R.id.navigation_button);
- ImageButton securityButton = (ImageButton)
- getActivity().findViewById(R.id.security_button);
+ ImageView navigationButton = (ImageView) mActivityTestRule.getActivity().findViewById(
+ R.id.navigation_button);
+ ImageButton securityButton = (ImageButton) mActivityTestRule.getActivity().findViewById(
+ R.id.security_button);
- loadUrl(testUrl);
+ mActivityTestRule.loadUrl(testUrl);
final LocationBarLayout locationBar =
- (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
+ (LocationBarLayout) mActivityTestRule.getActivity().findViewById(
+ R.id.location_bar);
boolean securityIcon = locationBar.isSecurityButtonShown();
- assertFalse("Omnibox should not have a Security icon", securityIcon);
- assertEquals("navigation_button with wrong resource-id",
- R.id.navigation_button, navigationButton.getId());
- assertTrue(navigationButton.isShown());
- assertFalse(securityButton.isShown());
+ Assert.assertFalse("Omnibox should not have a Security icon", securityIcon);
+ Assert.assertEquals("navigation_button with wrong resource-id", R.id.navigation_button,
+ navigationButton.getId());
+ Assert.assertTrue(navigationButton.isShown());
+ Assert.assertFalse(securityButton.isShown());
- loadUrl(securedExternalUrl);
+ mActivityTestRule.loadUrl(securedExternalUrl);
securityIcon = locationBar.isSecurityButtonShown();
- assertTrue("Omnibox should have a Security icon", securityIcon);
- assertEquals("security_button with wrong resource-id",
- R.id.security_button, securityButton.getId());
- assertTrue(securityButton.isShown());
- assertFalse(navigationButton.isShown());
+ Assert.assertTrue("Omnibox should have a Security icon", securityIcon);
+ Assert.assertEquals("security_button with wrong resource-id", R.id.security_button,
+ securityButton.getId());
+ Assert.assertTrue(securityButton.isShown());
+ Assert.assertFalse(navigationButton.isShown());
} finally {
testServer.stopAndDestroyServer();
}
}
+ @Test
@SmallTest
@RetryOnFailure
public void testSplitPathFromUrlDisplayText() {
@@ -649,16 +689,18 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private void verifySplitUrlAndPath(
String expectedPrePath, String expectedPostPath, Pair<String, String> actualValues) {
- assertEquals(expectedPrePath, actualValues.first);
- assertEquals(expectedPostPath, actualValues.second);
+ Assert.assertEquals(expectedPrePath, actualValues.first);
+ Assert.assertEquals(expectedPostPath, actualValues.second);
}
+ @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@MinAndroidSdkLevel(Build.VERSION_CODES.JELLY_BEAN_MR1)
public void testSuggestionDirectionSwitching() throws InterruptedException {
- final TextView urlBarView = (TextView) getActivity().findViewById(R.id.url_bar);
+ final TextView urlBarView =
+ (TextView) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
@@ -668,7 +710,8 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
});
final LocationBarLayout locationBar =
- ((LocationBarLayout) getActivity().findViewById(R.id.location_bar));
+ ((LocationBarLayout) mActivityTestRule.getActivity().findViewById(
+ R.id.location_bar));
Map<String, List<SuggestionsResult>> suggestionsMap = buildSuggestionMap(
new TestSuggestionResultsBuilder()
@@ -729,35 +772,31 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
verifyOmniboxSuggestionAlignment(locationBar, 3, View.LAYOUT_DIRECTION_LTR);
}
- private void verifyOmniboxSuggestionAlignment(
- final LocationBarLayout locationBar, final int expectedSuggestionCount,
- final int expectedLayoutDirection) throws InterruptedException {
+ private void verifyOmniboxSuggestionAlignment(final LocationBarLayout locationBar,
+ final int expectedSuggestionCount, final int expectedLayoutDirection) {
OmniboxTestUtils.waitForOmniboxSuggestions(locationBar, expectedSuggestionCount);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
OmniboxSuggestionsList suggestionsList = locationBar.getSuggestionList();
- assertEquals(expectedSuggestionCount, suggestionsList.getChildCount());
+ Assert.assertEquals(expectedSuggestionCount, suggestionsList.getChildCount());
for (int i = 0; i < suggestionsList.getChildCount(); i++) {
SuggestionView suggestionView = (SuggestionView) suggestionsList.getChildAt(i);
- assertEquals(
- String.format(
- Locale.getDefault(),
- "Incorrect layout direction of suggestion at index %d",
- i),
- expectedLayoutDirection,
- ViewCompat.getLayoutDirection(suggestionView));
+ Assert.assertEquals(
+ String.format(Locale.getDefault(),
+ "Incorrect layout direction of suggestion at index %d", i),
+ expectedLayoutDirection, ViewCompat.getLayoutDirection(suggestionView));
}
}
});
}
- @Override
- public void startMainActivity() throws InterruptedException {
- if (getName().equals("testsplitPathFromUrlDisplayText")
- || getName().equals("testDefaultText")) {
+ @Before
+ public void setUp() throws InterruptedException {
+ if (mActivityTestRule.getName().equals("testsplitPathFromUrlDisplayText")
+ || mActivityTestRule.getName().equals("testDefaultText")) {
return;
}
- startMainActivityOnBlankPage();
+ mActivityTestRule.startMainActivityOnBlankPage();
}
}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698