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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2853423003: Revert of Convert ChromeActivityTestCaseBase direct children to JUnit4 (Closed)
Patch Set: 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 27d459ee660b785da76160c73722ebe35b6d6576..1d00327090e7f321c5b0c8c41cc0aa1fdd4b365c 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,7 +8,6 @@
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;
@@ -21,14 +20,7 @@
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;
@@ -37,11 +29,9 @@
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.ChromeActivityTestRule;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.chrome.test.util.OmniboxTestUtils;
import org.chromium.chrome.test.util.OmniboxTestUtils.SuggestionsResult;
@@ -51,7 +41,6 @@
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;
@@ -67,17 +56,15 @@
/**
* Tests of the Omnibox.
*/
-@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);
+public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+
+ public OmniboxTest() {
+ super(ChromeActivity.class);
+ }
private void clearUrlBar() {
- final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
- Assert.assertNotNull(urlBar);
+ final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+ assertNotNull(urlBar);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
@@ -91,48 +78,40 @@
* 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 {
- mActivityTestRule.typeInOmnibox("aaaaaaa", false);
+ typeInOmnibox("aaaaaaa", false);
final LocationBarLayout locationBar =
- (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
+ (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
OmniboxTestUtils.waitForOmniboxSuggestions(locationBar);
- 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));
+ 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));
}
/**
* Test for checking whether soft input model switches with focus.
*/
- @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
public void testFocusChangingSoftInputMode() throws InterruptedException {
- final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ final UrlBar urlBar = (UrlBar) 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 mActivityTestRule.getActivity()
- .getWindow()
- .getAttributes()
- .softInputMode;
+ return getActivity().getWindow().getAttributes().softInputMode;
}
}));
@@ -141,10 +120,7 @@
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE, new Callable<Integer>() {
@Override
public Integer call() {
- return mActivityTestRule.getActivity()
- .getWindow()
- .getAttributes()
- .softInputMode;
+ return getActivity().getWindow().getAttributes().softInputMode;
}
}));
}
@@ -152,14 +128,13 @@
/**
* 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) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
- final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
+ final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
ThreadUtils.runOnUiThreadBlocking(new Runnable(){
@Override
@@ -177,7 +152,7 @@
locationBar.setAutocompleteController(controller);
}
});
- Assert.assertEquals("Should not have any zero suggest requests yet", 0,
+ assertEquals("Should not have any zero suggest requests yet", 0,
controller.numZeroSuggestRequests());
OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
@@ -189,24 +164,23 @@
}
}));
- InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
- Assert.assertFalse(controller.isStartAutocompleteCalled());
+ getInstrumentation().waitForIdleSync();
+
+ 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) 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);
+ (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);
final OnSuggestionsReceivedListener emptySuggestionListener =
new OnSuggestionsReceivedListener() {
@@ -240,9 +214,9 @@
// 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(InstrumentationRegistry.getInstrumentation());
-
- TouchCommon.singleClickView(deleteButton);
+ UiUtils.settleDownUI(getInstrumentation());
+
+ singleClickView(deleteButton);
CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
@Override
@@ -252,13 +226,12 @@
}));
}
- @Test
@MediumTest
@Feature({"Omnibox"})
public void testRequestZeroSuggestTypeAndBackspace() throws InterruptedException {
final LocationBarLayout locationBar =
- (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
- final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
+ final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
final OnSuggestionsReceivedListener emptySuggestionListener =
new OnSuggestionsReceivedListener() {
@@ -283,9 +256,8 @@
}
});
- Assert.assertEquals("No calls to zero suggest yet", 0, controller.numZeroSuggestRequests());
- KeyUtils.singleKeyEventView(
- InstrumentationRegistry.getInstrumentation(), urlBar, KeyEvent.KEYCODE_DEL);
+ assertEquals("No calls to zero suggest yet", 0, controller.numZeroSuggestRequests());
+ KeyUtils.singleKeyEventView(getInstrumentation(), urlBar, KeyEvent.KEYCODE_DEL);
CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
@Override
public Integer call() {
@@ -296,21 +268,19 @@
// 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 {
- mActivityTestRule.startMainActivityFromLauncher();
-
- final UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ startMainActivityFromLauncher();
+
+ final UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
// Omnibox on NTP shows the hint text.
- 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),
+ 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),
urlBar.getHint().toString());
// Type something in the omnibox.
@@ -323,32 +293,30 @@
urlBar.setText("G");
}
});
- Assert.assertEquals("Location bar should have text.", "G", urlBar.getText().toString());
- }
-
- @Test
+ assertEquals("Location bar should have text.", "G", urlBar.getText().toString());
+ }
+
@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(mActivityTestRule.getActivity())) {
+ if (DeviceFormFactor.isTablet(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(mActivityTestRule.getActivity())) {
+ if (DeviceFormFactor.isTablet(getActivity())) {
requestedOrientation = 1;
}
doTestAutoCompleteAndCorrectionForOrientation(requestedOrientation);
@@ -356,8 +324,8 @@
private void doTestAutoCompleteAndCorrectionForOrientation(
int orientation) throws ExecutionException, InterruptedException {
- mActivityTestRule.getActivity().setRequestedOrientation(orientation);
- UiUtils.settleDownUI(InstrumentationRegistry.getInstrumentation());
+ getActivity().setRequestedOrientation(orientation);
+ UiUtils.settleDownUI(getInstrumentation());
Map<String, List<SuggestionsResult>> suggestionsMap = buildSuggestionMap(
new TestSuggestionResultsBuilder()
@@ -393,7 +361,6 @@
checkAutocompleteText(suggestionsMap, "mispellled", "mispellled", 10, 10);
}
- @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@@ -423,7 +390,6 @@
checkAutocompleteText(suggestionsMap, "test", "testing", 4, 7);
}
- @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@@ -453,7 +419,6 @@
checkAutocompleteText(suggestionsMap, "test", "testing for the win", 4, 19);
}
- @Test
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@@ -488,8 +453,8 @@
final String textToType, final String expectedAutocompleteText,
final int expectedAutocompleteStart, final int expectedAutocompleteEnd)
throws InterruptedException, ExecutionException {
- final TextView urlBarView =
- (TextView) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+
+ final TextView urlBarView = (TextView) getActivity().findViewById(R.id.url_bar);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
@@ -499,8 +464,7 @@
});
final LocationBarLayout locationBar =
- ((LocationBarLayout) mActivityTestRule.getActivity().findViewById(
- R.id.location_bar));
+ ((LocationBarLayout) getActivity().findViewById(R.id.location_bar));
final Object suggestionsProcessedSignal = new Object();
final AtomicInteger suggestionsLeft = new AtomicInteger(
@@ -516,7 +480,7 @@
if (remaining == 0) {
suggestionsProcessedSignal.notifyAll();
} else if (remaining < 0) {
- Assert.fail("Unexpected suggestions received");
+ fail("Unexpected suggestions received");
}
}
}
@@ -531,8 +495,7 @@
}
});
- KeyUtils.typeTextIntoView(
- InstrumentationRegistry.getInstrumentation(), urlBarView, textToType);
+ KeyUtils.typeTextIntoView(getInstrumentation(), urlBarView, textToType);
synchronized (suggestionsProcessedSignal) {
long endTime = SystemClock.uptimeMillis() + 3000;
@@ -549,10 +512,10 @@
return urlBarView.getText();
}
});
- Assert.assertEquals("URL Bar text not autocompleted as expected.", expectedAutocompleteText,
- urlText.toString());
- Assert.assertEquals(expectedAutocompleteStart, Selection.getSelectionStart(urlText));
- Assert.assertEquals(expectedAutocompleteEnd, Selection.getSelectionEnd(urlText));
+ assertEquals("URL Bar text not autocompleted as expected.",
+ expectedAutocompleteText, urlText.toString());
+ assertEquals(expectedAutocompleteStart, Selection.getSelectionStart(urlText));
+ assertEquals(expectedAutocompleteEnd, Selection.getSelectionEnd(urlText));
}
/**
@@ -571,18 +534,18 @@
for (int i = 0; i < 2; ++i) {
boolean instantOn = (i == 1);
- mActivityTestRule.setNetworkPredictionEnabled(instantOn);
+ setNetworkPredictionEnabled(instantOn);
for (int j = 0; j < 10; ++j) {
long before = System.currentTimeMillis();
- mActivityTestRule.typeInOmnibox(text, true);
+ typeInOmnibox(text, true);
if (instantOn) {
instantAverage += System.currentTimeMillis() - before;
} else {
noInstantAverage += System.currentTimeMillis() - before;
}
clearUrlBar();
- InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+ getInstrumentation().waitForIdleSync();
}
}
instantAverage /= 10;
@@ -597,44 +560,41 @@
* 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(
- InstrumentationRegistry.getInstrumentation().getContext());
+ 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) mActivityTestRule.getActivity().findViewById(
- R.id.navigation_button);
- ImageButton securityButton = (ImageButton) mActivityTestRule.getActivity().findViewById(
- R.id.security_button);
-
- mActivityTestRule.loadUrl(testUrl);
+ ImageView navigationButton = (ImageView)
+ getActivity().findViewById(R.id.navigation_button);
+ ImageButton securityButton = (ImageButton)
+ getActivity().findViewById(R.id.security_button);
+
+ loadUrl(testUrl);
final LocationBarLayout locationBar =
- (LocationBarLayout) mActivityTestRule.getActivity().findViewById(
- R.id.location_bar);
+ (LocationBarLayout) getActivity().findViewById(R.id.location_bar);
boolean securityIcon = locationBar.isSecurityButtonShown();
- 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());
-
- mActivityTestRule.loadUrl(securedExternalUrl);
+ 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());
+
+ loadUrl(securedExternalUrl);
securityIcon = locationBar.isSecurityButtonShown();
- 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());
+ 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());
} finally {
testServer.stopAndDestroyServer();
}
}
- @Test
@SmallTest
@RetryOnFailure
public void testSplitPathFromUrlDisplayText() {
@@ -689,18 +649,16 @@
private void verifySplitUrlAndPath(
String expectedPrePath, String expectedPostPath, Pair<String, String> actualValues) {
- Assert.assertEquals(expectedPrePath, actualValues.first);
- Assert.assertEquals(expectedPostPath, actualValues.second);
- }
-
- @Test
+ assertEquals(expectedPrePath, actualValues.first);
+ assertEquals(expectedPostPath, actualValues.second);
+ }
+
@MediumTest
@Feature({"Omnibox"})
@RetryOnFailure
@MinAndroidSdkLevel(Build.VERSION_CODES.JELLY_BEAN_MR1)
public void testSuggestionDirectionSwitching() throws InterruptedException {
- final TextView urlBarView =
- (TextView) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ final TextView urlBarView = (TextView) getActivity().findViewById(R.id.url_bar);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
@@ -710,8 +668,7 @@
});
final LocationBarLayout locationBar =
- ((LocationBarLayout) mActivityTestRule.getActivity().findViewById(
- R.id.location_bar));
+ ((LocationBarLayout) getActivity().findViewById(R.id.location_bar));
Map<String, List<SuggestionsResult>> suggestionsMap = buildSuggestionMap(
new TestSuggestionResultsBuilder()
@@ -772,31 +729,35 @@
verifyOmniboxSuggestionAlignment(locationBar, 3, View.LAYOUT_DIRECTION_LTR);
}
- private void verifyOmniboxSuggestionAlignment(final LocationBarLayout locationBar,
- final int expectedSuggestionCount, final int expectedLayoutDirection) {
+ private void verifyOmniboxSuggestionAlignment(
+ final LocationBarLayout locationBar, final int expectedSuggestionCount,
+ final int expectedLayoutDirection) throws InterruptedException {
OmniboxTestUtils.waitForOmniboxSuggestions(locationBar, expectedSuggestionCount);
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
OmniboxSuggestionsList suggestionsList = locationBar.getSuggestionList();
- Assert.assertEquals(expectedSuggestionCount, suggestionsList.getChildCount());
+ assertEquals(expectedSuggestionCount, suggestionsList.getChildCount());
for (int i = 0; i < suggestionsList.getChildCount(); i++) {
SuggestionView suggestionView = (SuggestionView) suggestionsList.getChildAt(i);
- Assert.assertEquals(
- String.format(Locale.getDefault(),
- "Incorrect layout direction of suggestion at index %d", i),
- expectedLayoutDirection, ViewCompat.getLayoutDirection(suggestionView));
+ assertEquals(
+ String.format(
+ Locale.getDefault(),
+ "Incorrect layout direction of suggestion at index %d",
+ i),
+ expectedLayoutDirection,
+ ViewCompat.getLayoutDirection(suggestionView));
}
}
});
}
- @Before
- public void setUp() throws InterruptedException {
- if (mActivityTestRule.getName().equals("testsplitPathFromUrlDisplayText")
- || mActivityTestRule.getName().equals("testDefaultText")) {
+ @Override
+ public void startMainActivity() throws InterruptedException {
+ if (getName().equals("testsplitPathFromUrlDisplayText")
+ || getName().equals("testDefaultText")) {
return;
}
- mActivityTestRule.startMainActivityOnBlankPage();
+ 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