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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/chrome_apk.gyp ('k') | chrome/android/shell/chrome_shell_test_entry_point.cc » ('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/TabsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
index 71906128054771056a3fa51fc7bb0697f7781cb4..d3edb6036e6797bbb8567328a3247397cf507e00 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
@@ -10,6 +10,7 @@ import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_PHONE;
import android.content.DialogInterface;
import android.content.pm.ActivityInfo;
import android.os.Debug;
+import android.os.Environment;
import android.os.SystemClock;
import android.test.FlakyTest;
import android.test.suitebuilder.annotation.LargeTest;
@@ -21,9 +22,9 @@ import android.view.View;
import junit.framework.Assert;
-import org.chromium.base.CommandLine;
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.SuppressFBWarnings;
+import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.Restriction;
@@ -54,7 +55,6 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.chrome.test.util.MenuUtils;
import org.chromium.chrome.test.util.OverviewModeBehaviorWatcher;
-import org.chromium.chrome.test.util.TestHttpServerClient;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.CallbackHelper;
import org.chromium.content.browser.test.util.Criteria;
@@ -64,6 +64,7 @@ import org.chromium.content.browser.test.util.UiUtils;
import org.chromium.content.common.ContentSwitches;
import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.browser.WebContentsObserver;
+import org.chromium.net.test.EmbeddedTestServer;
import java.util.Locale;
import java.util.concurrent.Callable;
@@ -77,8 +78,11 @@ import java.util.concurrent.atomic.AtomicReference;
*/
public class TabsTest extends ChromeTabbedActivityTestBase {
- private static final String TEST_FILE_PATH = "chrome/test/data/android/tabstest/tabs_test.html";
- private static final String TEST_PAGE_FILE_PATH = "chrome/test/data/google/google.html";
+ private static final String TEST_FILE_PATH =
+ "/chrome/test/data/android/tabstest/tabs_test.html";
+ private static final String TEST_PAGE_FILE_PATH = "/chrome/test/data/google/google.html";
+
+ private EmbeddedTestServer mTestServer;
private float mPxToDp = 1.0f;
private float mTabsViewHeightDp;
@@ -106,6 +110,21 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
+ " <div id=\"test\">No resize event has been received yet.</div>"
+ "</body></html>");
+ public TabsTest() {
+ mSkipCheckHttpServer = true;
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (mTestServer != null) EmbeddedTestServer.stopAndDestroyServer(mTestServer);
+ super.tearDown();
+ }
+
/**
* Verify that spawning a popup from a background tab in a different model works properly.
* @throws InterruptedException
@@ -114,8 +133,11 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
@LargeTest
@Feature({"Navigation"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
+ @CommandLineFlags.Add(ContentSwitches.DISABLE_POPUP_BLOCKING)
public void testSpawnPopupOnBackgroundTab() throws InterruptedException, TimeoutException {
- loadUrl(UrlUtils.getIsolatedTestFileUrl(TEST_FILE_PATH));
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
+ loadUrl(mTestServer.getURL(TEST_FILE_PATH));
final Tab tab = getActivity().getActivityTab();
newIncognitoTabFromMenu();
@@ -142,8 +164,10 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
@MediumTest
public void testAlertDialogDoesNotChangeActiveModel() throws InterruptedException {
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
newIncognitoTabFromMenu();
- loadUrl(UrlUtils.getIsolatedTestFileUrl(TEST_FILE_PATH));
+ loadUrl(mTestServer.getURL(TEST_FILE_PATH));
final Tab tab = getActivity().getActivityTab();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
@@ -199,7 +223,9 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
*/
@DisabledTest
public void testOpenAndCloseNewTabButton() throws InterruptedException {
- startMainActivityWithURL(UrlUtils.getIsolatedTestFileUrl(TEST_FILE_PATH));
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
+ startMainActivityWithURL(mTestServer.getURL(TEST_FILE_PATH));
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
@@ -407,8 +433,10 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
*/
@FlakyTest
public void testOpenManyTabsInBursts() throws InterruptedException {
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
final int burstSize = 5;
- final String url = TestHttpServerClient.getUrl(TEST_PAGE_FILE_PATH);
+ final String url = mTestServer.getURL(TEST_PAGE_FILE_PATH);
final int startCount = getActivity().getCurrentTabModel().getCount();
for (int tabCount = startCount; tabCount < STRESSFUL_TAB_COUNT; tabCount += burstSize) {
loadUrlInManyNewTabs(url, burstSize);
@@ -435,7 +463,9 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
* tab loads when selected.
*/
private void openAndVerifyManyTestTabs(final int num) throws InterruptedException {
- final String url = TestHttpServerClient.getUrl(TEST_PAGE_FILE_PATH);
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
+ final String url = mTestServer.getURL(TEST_PAGE_FILE_PATH);
int startCount = getActivity().getCurrentTabModel().getCount();
loadUrlInManyNewTabs(url, num);
assertEquals(startCount + num,
@@ -893,7 +923,9 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
@Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@Feature({"Android-TabSwitcher", "Main"})
public void testCloseTabPortrait() throws InterruptedException {
- startMainActivityWithURL(TestHttpServerClient.getUrl("chrome/test/data/android/test.html"));
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
+ startMainActivityWithURL(mTestServer.getURL("/chrome/test/data/android/test.html"));
getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -916,7 +948,9 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
@Feature({"Android-TabSwitcher", "Main"})
@Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
public void testCloseTabLandscape() throws InterruptedException {
- startMainActivityWithURL(TestHttpServerClient.getUrl("chrome/test/data/android/test.html"));
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
+ startMainActivityWithURL(mTestServer.getURL("/chrome/test/data/android/test.html"));
getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
@@ -1088,8 +1122,10 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
@SmallTest
@Feature({"Android-TabSwitcher"})
public void testCloseTabDuringFling() throws InterruptedException {
- loadUrlInNewTab(TestHttpServerClient.getUrl(
- "chrome/test/data/android/tabstest/text_page.html"));
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
+ loadUrlInNewTab(mTestServer.getURL(
+ "/chrome/test/data/android/tabstest/text_page.html"));
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
@@ -1108,10 +1144,12 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
*/
@FlakyTest
public void testQuickSwitchBetweenTabAndSwitcherMode() throws InterruptedException {
+ mTestServer = EmbeddedTestServer.createAndStartFileServer(
+ Environment.getExternalStorageDirectory());
final String[] urls = {
- TestHttpServerClient.getUrl("chrome/test/data/android/navigate/one.html"),
- TestHttpServerClient.getUrl("chrome/test/data/android/navigate/two.html"),
- TestHttpServerClient.getUrl("chrome/test/data/android/navigate/three.html")};
+ mTestServer.getURL("/chrome/test/data/android/navigate/one.html"),
+ mTestServer.getURL("/chrome/test/data/android/navigate/two.html"),
+ mTestServer.getURL("/chrome/test/data/android/navigate/three.html")};
for (String url : urls) {
loadUrlInNewTab(url);
@@ -1607,10 +1645,6 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
|| getName().equals("testTabsAreDestroyedOnModelDestruction")) {
return;
}
-
- if (getName().equals("testSpawnPopupOnBackgroundTab")) {
- CommandLine.getInstance().appendSwitch(ContentSwitches.DISABLE_POPUP_BLOCKING);
- }
startMainActivityFromLauncher();
}
}
« no previous file with comments | « chrome/android/chrome_apk.gyp ('k') | chrome/android/shell/chrome_shell_test_entry_point.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698