Commit fa24c804 authored by Donn Denman's avatar Donn Denman Committed by Commit Bot

[TTS] Reenable some disabled tests.

Re-enables two disabled tests that used a swipe gesture to animate
the panel, and turned flaky or failing due to some animation changes
recently landed.  Details in the bug.

Also rename a test that had my initials on it.

BUG=965706

Change-Id: I6427236492e4db9d0209355b9a03aac8cde69a4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625378
Commit-Queue: Donn Denman <donnd@chromium.org>
Auto-Submit: Donn Denman <donnd@chromium.org>
Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665040}
parent da164e2f
...@@ -1970,7 +1970,8 @@ public class ContextualSearchManagerTest { ...@@ -1970,7 +1970,8 @@ public class ContextualSearchManagerTest {
@Restriction(UiRestriction.RESTRICTION_TYPE_PHONE) @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
@DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533") @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
@DisabledTest(message = "crbug.com/965706") @DisabledTest(message = "crbug.com/965706")
public void testPromoOpenCountForUndecided() throws InterruptedException, TimeoutException { public void
testPromoOpenCountForUndecided() throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(false); mPolicy.overrideDecidedStateForTesting(false);
// A simple click / resolve / prefetch sequence without open should not change the counter. // A simple click / resolve / prefetch sequence without open should not change the counter.
...@@ -2414,7 +2415,7 @@ public class ContextualSearchManagerTest { ...@@ -2414,7 +2415,7 @@ public class ContextualSearchManagerTest {
@SmallTest @SmallTest
@Feature({"ContextualSearch"}) @Feature({"ContextualSearch"})
@Restriction(UiRestriction.RESTRICTION_TYPE_PHONE) @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
@DisabledTest(message = "crbug.com/965706") @DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP, message = "crbug.com/965706")
public void testTapMultipleSwipeOnlyLoadsContentOnce() public void testTapMultipleSwipeOnlyLoadsContentOnce()
throws InterruptedException, TimeoutException { throws InterruptedException, TimeoutException {
// Simulate a tap and make sure Content is not visible. // Simulate a tap and make sure Content is not visible.
...@@ -2451,7 +2452,7 @@ public class ContextualSearchManagerTest { ...@@ -2451,7 +2452,7 @@ public class ContextualSearchManagerTest {
@SmallTest @SmallTest
@Feature({"ContextualSearch"}) @Feature({"ContextualSearch"})
@Restriction(UiRestriction.RESTRICTION_TYPE_PHONE) @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
@DisabledTest(message = "crbug.com/965706") @DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.LOLLIPOP, message = "crbug.com/965706")
public void testLongPressMultipleSwipeOnlyLoadsContentOnce() public void testLongPressMultipleSwipeOnlyLoadsContentOnce()
throws InterruptedException, TimeoutException { throws InterruptedException, TimeoutException {
// Simulate a long press and make sure no Content is created. // Simulate a long press and make sure no Content is created.
......
...@@ -320,7 +320,7 @@ public class ContextualSearchTapEventTest { ...@@ -320,7 +320,7 @@ public class ContextualSearchTapEventTest {
@SmallTest @SmallTest
@Feature({"ContextualSearch"}) @Feature({"ContextualSearch"})
@Restriction(Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE) @Restriction(Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE)
public void testTapProcessIsRobustWhenSelectionGetsClearedDLD() throws InterruptedException { public void testTapProcessIsRobustWhenSelectionGetsCleared() throws InterruptedException {
Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 0); Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 0);
// Fake a Tap event. // Fake a Tap event.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment