Commit a5128620 authored by spdonghao's avatar spdonghao Committed by Commit Bot

Re-enable TasksViewBinderTest

#testSetIncognitoDescriptionVisibilityAndClickListener on L.

Bug: 1135286
Change-Id: Ie487c5f8b6f311668872b3761717f05e4da6f467
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2451576Reviewed-by: default avatarXi Han <hanxi@chromium.org>
Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Hao Dong <spdonghao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816732}
parent abbf4742
......@@ -32,21 +32,29 @@ import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.VOICE_SEA
import android.content.res.Resources;
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.view.ViewGroup;
import android.widget.HorizontalScrollView;
import android.widget.ListView;
import android.widget.ScrollView;
import androidx.core.widget.NestedScrollView;
import androidx.test.espresso.UiController;
import androidx.test.espresso.ViewAction;
import androidx.test.espresso.action.ScrollToAction;
import androidx.test.espresso.matcher.ViewMatchers;
import androidx.test.filters.SmallTest;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.chromium.base.test.UiThreadTest;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.ntp.IncognitoCookieControlsManager;
......@@ -227,8 +235,6 @@ public class TasksViewBinderTest extends DummyUiActivityTestCase {
@Test
@SmallTest
@DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.M,
message = "Failing on Lollipop Phone Tester. https://crbug.com/1135286")
public void
testSetIncognitoDescriptionVisibilityAndClickListener() {
assertFalse(isViewVisible(R.id.incognito_description_container_layout_stub));
......@@ -246,7 +252,31 @@ public class TasksViewBinderTest extends DummyUiActivityTestCase {
assertTrue(isViewVisible(R.id.new_tab_incognito_container));
mViewClicked.set(false);
onView(withId(R.id.learn_more)).perform(click());
// Default scrollTo() cannot be used for NestedScrollView. Add a customized scrollTo for
// scrolling to learn_more button.
ViewAction customizedScrollTo = new ViewAction() {
@Override
public Matcher<View> getConstraints() {
return Matchers.allOf(
ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE),
ViewMatchers.isDescendantOfA(
Matchers.anyOf(ViewMatchers.isAssignableFrom(ScrollView.class),
ViewMatchers.isAssignableFrom(HorizontalScrollView.class),
ViewMatchers.isAssignableFrom(ListView.class),
ViewMatchers.isAssignableFrom(NestedScrollView.class))));
}
@Override
public String getDescription() {
return "scroll to";
}
@Override
public void perform(UiController uiController, View view) {
new ScrollToAction().perform(uiController, view);
}
};
onView(withId(R.id.learn_more)).perform(customizedScrollTo, click());
assertTrue(mViewClicked.get());
}
......
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