OLD | NEW |
---|---|
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.content.Context; | 7 import android.content.Context; |
8 import android.graphics.Point; | 8 import android.graphics.Point; |
9 import android.net.http.SslError; | 9 import android.net.http.SslError; |
10 import android.os.Build; | 10 import android.os.Build; |
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
368 @Override | 368 @Override |
369 protected void doEnsureSettingHasValue(Boolean value) throws Throwable { | 369 protected void doEnsureSettingHasValue(Boolean value) throws Throwable { |
370 loadDataSync(mGenerator.getPageSource()); | 370 loadDataSync(mGenerator.getPageSource()); |
371 assertEquals(value == ENABLED | 371 assertEquals(value == ENABLED |
372 ? ImagePageGenerator.IMAGE_LOADED_STRING | 372 ? ImagePageGenerator.IMAGE_LOADED_STRING |
373 : ImagePageGenerator.IMAGE_NOT_LOADED_STRING, | 373 : ImagePageGenerator.IMAGE_NOT_LOADED_STRING, |
374 getTitleOnUiThread()); | 374 getTitleOnUiThread()); |
375 } | 375 } |
376 } | 376 } |
377 | 377 |
378 | |
379 class AwSettingsImagesEnabledHelper extends AwSettingsTestHelper<Boolean> { | 378 class AwSettingsImagesEnabledHelper extends AwSettingsTestHelper<Boolean> { |
380 | 379 |
381 AwSettingsImagesEnabledHelper( | 380 AwSettingsImagesEnabledHelper( |
382 AwTestContainerView containerView, | 381 AwTestContainerView containerView, |
383 TestAwContentsClient contentViewClient, | 382 TestAwContentsClient contentViewClient, |
384 TestWebServer webServer, | 383 TestWebServer webServer, |
385 ImagePageGenerator generator) throws Throwable { | 384 ImagePageGenerator generator) throws Throwable { |
386 super(containerView, contentViewClient, true); | 385 super(containerView, contentViewClient, true); |
387 mWebServer = webServer; | 386 mWebServer = webServer; |
388 mGenerator = generator; | 387 mGenerator = generator; |
(...skipping 29 matching lines...) Expand all Loading... | |
418 assertEquals(value == ENABLED | 417 assertEquals(value == ENABLED |
419 ? ImagePageGenerator.IMAGE_LOADED_STRING | 418 ? ImagePageGenerator.IMAGE_LOADED_STRING |
420 : ImagePageGenerator.IMAGE_NOT_LOADED_STRING, | 419 : ImagePageGenerator.IMAGE_NOT_LOADED_STRING, |
421 getTitleOnUiThread()); | 420 getTitleOnUiThread()); |
422 } | 421 } |
423 | 422 |
424 private TestWebServer mWebServer; | 423 private TestWebServer mWebServer; |
425 private ImagePageGenerator mGenerator; | 424 private ImagePageGenerator mGenerator; |
426 } | 425 } |
427 | 426 |
428 class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<S tring> { | |
429 AwSettingsDefaultTextEncodingTestHelper( | |
430 AwTestContainerView containerView, | |
431 TestAwContentsClient contentViewClient) throws Throwable { | |
432 super(containerView, contentViewClient, true); | |
433 } | |
434 | |
435 @Override | |
436 protected String getAlteredValue() { | |
437 return "Latin-1"; | |
438 } | |
439 | |
440 @Override | |
441 protected String getInitialValue() { | |
442 return "UTF-8"; | |
443 } | |
444 | |
445 @Override | |
446 protected String getCurrentValue() { | |
447 return mAwSettings.getDefaultTextEncodingName(); | |
448 } | |
449 | |
450 @Override | |
451 protected void setCurrentValue(String value) { | |
452 mAwSettings.setDefaultTextEncodingName(value); | |
453 } | |
454 | |
455 @Override | |
456 protected void doEnsureSettingHasValue(String value) throws Throwable { | |
457 loadDataSync(getData()); | |
458 assertEquals(value, getTitleOnUiThread()); | |
459 } | |
460 | |
461 private String getData() { | |
462 return "<html><body onload='document.title=document.defaultCharset'> </body></html>"; | |
463 } | |
464 } | |
465 | |
466 class AwSettingsUserAgentStringTestHelper extends AwSettingsTestHelper<Strin g> { | 427 class AwSettingsUserAgentStringTestHelper extends AwSettingsTestHelper<Strin g> { |
467 private final String mDefaultUa; | 428 private final String mDefaultUa; |
468 private static final String DEFAULT_UA = ""; | 429 private static final String DEFAULT_UA = ""; |
469 private static final String CUSTOM_UA = "ChromeViewTest"; | 430 private static final String CUSTOM_UA = "ChromeViewTest"; |
470 | 431 |
471 AwSettingsUserAgentStringTestHelper( | 432 AwSettingsUserAgentStringTestHelper( |
472 AwTestContainerView containerView, | 433 AwTestContainerView containerView, |
473 TestAwContentsClient contentViewClient) throws Throwable { | 434 TestAwContentsClient contentViewClient) throws Throwable { |
474 super(containerView, contentViewClient, true); | 435 super(containerView, contentViewClient, true); |
475 mDefaultUa = mAwSettings.getUserAgentString(); | 436 mDefaultUa = mAwSettings.getUserAgentString(); |
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1584 poll(new Callable<Boolean>() { | 1545 poll(new Callable<Boolean>() { |
1585 @Override | 1546 @Override |
1586 public Boolean call() throws Exception { | 1547 public Boolean call() throws Exception { |
1587 return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals( | 1548 return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals( |
1588 getTitleOnUiThread(awContents)); | 1549 getTitleOnUiThread(awContents)); |
1589 } | 1550 } |
1590 }); | 1551 }); |
1591 assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread( awContents)); | 1552 assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread( awContents)); |
1592 } | 1553 } |
1593 | 1554 |
1594 | |
1595 @SmallTest | 1555 @SmallTest |
1596 @Feature({"AndroidWebView", "Preferences"}) | 1556 @Feature({"AndroidWebView", "Preferences"}) |
1597 public void testLoadsImagesAutomaticallyWithTwoViews() throws Throwable { | 1557 public void testLoadsImagesAutomaticallyWithTwoViews() throws Throwable { |
1598 ViewPair views = createViews(); | 1558 ViewPair views = createViews(); |
1599 runPerViewSettingsTest( | 1559 runPerViewSettingsTest( |
1600 new AwSettingsLoadImagesAutomaticallyTestHelper( | 1560 new AwSettingsLoadImagesAutomaticallyTestHelper( |
1601 views.getContainer0(), views.getClient0(), new ImagePageGene rator(0, true)), | 1561 views.getContainer0(), views.getClient0(), new ImagePageGene rator(0, true)), |
1602 new AwSettingsLoadImagesAutomaticallyTestHelper( | 1562 new AwSettingsLoadImagesAutomaticallyTestHelper( |
1603 views.getContainer1(), views.getClient1(), new ImagePageGene rator(1, true))); | 1563 views.getContainer1(), views.getClient1(), new ImagePageGene rator(1, true))); |
1604 } | 1564 } |
1605 | 1565 |
1606 @SmallTest | |
1607 @Feature({"AndroidWebView", "Preferences"}) | |
mnaganov (inactive)
2016/02/17 16:42:48
Please do not remove any code. I will rework the t
philipj_slow
2016/02/17 16:52:09
Thanks for the guidance, I've made that change. I
| |
1608 public void testDefaultTextEncodingWithTwoViews() throws Throwable { | |
1609 ViewPair views = createViews(); | |
1610 runPerViewSettingsTest( | |
1611 new AwSettingsDefaultTextEncodingTestHelper( | |
1612 views.getContainer0(), views.getClient0()), | |
1613 new AwSettingsDefaultTextEncodingTestHelper( | |
1614 views.getContainer1(), views.getClient1())); | |
1615 } | |
1616 | |
1617 // The test verifies that the default user agent string follows the format | 1566 // The test verifies that the default user agent string follows the format |
1618 // defined in Android CTS tests: | 1567 // defined in Android CTS tests: |
1619 // | 1568 // |
1620 // Mozilla/5.0 (Linux;[ U;] Android <version>;[ <language>-<country>;] | 1569 // Mozilla/5.0 (Linux;[ U;] Android <version>;[ <language>-<country>;] |
1621 // [<devicemodel>;] Build/<buildID>; wv) AppleWebKit/<major>.<minor> (KHTML, like Gecko) | 1570 // [<devicemodel>;] Build/<buildID>; wv) AppleWebKit/<major>.<minor> (KHTML, like Gecko) |
1622 // Version/<major>.<minor>[ Mobile] Safari/<major>.<minor> | 1571 // Version/<major>.<minor>[ Mobile] Safari/<major>.<minor> |
1623 @SmallTest | 1572 @SmallTest |
1624 @Feature({"AndroidWebView", "Preferences"}) | 1573 @Feature({"AndroidWebView", "Preferences"}) |
1625 public void testUserAgentStringDefault() throws Throwable { | 1574 public void testUserAgentStringDefault() throws Throwable { |
1626 final TestAwContentsClient contentClient = new TestAwContentsClient(); | 1575 final TestAwContentsClient contentClient = new TestAwContentsClient(); |
(...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3009 final AwContents awContents = webView.getAwContents(); | 2958 final AwContents awContents = webView.getAwContents(); |
3010 runTestOnUiThread(new Runnable() { | 2959 runTestOnUiThread(new Runnable() { |
3011 @Override | 2960 @Override |
3012 public void run() { | 2961 public void run() { |
3013 awContents.getContentViewCore().sendDoubleTapForTest( | 2962 awContents.getContentViewCore().sendDoubleTapForTest( |
3014 SystemClock.uptimeMillis(), x, y); | 2963 SystemClock.uptimeMillis(), x, y); |
3015 } | 2964 } |
3016 }); | 2965 }); |
3017 } | 2966 } |
3018 } | 2967 } |
OLD | NEW |