Clean up failing CTS tests after refactor
Removes Gallery.getContextMenuInfo() test, which relied on private
classes.
Bug: 22347797
Change-Id: I7f01a99289a5c84b8db39e66f1ea062ee4e4497f
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index fc5eb08..730083e 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -345,8 +345,8 @@
}
private final class MockCursorAdapter extends CursorAdapter {
- private final Context mContext;
- private final boolean mAutoRequery;
+ private Context mContext;
+ private boolean mAutoRequery;
private boolean mContentChanged = false;
@@ -391,6 +391,9 @@
@Override
public void init(Context context, Cursor c, boolean autoRequery) {
super.init(context, c, autoRequery);
+
+ mContext = context;
+ mAutoRequery = autoRequery;
}
@Override
diff --git a/tests/tests/widget/src/android/widget/cts/GalleryTest.java b/tests/tests/widget/src/android/widget/cts/GalleryTest.java
index a3ac16c..581107c 100644
--- a/tests/tests/widget/src/android/widget/cts/GalleryTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GalleryTest.java
@@ -307,189 +307,6 @@
assertEquals(index + 1, gallery.getChildDrawingOrder(childCount, index));
}
- @UiThreadTest
- public void testGetContextMenuInfo() {
- MockOnCreateContextMenuListener listener = new MockOnCreateContextMenuListener();
- MyGallery gallery = new MyGallery(mContext);
- gallery.setOnCreateContextMenuListener(listener);
- assertFalse(listener.hasCreatedContextMenu());
- gallery.createContextMenu(new MockContextMenu());
- assertTrue(listener.hasCreatedContextMenu());
- assertSame(gallery.getContextMenuInfo(), listener.getContextMenuInfo());
- }
-
- private static class MockContextMenu implements ContextMenu {
- @Override
- public ContextMenu setHeaderTitle(int titleRes) {
- return null;
- }
-
- @Override
- public ContextMenu setHeaderTitle(CharSequence title) {
- return null;
- }
-
- @Override
- public ContextMenu setHeaderIcon(int iconRes) {
- return null;
- }
-
- @Override
- public ContextMenu setHeaderIcon(Drawable icon) {
- return null;
- }
-
- @Override
- public ContextMenu setHeaderView(View view) {
- return null;
- }
-
- @Override
- public void clearHeader() {
-
- }
-
- @Override
- public MenuItem add(CharSequence title) {
- return null;
- }
-
- @Override
- public MenuItem add(int titleRes) {
- return null;
- }
-
- @Override
- public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
- return null;
- }
-
- @Override
- public MenuItem add(int groupId, int itemId, int order, int titleRes) {
- return null;
- }
-
- @Override
- public SubMenu addSubMenu(CharSequence title) {
- return null;
- }
-
- @Override
- public SubMenu addSubMenu(int titleRes) {
- return null;
- }
-
- @Override
- public SubMenu addSubMenu(int groupId, int itemId, int order,
- CharSequence title) {
- return null;
- }
-
- @Override
- public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
- return null;
- }
-
- @Override
- public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller,
- Intent[] specifics, Intent intent, int flags, MenuItem[] outSpecificItems) {
- return 0;
- }
-
- @Override
- public void removeItem(int id) {
-
- }
-
- @Override
- public void removeGroup(int groupId) {
-
- }
-
- @Override
- public void clear() {
-
- }
-
- @Override
- public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
-
- }
-
- @Override
- public void setGroupVisible(int group, boolean visible) {
-
- }
-
- @Override
- public void setGroupEnabled(int group, boolean enabled) {
-
- }
-
- @Override
- public boolean hasVisibleItems() {
- return false;
- }
-
- @Override
- public MenuItem findItem(int id) {
- return null;
- }
-
- @Override
- public int size() {
- return 0;
- }
-
- @Override
- public MenuItem getItem(int index) {
- return null;
- }
-
- @Override
- public void close() {
-
- }
-
- @Override
- public boolean performShortcut(int keyCode, KeyEvent event, int flags) {
- return false;
- }
-
- @Override
- public boolean isShortcutKey(int keyCode, KeyEvent event) {
- return false;
- }
-
- @Override
- public boolean performIdentifierAction(int id, int flags) {
- return false;
- }
-
- @Override
- public void setQwertyMode(boolean isQwerty) {
-
- }
- }
-
- private static class MockOnCreateContextMenuListener implements OnCreateContextMenuListener {
- private boolean hasCreatedContextMenu;
- private ContextMenuInfo mContextMenuInfo;
-
- public boolean hasCreatedContextMenu() {
- return hasCreatedContextMenu;
- }
-
- public ContextMenuInfo getContextMenuInfo() {
- return mContextMenuInfo;
- }
-
- public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
- hasCreatedContextMenu = true;
- mContextMenuInfo = menuInfo;
- }
- }
-
private static class ImageAdapter extends BaseAdapter {
public ImageAdapter(Context c) {
mContext = c;
diff --git a/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java b/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java
index 25d8e5e..a65bbe9 100644
--- a/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java
+++ b/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java
@@ -21,6 +21,8 @@
import android.content.ContextWrapper;
import android.content.Intent;
import android.net.Uri;
+import android.os.Bundle;
+import android.os.UserHandle;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.test.InstrumentationTestCase;
@@ -43,6 +45,16 @@
testCallback(intent);
}
+ // @Override
+ public void startActivityAsUser(Intent intent, UserHandle user) {
+ testCallback(intent);
+ }
+
+ // @Override
+ public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {
+ testCallback(intent);
+ }
+
private void testCallback(Intent intent) {
assertEquals(plainMimeType, intent.getStringExtra(
ContactsContract.QuickContact.EXTRA_PRIORITIZED_MIMETYPE));
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
index 52d699b..580be27 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
@@ -175,7 +175,8 @@
public MockResourceCursorAdapter(Context context, int layout, Cursor c) {
super(context, layout, c);
- mAutoRequery = false;
+ // Default is true.
+ mAutoRequery = true;
}
public MockResourceCursorAdapter(Context context, int layout,
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 936f38f..3130a26 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -809,13 +809,14 @@
add = Float.MIN_VALUE;
mult = Float.MIN_VALUE;
setLineSpacing(add, mult);
- float expected = originalLineHeight * mult + add;
- assertEquals(Math.round(expected), mTextView.getLineHeight());
+ assertEquals(Math.round(originalLineHeight * mult + add), mTextView.getLineHeight());
+
+ // edge case where the behavior of Math.round() deviates from
+ // FastMath.round(), requiring us to use an explicit 0 value
add = Float.MAX_VALUE;
mult = Float.MAX_VALUE;
setLineSpacing(add, mult);
- expected = originalLineHeight * mult + add;
- assertEquals(Math.round(expected), mTextView.getLineHeight());
+ assertEquals(0, mTextView.getLineHeight());
}
public void testInstanceState() {
