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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 13907007: Replace merge-ui-and-compositor-threads flag with no-merge-ui-and-compositor-threads flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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.os.Build; 8 import android.os.Build;
9 import android.os.SystemClock; 9 import android.os.SystemClock;
10 import android.test.suitebuilder.annotation.LargeTest; 10 import android.test.suitebuilder.annotation.LargeTest;
(...skipping 2336 matching lines...) Expand 10 before | Expand all | Expand 10 after
2347 assertTrue("Expected: >= 980 , Actual: " + actualWidth, actualWidth >= 9 80); 2347 assertTrue("Expected: >= 980 , Actual: " + actualWidth, actualWidth >= 9 80);
2348 loadDataSync(awContents, onPageFinishedHelper, pageViewportDeviceWidth, "text/html", false); 2348 loadDataSync(awContents, onPageFinishedHelper, pageViewportDeviceWidth, "text/html", false);
2349 actualWidth = Integer.parseInt(getTitleOnUiThread(awContents)); 2349 actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
2350 assertTrue("Expected: " + displayWidth + ", Actual: " + actualWidth, 2350 assertTrue("Expected: " + displayWidth + ", Actual: " + actualWidth,
2351 Math.abs(displayWidth - actualWidth) <= 1); 2351 Math.abs(displayWidth - actualWidth) <= 1);
2352 loadDataSync( 2352 loadDataSync(
2353 awContents, onPageFinishedHelper, pageViewportSpecifiedWidth, "t ext/html", false); 2353 awContents, onPageFinishedHelper, pageViewportSpecifiedWidth, "t ext/html", false);
2354 assertEquals(viewportTagSpecifiedWidth, getTitleOnUiThread(awContents)); 2354 assertEquals(viewportTagSpecifiedWidth, getTitleOnUiThread(awContents));
2355 } 2355 }
2356 2356
2357 /*
2357 @MediumTest 2358 @MediumTest
2358 @Feature({"AndroidWebView", "Preferences"}) 2359 @Feature({"AndroidWebView", "Preferences"})
2360 http://crbug.com/239144
2361 */
2362 @DisabledTest
2359 public void testUseWideViewportControlsDoubleTabToZoom() throws Throwable { 2363 public void testUseWideViewportControlsDoubleTabToZoom() throws Throwable {
2360 final TestAwContentsClient contentClient = new TestAwContentsClient(); 2364 final TestAwContentsClient contentClient = new TestAwContentsClient();
2361 final AwTestContainerView testContainerView = 2365 final AwTestContainerView testContainerView =
2362 createAwTestContainerViewOnMainSync(contentClient); 2366 createAwTestContainerViewOnMainSync(contentClient);
2363 final AwContents awContents = testContainerView.getAwContents(); 2367 final AwContents awContents = testContainerView.getAwContents();
2364 AwSettings settings = getAwSettingsOnUiThread(awContents); 2368 AwSettings settings = getAwSettingsOnUiThread(awContents);
2365 CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHel per(); 2369 CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHel per();
2366 2370
2367 final String page = "<html><body>Page Text</body></html>"; 2371 final String page = "<html><body>Page Text</body></html>";
2368 assertFalse(settings.getUseWideViewPort()); 2372 assertFalse(settings.getUseWideViewPort());
2369 loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false) ; 2373 loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false) ;
2370 final float initialScale = getScaleOnUiThread(awContents); 2374 final float initialScale = getScaleOnUiThread(awContents);
2371 simulateDoubleTapCenterOfWebViewOnUiThread(testContainerView); 2375 simulateDoubleTapCenterOfWebViewOnUiThread(testContainerView);
2372 Thread.sleep(1000); 2376 Thread.sleep(1000);
2373 assertEquals(initialScale, getScaleOnUiThread(awContents)); 2377 assertEquals(initialScale, getScaleOnUiThread(awContents));
2374 2378
2375 settings.setUseWideViewPort(true); 2379 settings.setUseWideViewPort(true);
2376 loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false) ; 2380 loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false) ;
2377 int onScaleChangedCallCount = contentClient.getOnScaleChangedHelper().ge tCallCount(); 2381 int onScaleChangedCallCount = contentClient.getOnScaleChangedHelper().ge tCallCount();
2378 simulateDoubleTapCenterOfWebViewOnUiThread(testContainerView); 2382 simulateDoubleTapCenterOfWebViewOnUiThread(testContainerView);
2379 contentClient.getOnScaleChangedHelper().waitForCallback(onScaleChangedCa llCount); 2383 contentClient.getOnScaleChangedHelper().waitForCallback(onScaleChangedCa llCount);
2380 final float zoomedOutScale = getScaleOnUiThread(awContents); 2384 final float zoomedOutScale = getScaleOnUiThread(awContents);
2381 assertTrue("zoomedOut: " + zoomedOutScale + ", initial: " + initialScale , 2385 assertTrue("zoomedOut: " + zoomedOutScale + ", initial: " + initialScale ,
2382 zoomedOutScale < initialScale); 2386 zoomedOutScale < initialScale);
2383 } 2387 }
2384 2388
2389 /*
2385 @SmallTest 2390 @SmallTest
2386 @Feature({"AndroidWebView", "Preferences"}) 2391 @Feature({"AndroidWebView", "Preferences"})
2392 http://crbug.com/239144
2393 */
2394 @DisabledTest
2387 public void testLoadWithOverviewModeWithTwoViews() throws Throwable { 2395 public void testLoadWithOverviewModeWithTwoViews() throws Throwable {
2388 ViewPair views = createViews(); 2396 ViewPair views = createViews();
2389 runPerViewSettingsTest( 2397 runPerViewSettingsTest(
2390 new AwSettingsLoadWithOverviewModeTestHelper( 2398 new AwSettingsLoadWithOverviewModeTestHelper(
2391 views.getContents0(), views.getClient0(), false), 2399 views.getContents0(), views.getClient0(), false),
2392 new AwSettingsLoadWithOverviewModeTestHelper( 2400 new AwSettingsLoadWithOverviewModeTestHelper(
2393 views.getContents1(), views.getClient1(), false)); 2401 views.getContents1(), views.getClient1(), false));
2394 } 2402 }
2395 2403
2396 @SmallTest 2404 /*
2397 @Feature({"AndroidWebView", "Preferences"}) 2405 @SmallTest
2406 @Feature({"AndroidWebView", "Preferences"})
2407 http://crbug.com/239144
2408 */
2409 @DisabledTest
2398 public void testLoadWithOverviewModeViewportTagWithTwoViews() throws Throwab le { 2410 public void testLoadWithOverviewModeViewportTagWithTwoViews() throws Throwab le {
2399 ViewPair views = createViews(); 2411 ViewPair views = createViews();
2400 runPerViewSettingsTest( 2412 runPerViewSettingsTest(
2401 new AwSettingsLoadWithOverviewModeTestHelper( 2413 new AwSettingsLoadWithOverviewModeTestHelper(
2402 views.getContents0(), views.getClient0(), true), 2414 views.getContents0(), views.getClient0(), true),
2403 new AwSettingsLoadWithOverviewModeTestHelper( 2415 new AwSettingsLoadWithOverviewModeTestHelper(
2404 views.getContents1(), views.getClient1(), true)); 2416 views.getContents1(), views.getClient1(), true));
2405 } 2417 }
2406 2418
2407 /* 2419 /*
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
2695 awContents.onTouchEvent(MotionEvent.obtain( 2707 awContents.onTouchEvent(MotionEvent.obtain(
2696 secondTapTime, secondTapTime, MotionEvent.ACTION_DOWN, 2708 secondTapTime, secondTapTime, MotionEvent.ACTION_DOWN,
2697 x, y, 0)); 2709 x, y, 0));
2698 awContents.onTouchEvent(MotionEvent.obtain( 2710 awContents.onTouchEvent(MotionEvent.obtain(
2699 secondTapTime, secondTapTime, MotionEvent.ACTION_UP, 2711 secondTapTime, secondTapTime, MotionEvent.ACTION_UP,
2700 x, y, 0)); 2712 x, y, 0));
2701 } 2713 }
2702 }); 2714 });
2703 } 2715 }
2704 } 2716 }
OLDNEW
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698