| 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.test.suitebuilder.annotation.SmallTest; | 7 import android.test.suitebuilder.annotation.SmallTest; |
| 8 | 8 |
| 9 import org.chromium.android_webview.AwContents; | 9 import org.chromium.android_webview.AwContents; |
| 10 import org.chromium.android_webview.test.util.CommonResources; | 10 import org.chromium.android_webview.test.util.CommonResources; |
| 11 import org.chromium.base.ThreadUtils; | 11 import org.chromium.base.ThreadUtils; |
| 12 import org.chromium.base.test.util.parameter.ParameterizedTest; |
| 12 import org.chromium.content.browser.test.util.Criteria; | 13 import org.chromium.content.browser.test.util.Criteria; |
| 13 import org.chromium.content.browser.test.util.CriteriaHelper; | 14 import org.chromium.content.browser.test.util.CriteriaHelper; |
| 14 | 15 |
| 15 /** | 16 /** |
| 16 * Tests for the WebViewClient.onScaleChanged. | 17 * Tests for the WebViewClient.onScaleChanged. |
| 17 */ | 18 */ |
| 19 // Run in single-process mode only. Blocked by rendering support crbug.com/52684
2. |
| 20 @ParameterizedTest.Set |
| 18 public class AwContentsClientOnScaleChangedTest extends AwTestBase { | 21 public class AwContentsClientOnScaleChangedTest extends AwTestBase { |
| 19 private TestAwContentsClient mContentsClient; | 22 private TestAwContentsClient mContentsClient; |
| 20 private AwContents mAwContents; | 23 private AwContents mAwContents; |
| 21 | 24 |
| 22 @Override | 25 @Override |
| 23 protected void setUp() throws Exception { | 26 protected void setUp() throws Exception { |
| 24 super.setUp(); | 27 super.setUp(); |
| 25 mContentsClient = new TestAwContentsClient(); | 28 mContentsClient = new TestAwContentsClient(); |
| 26 AwTestContainerView testContainerView = | 29 AwTestContainerView testContainerView = |
| 27 createAwTestContainerViewOnMainSync(mContentsClient); | 30 createAwTestContainerViewOnMainSync(mContentsClient); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 48 @Override | 51 @Override |
| 49 public void run() { | 52 public void run() { |
| 50 assertTrue(mAwContents.zoomIn()); | 53 assertTrue(mAwContents.zoomIn()); |
| 51 } | 54 } |
| 52 }); | 55 }); |
| 53 mContentsClient.getOnScaleChangedHelper().waitForCallback(callCount); | 56 mContentsClient.getOnScaleChangedHelper().waitForCallback(callCount); |
| 54 assertTrue("Scale ratio:" + mContentsClient.getOnScaleChangedHelper().ge
tLastScaleRatio(), | 57 assertTrue("Scale ratio:" + mContentsClient.getOnScaleChangedHelper().ge
tLastScaleRatio(), |
| 55 mContentsClient.getOnScaleChangedHelper().getLastScaleRatio() >
1); | 58 mContentsClient.getOnScaleChangedHelper().getLastScaleRatio() >
1); |
| 56 } | 59 } |
| 57 } | 60 } |
| OLD | NEW |