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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java

Issue 568873002: Start server thread in new TestWebServer.start() method rather than constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: silence findbugs static assignment warning Created 6 years, 3 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 | « android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java ('k') | net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java
index 086efd10eb19d357630a2f144b55b38b01b02025..f304b05c951f06657d2a364c691c6f60bfb3a05c 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java
@@ -174,48 +174,45 @@ public class TransitionTest extends ContentShellTestBase {
*/
@SmallTest
public void testAddStylesheetToTransitionCalled() throws Throwable {
- TestWebServer webServer = null;
+ TestWebServer webServer = TestWebServer.start();
try {
- webServer = new TestWebServer(false);
-
- final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
- ContentShellActivity activity = launchContentShellWithUrl(url2);
- waitForActiveShellToBeDoneLoading();
- ContentViewCore contentViewCore = activity.getActiveContentViewCore();
- TestCallbackHelperContainer testCallbackHelperContainer =
- new TestCallbackHelperContainer(contentViewCore);
- contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
- TestNavigationTransitionDelegate delegate =
- new TestNavigationTransitionDelegate(contentViewCore, true);
- contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
-
- int currentCallCount = testCallbackHelperContainer
- .getOnPageFinishedHelper().getCallCount();
- String[] headers = {
- "link",
- "<transition0.css>;rel=transition-entering-stylesheet;scope=*",
- "link",
- "<transition1.css>;rel=transition-entering-stylesheet;scope=*",
- "link",
- "<transition2.css>;rel=transition-entering-stylesheet;scope=*"
- };
- final String url3 = webServer.setResponse(URL_3,
- URL_3_DATA,
- createHeadersList(headers));
- LoadUrlParams url3_params = new LoadUrlParams(url3);
- loadUrl(contentViewCore, testCallbackHelperContainer, url3_params);
- testCallbackHelperContainer.getOnPageFinishedHelper().waitForCallback(
- currentCallCount,
- 1,
- 10000,
- TimeUnit.MILLISECONDS);
-
- assertTrue("addStylesheetToTransition called.",
- delegate.getDidCallAddStylesheet());
- assertTrue("Three stylesheets are added",
- delegate.getTransitionStylesheets().size() == 3);
+ final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
+ ContentShellActivity activity = launchContentShellWithUrl(url2);
+ waitForActiveShellToBeDoneLoading();
+ ContentViewCore contentViewCore = activity.getActiveContentViewCore();
+ TestCallbackHelperContainer testCallbackHelperContainer =
+ new TestCallbackHelperContainer(contentViewCore);
+ contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
+ TestNavigationTransitionDelegate delegate =
+ new TestNavigationTransitionDelegate(contentViewCore, true);
+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
+
+ int currentCallCount = testCallbackHelperContainer
+ .getOnPageFinishedHelper().getCallCount();
+ String[] headers = {
+ "link",
+ "<transition0.css>;rel=transition-entering-stylesheet;scope=*",
+ "link",
+ "<transition1.css>;rel=transition-entering-stylesheet;scope=*",
+ "link",
+ "<transition2.css>;rel=transition-entering-stylesheet;scope=*"
+ };
+ final String url3 = webServer.setResponse(URL_3,
+ URL_3_DATA,
+ createHeadersList(headers));
+ LoadUrlParams url3_params = new LoadUrlParams(url3);
+ loadUrl(contentViewCore, testCallbackHelperContainer, url3_params);
+ testCallbackHelperContainer.getOnPageFinishedHelper().waitForCallback(
+ currentCallCount,
+ 1,
+ 10000,
+ TimeUnit.MILLISECONDS);
+
+ assertTrue("addStylesheetToTransition called.",
+ delegate.getDidCallAddStylesheet());
+ assertTrue("Three stylesheets are added",
+ delegate.getTransitionStylesheets().size() == 3);
} finally {
- if (webServer != null)
webServer.shutdown();
}
}
@@ -226,38 +223,35 @@ public class TransitionTest extends ContentShellTestBase {
*/
@SmallTest
public void testAddStylesheetToTransitionNotCalled() throws Throwable {
- TestWebServer webServer = null;
+ TestWebServer webServer = TestWebServer.start();
try {
- webServer = new TestWebServer(false);
-
- final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
- ContentShellActivity activity = launchContentShellWithUrl(url2);
- waitForActiveShellToBeDoneLoading();
- ContentViewCore contentViewCore = activity.getActiveContentViewCore();
- TestCallbackHelperContainer testCallbackHelperContainer =
- new TestCallbackHelperContainer(contentViewCore);
- contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
- TestNavigationTransitionDelegate delegate =
- new TestNavigationTransitionDelegate(contentViewCore, true);
- contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
-
- int currentCallCount = testCallbackHelperContainer
- .getOnPageFinishedHelper().getCallCount();
- final String url3 = webServer.setResponse(URL_3, URL_3_DATA, null);
- LoadUrlParams url3_params = new LoadUrlParams(url3);
- loadUrl(contentViewCore, testCallbackHelperContainer, url3_params);
- testCallbackHelperContainer.getOnPageFinishedHelper().waitForCallback(
- currentCallCount,
- 1,
- 10000,
- TimeUnit.MILLISECONDS);
-
- assertFalse("addStylesheetToTransition is not called.",
- delegate.getDidCallAddStylesheet());
- assertTrue("No stylesheets are added",
- delegate.getTransitionStylesheets().size() == 0);
+ final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
+ ContentShellActivity activity = launchContentShellWithUrl(url2);
+ waitForActiveShellToBeDoneLoading();
+ ContentViewCore contentViewCore = activity.getActiveContentViewCore();
+ TestCallbackHelperContainer testCallbackHelperContainer =
+ new TestCallbackHelperContainer(contentViewCore);
+ contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
+ TestNavigationTransitionDelegate delegate =
+ new TestNavigationTransitionDelegate(contentViewCore, true);
+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
+
+ int currentCallCount = testCallbackHelperContainer
+ .getOnPageFinishedHelper().getCallCount();
+ final String url3 = webServer.setResponse(URL_3, URL_3_DATA, null);
+ LoadUrlParams url3_params = new LoadUrlParams(url3);
+ loadUrl(contentViewCore, testCallbackHelperContainer, url3_params);
+ testCallbackHelperContainer.getOnPageFinishedHelper().waitForCallback(
+ currentCallCount,
+ 1,
+ 10000,
+ TimeUnit.MILLISECONDS);
+
+ assertFalse("addStylesheetToTransition is not called.",
+ delegate.getDidCallAddStylesheet());
+ assertTrue("No stylesheets are added",
+ delegate.getTransitionStylesheets().size() == 0);
} finally {
- if (webServer != null)
webServer.shutdown();
}
}
@@ -268,10 +262,8 @@ public class TransitionTest extends ContentShellTestBase {
*/
@SmallTest
public void testParseTransitionEnteringColor() throws Throwable {
- TestWebServer webServer = null;
+ TestWebServer webServer = TestWebServer.start();
try {
- webServer = new TestWebServer(false);
-
final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
ContentShellActivity activity = launchContentShellWithUrl(url2);
waitForActiveShellToBeDoneLoading();
@@ -307,7 +299,7 @@ public class TransitionTest extends ContentShellTestBase {
delegate.getTransitionEnteringColor(),
transitionEnteringColor));
} finally {
- if (webServer != null) webServer.shutdown();
+ webServer.shutdown();
}
}
}
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java ('k') | net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698