Commit c289f118 authored by Christian Dullweber's avatar Christian Dullweber Committed by Chromium LUCI CQ

Batch BrowsingDataTest

Bug: 1146211
Change-Id: Idc792f4e5dc5f89494b8b3a978fb912c3a545bf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2632962
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Auto-Submit: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845606}
parent 938255b9
...@@ -4,21 +4,22 @@ ...@@ -4,21 +4,22 @@
package org.chromium.chrome.browser.browsing_data; package org.chromium.chrome.browser.browsing_data;
import android.support.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule; import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule;
import org.chromium.content_public.browser.test.util.JavaScriptUtils; import org.chromium.content_public.browser.test.util.JavaScriptUtils;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.net.test.EmbeddedTestServer; import org.chromium.net.test.EmbeddedTestServer;
...@@ -32,19 +33,23 @@ import java.util.concurrent.TimeoutException; ...@@ -32,19 +33,23 @@ import java.util.concurrent.TimeoutException;
*/ */
@RunWith(ChromeJUnit4ClassRunner.class) @RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
@Batch(Batch.PER_CLASS)
public class BrowsingDataTest { public class BrowsingDataTest {
private static final String TEST_FILE = "/content/test/data/browsing_data/site_data.html"; private static final String TEST_FILE = "/content/test/data/browsing_data/site_data.html";
private EmbeddedTestServer mTestServer; private EmbeddedTestServer mTestServer;
private String mUrl; private String mUrl;
@Rule @ClassRule
public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule(); public static ChromeTabbedActivityTestRule sActivityTestRule =
new ChromeTabbedActivityTestRule();
@Rule
public BlankCTATabInitialStateRule mBlankCTATabInitialStateRule =
new BlankCTATabInitialStateRule(sActivityTestRule, false);
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mActivityTestRule.startMainActivityOnBlankPage(); mTestServer = sActivityTestRule.getTestServer();
mTestServer = EmbeddedTestServer.createAndStartServer(InstrumentationRegistry.getContext());
mUrl = mTestServer.getURL(TEST_FILE); mUrl = mTestServer.getURL(TEST_FILE);
} }
...@@ -80,7 +85,7 @@ public class BrowsingDataTest { ...@@ -80,7 +85,7 @@ public class BrowsingDataTest {
private String runJavascriptAsync(String type) throws Exception { private String runJavascriptAsync(String type) throws Exception {
return JavaScriptUtils.runJavascriptWithAsyncResult( return JavaScriptUtils.runJavascriptWithAsyncResult(
mActivityTestRule.getWebContents(), type); sActivityTestRule.getWebContents(), type);
} }
/** /**
...@@ -90,7 +95,7 @@ public class BrowsingDataTest { ...@@ -90,7 +95,7 @@ public class BrowsingDataTest {
@SmallTest @SmallTest
public void testCookiesDeleted() throws Exception { public void testCookiesDeleted() throws Exception {
Assert.assertEquals(0, getCookieCount()); Assert.assertEquals(0, getCookieCount());
mActivityTestRule.loadUrl(mUrl); sActivityTestRule.loadUrl(mUrl);
Assert.assertEquals("false", runJavascriptAsync("hasCookie()")); Assert.assertEquals("false", runJavascriptAsync("hasCookie()"));
runJavascriptAsync("setCookie()"); runJavascriptAsync("setCookie()");
...@@ -111,7 +116,7 @@ public class BrowsingDataTest { ...@@ -111,7 +116,7 @@ public class BrowsingDataTest {
// TODO(dullweber): Investigate, why WebSql fails this test. // TODO(dullweber): Investigate, why WebSql fails this test.
List<String> siteData = Arrays.asList("LocalStorage", "ServiceWorker", "CacheStorage", List<String> siteData = Arrays.asList("LocalStorage", "ServiceWorker", "CacheStorage",
"IndexedDb", "FileSystem" /*, "WebSql"*/); "IndexedDb", "FileSystem" /*, "WebSql"*/);
mActivityTestRule.loadUrl(mUrl); sActivityTestRule.loadUrl(mUrl);
for (String type : siteData) { for (String type : siteData) {
Assert.assertEquals(type, 0, getCookieCount()); Assert.assertEquals(type, 0, getCookieCount());
...@@ -158,7 +163,7 @@ public class BrowsingDataTest { ...@@ -158,7 +163,7 @@ public class BrowsingDataTest {
@SmallTest @SmallTest
public void testHistoryDeleted() throws Exception { public void testHistoryDeleted() throws Exception {
Assert.assertEquals(0, getCookieCount()); Assert.assertEquals(0, getCookieCount());
mActivityTestRule.loadUrlInNewTab(mUrl); sActivityTestRule.loadUrlInNewTab(mUrl);
Assert.assertEquals("false", runJavascriptAsync("hasHistory()")); Assert.assertEquals("false", runJavascriptAsync("hasHistory()"));
runJavascriptAsync("setHistory()"); runJavascriptAsync("setHistory()");
......
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