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

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

Issue 2933623002: Create AwJUnit4ClassRunner AwActivityTestRule and convert AwContentsTest (Closed)
Patch Set: address bo's comments Created 3 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.android_webview.test; 5 package org.chromium.android_webview.test;
6 6
7 import android.support.test.filters.SmallTest; 7 import android.support.test.filters.SmallTest;
8 import android.util.Pair; 8 import android.util.Pair;
9 9
10 import org.json.JSONArray; 10 import org.json.JSONArray;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extr aHeaders[2]); 281 mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extr aHeaders[2]);
282 final String initialUrl = 282 final String initialUrl =
283 mTestServer.getURL("/click-redirect?url=" + encodeUrl(redirected Url) 283 mTestServer.getURL("/click-redirect?url=" + encodeUrl(redirected Url)
284 + "&header=" + extraHeaders[0] + "&header=" + extraHeade rs[2]); 284 + "&header=" + extraHeaders[0] + "&header=" + extraHeade rs[2]);
285 285
286 loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinished Helper(), 286 loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinished Helper(),
287 initialUrl, createHeadersMap(extraHeaders)); 287 initialUrl, createHeadersMap(extraHeaders));
288 validateHeadersValue(awContents, contentsClient, extraHeaders, true); 288 validateHeadersValue(awContents, contentsClient, extraHeaders, true);
289 289
290 int currentCallCount = contentsClient.getOnPageFinishedHelper().getCallC ount(); 290 int currentCallCount = contentsClient.getOnPageFinishedHelper().getCallC ount();
291 JSUtils.clickOnLinkUsingJs( 291 JSUtils.clickOnLinkUsingJs(getInstrumentation(), awContents,
292 this, awContents, contentsClient.getOnEvaluateJavaScriptResultHe lper(), "click"); 292 contentsClient.getOnEvaluateJavaScriptResultHelper(), "click");
293 contentsClient.getOnPageFinishedHelper().waitForCallback( 293 contentsClient.getOnPageFinishedHelper().waitForCallback(
294 currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS); 294 currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
295 // No extra headers for the page navigated via clicking. 295 // No extra headers for the page navigated via clicking.
296 validateHeadersValue(awContents, contentsClient, extraHeaders, false); 296 validateHeadersValue(awContents, contentsClient, extraHeaders, false);
297 297
298 HistoryUtils.goBackSync(getInstrumentation(), awContents.getWebContents( ), 298 HistoryUtils.goBackSync(getInstrumentation(), awContents.getWebContents( ),
299 contentsClient.getOnPageFinishedHelper()); 299 contentsClient.getOnPageFinishedHelper());
300 validateHeadersValue(awContents, contentsClient, extraHeaders, true); 300 validateHeadersValue(awContents, contentsClient, extraHeaders, true);
301 } 301 }
302 302
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 webServer.setResponse("/page.html", CommonResources.ABOUT_HT ML, null); 405 webServer.setResponse("/page.html", CommonResources.ABOUT_HT ML, null);
406 onReceivedTitleCallCount = onReceivedTitleHelper.getCallCount(); 406 onReceivedTitleCallCount = onReceivedTitleHelper.getCallCount();
407 loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ur l); 407 loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ur l);
408 onReceivedTitleHelper.waitForCallback(onReceivedTitleCallCount); 408 onReceivedTitleHelper.waitForCallback(onReceivedTitleCallCount);
409 assertEquals(CommonResources.ABOUT_TITLE, onReceivedTitleHelper.getT itle()); 409 assertEquals(CommonResources.ABOUT_TITLE, onReceivedTitleHelper.getT itle());
410 } finally { 410 } finally {
411 webServer.shutdown(); 411 webServer.shutdown();
412 } 412 }
413 } 413 }
414 } 414 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698