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 9ddeb0a83b96069074d1979c5b6e9655808d223f..92d231666f92d7dd4d599ca6c3bf4cb8505f672e 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 |
@@ -10,12 +10,21 @@ import android.util.Pair; |
import android.view.View; |
import android.widget.TextView; |
+import org.junit.Assert; |
+import org.junit.Before; |
+import org.junit.Rule; |
+import org.junit.Test; |
+import org.junit.runner.RunWith; |
+ |
import org.chromium.base.CollectionUtil; |
import org.chromium.base.ThreadUtils; |
+import org.chromium.base.test.util.CommandLineFlags; |
import org.chromium.base.test.util.Feature; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.ChromeActivity; |
-import org.chromium.chrome.test.ChromeActivityTestCaseBase; |
+import org.chromium.chrome.browser.ChromeSwitches; |
+import org.chromium.chrome.test.ChromeActivityTestRule; |
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner; |
import org.chromium.content_public.common.Referrer; |
import java.util.ArrayList; |
@@ -27,10 +36,13 @@ import java.util.concurrent.ExecutionException; |
* A class to checkout the TabularContextMenuUi. This confirms the the UI represents items and |
* groups. |
*/ |
-public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeActivity> { |
- public TabularContextMenuUiTest() { |
- super(ChromeActivity.class); |
- } |
+@RunWith(ChromeJUnit4ClassRunner.class) |
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, |
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG}) |
+public class TabularContextMenuUiTest { |
+ @Rule |
+ public ChromeActivityTestRule<ChromeActivity> mActivityTestRule = |
+ new ChromeActivityTestRule<>(ChromeActivity.class); |
private static class MockMenuParams extends ContextMenuParams { |
private String mUrl = ""; |
@@ -53,11 +65,12 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
} |
} |
- @Override |
- public void startMainActivity() throws InterruptedException { |
- startMainActivityOnBlankPage(); |
+ @Before |
+ public void setUp() throws InterruptedException { |
+ mActivityTestRule.startMainActivityOnBlankPage(); |
} |
+ @Test |
@SmallTest |
@Feature({"CustomContextMenu"}) |
public void testViewDisplaysSingleItemProperly() throws ExecutionException { |
@@ -71,14 +84,16 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() { |
@Override |
public View call() { |
- return dialog.createPagerView(getActivity(), new MockMenuParams(url), itemGroups); |
+ return dialog.createPagerView( |
+ mActivityTestRule.getActivity(), new MockMenuParams(url), itemGroups); |
} |
}); |
TabLayout layout = (TabLayout) view.findViewById(R.id.tab_layout); |
- assertEquals(layout.getVisibility(), View.GONE); |
+ Assert.assertEquals(layout.getVisibility(), View.GONE); |
} |
+ @Test |
@SmallTest |
@Feature({"CustomContextMenu"}) |
public void testViewDisplaysViewPagerForMultipleItems() throws ExecutionException { |
@@ -93,14 +108,16 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() { |
@Override |
public View call() { |
- return dialog.createPagerView(getActivity(), new MockMenuParams(url), itemGroups); |
+ return dialog.createPagerView( |
+ mActivityTestRule.getActivity(), new MockMenuParams(url), itemGroups); |
} |
}); |
TabLayout layout = (TabLayout) view.findViewById(R.id.tab_layout); |
- assertEquals(layout.getVisibility(), View.VISIBLE); |
+ Assert.assertEquals(layout.getVisibility(), View.VISIBLE); |
} |
+ @Test |
@SmallTest |
@Feature({"CustomContextMenu"}) |
public void testURLIsShownOnContextMenu() throws ExecutionException { |
@@ -112,15 +129,16 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() { |
@Override |
public View call() { |
- return dialog.createContextMenuPageUi( |
- getActivity(), new MockMenuParams(expectedUrl), item, false, item.size()); |
+ return dialog.createContextMenuPageUi(mActivityTestRule.getActivity(), |
+ new MockMenuParams(expectedUrl), item, false, item.size()); |
} |
}); |
TextView textView = (TextView) view.findViewById(R.id.context_header_text); |
- assertEquals(expectedUrl, String.valueOf(textView.getText())); |
+ Assert.assertEquals(expectedUrl, String.valueOf(textView.getText())); |
} |
+ @Test |
@SmallTest |
@Feature({"CustomContextMenu"}) |
public void testHeaderIsNotShownWhenThereIsNoParams() throws ExecutionException { |
@@ -131,15 +149,16 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() { |
@Override |
public View call() { |
- return dialog.createContextMenuPageUi( |
- getActivity(), new MockMenuParams(""), item, false, item.size()); |
+ return dialog.createContextMenuPageUi(mActivityTestRule.getActivity(), |
+ new MockMenuParams(""), item, false, item.size()); |
} |
}); |
- assertEquals(view.findViewById(R.id.context_header_text).getVisibility(), View.GONE); |
- assertEquals(view.findViewById(R.id.context_divider).getVisibility(), View.GONE); |
+ Assert.assertEquals(view.findViewById(R.id.context_header_text).getVisibility(), View.GONE); |
+ Assert.assertEquals(view.findViewById(R.id.context_divider).getVisibility(), View.GONE); |
} |
+ @Test |
@SmallTest |
@Feature({"CustomContextMenu"}) |
public void testLinkShowsMultipleLinesWhenClicked() throws ExecutionException { |
@@ -150,7 +169,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() { |
@Override |
public View call() { |
- return dialog.createContextMenuPageUi(getActivity(), |
+ return dialog.createContextMenuPageUi(mActivityTestRule.getActivity(), |
new MockMenuParams("http://google.com"), item, false, item.size()); |
} |
}); |
@@ -158,8 +177,8 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
final TextView headerTextView = (TextView) view.findViewById(R.id.context_header_text); |
int expectedMaxLines = 1; |
int actualMaxLines = headerTextView.getMaxLines(); |
- assertEquals("Expected a different number of default maximum lines.", expectedMaxLines, |
- actualMaxLines); |
+ Assert.assertEquals("Expected a different number of default maximum lines.", |
+ expectedMaxLines, actualMaxLines); |
ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
@Override |
@@ -170,7 +189,8 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA |
expectedMaxLines = Integer.MAX_VALUE; |
actualMaxLines = headerTextView.getMaxLines(); |
- assertEquals("Expected a different number of maximum lines when the header is clicked.", |
+ Assert.assertEquals( |
+ "Expected a different number of maximum lines when the header is clicked.", |
expectedMaxLines, actualMaxLines); |
} |
} |