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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java

Issue 2868403003: added scale animation for context menu (Closed)
Patch Set: fixing broken tests Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
index e0f8b2c7f72c0fce4982ea9461d8c7088466589d..c6bd1cea87a6da51593063e6d2129d49258c869c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.contextmenu;
import android.support.design.widget.TabLayout;
import android.support.test.filters.SmallTest;
import android.util.Pair;
+import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
@@ -50,13 +51,14 @@ public class TabularContextMenuUiTest {
private MockMenuParams(int mediaType, String pageUrl, String linkUrl, String linkText,
String unfilteredLinkUrl, String srcUrl, String titleText,
- boolean imageWasFetchedLoFi, Referrer referrer, boolean canSavemedia) {
+ boolean imageWasFetchedLoFi, Referrer referrer, boolean canSavemedia,
+ int touchPointXDp, int touchPointYDp) {
super(mediaType, pageUrl, linkUrl, linkText, unfilteredLinkUrl, srcUrl, titleText,
- imageWasFetchedLoFi, referrer, canSavemedia);
+ imageWasFetchedLoFi, referrer, canSavemedia, touchPointXDp, touchPointYDp);
}
private MockMenuParams(String url) {
- this(0, "", "", "", "", "", "", false, null, true);
+ this(0, "", "", "", "", "", "", false, null, true, 0, 0);
mUrl = url;
}
@@ -84,16 +86,20 @@ public class TabularContextMenuUiTest {
itemGroups.add(
new Pair<>(R.string.contextmenu_link_title, Collections.unmodifiableList(item)));
final String url = "http://google.com";
+ View tabularContextMenu = LayoutInflater.from(mActivityTestRule.getActivity())
+ .inflate(R.layout.tabular_context_menu, null);
+ final TabularContextMenuViewPager pager =
+ (TabularContextMenuViewPager) tabularContextMenu.findViewById(R.id.custom_pager);
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() {
@Override
public View call() {
- return dialog.createPagerView(
- mActivityTestRule.getActivity(), new MockMenuParams(url), itemGroups);
+ return dialog.initPagerView(mActivityTestRule.getActivity(),
+ new MockMenuParams(url), itemGroups, pager);
}
});
TabLayout layout = (TabLayout) view.findViewById(R.id.tab_layout);
- Assert.assertEquals(layout.getVisibility(), View.GONE);
+ Assert.assertEquals(View.GONE, layout.getVisibility());
}
@Test
@@ -111,16 +117,20 @@ public class TabularContextMenuUiTest {
itemGroups.add(
new Pair<>(R.string.contextmenu_link_title, Collections.unmodifiableList(item)));
final String url = "http://google.com";
+ View tabularContextMenu = LayoutInflater.from(mActivityTestRule.getActivity())
+ .inflate(R.layout.tabular_context_menu, null);
+ final TabularContextMenuViewPager pager =
+ (TabularContextMenuViewPager) tabularContextMenu.findViewById(R.id.custom_pager);
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() {
@Override
public View call() {
- return dialog.createPagerView(
- mActivityTestRule.getActivity(), new MockMenuParams(url), itemGroups);
+ return dialog.initPagerView(mActivityTestRule.getActivity(),
+ new MockMenuParams(url), itemGroups, pager);
}
});
TabLayout layout = (TabLayout) view.findViewById(R.id.tab_layout);
- Assert.assertEquals(layout.getVisibility(), View.VISIBLE);
+ Assert.assertEquals(View.VISIBLE, layout.getVisibility());
}
@Test

Powered by Google App Engine
This is Rietveld 408576698