Merge "Remove internal.R References from AlertDialogBuilderTest" into eclair
diff --git a/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java b/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
index 84c64a4..c56dc28 100644
--- a/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
+++ b/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
@@ -40,14 +40,10 @@
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.FrameLayout;
-import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.ListView;
-import android.widget.TextView;
import android.widget.AdapterView.OnItemSelectedListener;
-import com.android.internal.R;
-
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
@@ -58,12 +54,8 @@
private Context mContext;
private Instrumentation mInstrumentation;
private final CharSequence mTitle = "title";
- private final CharSequence mMessage = "message";
- private TextView mTitleView;
- private TextView mMessageView;
private Drawable mDrawable;
private AlertDialog mDialog;
- private LinearLayout mLinearLayout;
private Button mButton;
private boolean mResult;
private boolean mItemSelected;
@@ -119,14 +111,11 @@
super.setUp();
mBuilder = null;
mInstrumentation = getInstrumentation();
- mContext = (Context)getActivity();
- mTitleView = null;
- mMessageView = null;
+ mContext = getActivity();
mButton = null;
mView = null;
mListView = null;
mDialog = null;
- mLinearLayout = null;
mItemSelected = false;
mSelectedItem = null;
mSelectedItems = new ArrayList<Integer>();
@@ -138,30 +127,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "setCustomTitle",
- args = {View.class}
- )
- public void testSetCustomTitle() throws Throwable {
- final String expectecTitle = "test";
- final TextView view = new TextView(mContext);
- view.setText(expectecTitle);
- runTestOnUiThread(new Runnable() {
- public void run() {
- mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setCustomTitle(view);
- mDialog = mBuilder.show();
- }
- });
- mInstrumentation.waitForIdleSync();
- final LinearLayout topPanel = (LinearLayout)mDialog.getWindow().findViewById(
- com.android.internal.R.id.topPanel);
- final TextView atv = (TextView)topPanel.getChildAt(2);
- final String title = (String)atv.getText();
- assertEquals(expectecTitle, title);
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "AlertDialog.Builder",
args = {Context.class}
)
@@ -171,87 +136,15 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "setTitle",
- args = {int.class}
- )
- public void testSetTitleWithParamInt() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setTitle(R.string.am);
- mDialog = mBuilder.show();
- mTitleView = (TextView)mDialog.getWindow().findViewById(R.id.alertTitle);
- }
- });
- mInstrumentation.waitForIdleSync();
- assertEquals(mTitleView.getText(), mContext.getText(R.string.am));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "setTitle",
- args = {CharSequence.class}
- )
- public void testSetTitleWithParamCharSequence() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setTitle(mTitle);
- mDialog = mBuilder.show();
- mTitleView = (TextView)mDialog.getWindow().findViewById(R.id.alertTitle);
- }
- });
- mInstrumentation.waitForIdleSync();
- assertEquals(mTitleView.getText(), mTitle);
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "setMessage",
- args = {int.class}
- )
- public void testSetMessageWithParamInt() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setMessage(R.string.am);
- mDialog = mBuilder.show();
- mMessageView = (TextView)mDialog.getWindow().findViewById(R.id.message);
- }
- });
- mInstrumentation.waitForIdleSync();
- assertEquals(mMessageView.getText(), mContext.getText(R.string.am));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "setMessage",
- args = {CharSequence.class}
- )
- public void testSetMessageWithParamCharSequence() throws Throwable {
- runTestOnUiThread(new Runnable() {
- public void run() {
- mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setMessage(mMessage);
- mDialog = mBuilder.show();
- mMessageView = (TextView)mDialog.getWindow().findViewById(R.id.message);
- }
- });
- mInstrumentation.waitForIdleSync();
- assertEquals(mMessageView.getText(), mMessage);
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "setIcon",
args = {int.class}
)
public void testSetIconWithParamInt() throws Throwable {
runTestOnUiThread(new Runnable() {
public void run() {
- mDrawable = mContext.getResources().getDrawable(R.drawable.btn_check_on);
+ mDrawable = mContext.getResources().getDrawable(android.R.drawable.btn_default);
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setIcon(R.drawable.btn_check_on);
+ mBuilder.setIcon(android.R.drawable.btn_default);
mDialog = mBuilder.show();
}
});
@@ -266,7 +159,7 @@
public void testSetIconWithParamDrawable() throws Throwable {
runTestOnUiThread(new Runnable() {
public void run() {
- mDrawable = mContext.getResources().getDrawable(R.drawable.btn_check_on);
+ mDrawable = mContext.getResources().getDrawable(android.R.drawable.btn_default);
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setIcon(mDrawable);
mDialog = mBuilder.show();
@@ -284,15 +177,15 @@
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setPositiveButton(R.string.year, mOnClickListener);
+ mBuilder.setPositiveButton(android.R.string.yes, mOnClickListener);
mDialog = mBuilder.show();
- mButton = (Button)mDialog.getWindow().findViewById(R.id.button1);
+ mButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE);
mButton.performClick();
}
});
mInstrumentation.waitForIdleSync();
- assertEquals(mContext.getText(R.string.year), mButton.getText());
+ assertEquals(mContext.getText(android.R.string.yes), mButton.getText());
assertTrue(mResult);
}
@@ -305,14 +198,14 @@
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setPositiveButton(R.string.year, mOnClickListener);
+ mBuilder.setPositiveButton(android.R.string.yes, mOnClickListener);
mDialog = mBuilder.show();
- mButton = (Button)mDialog.getWindow().findViewById(R.id.button1);
+ mButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE);
mButton.performClick();
}
});
mInstrumentation.waitForIdleSync();
- assertEquals(mContext.getText(R.string.year), mButton.getText());
+ assertEquals(mContext.getText(android.R.string.yes), mButton.getText());
assertTrue(mResult);
}
@@ -327,7 +220,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setNegativeButton(mTitle, mOnClickListener);
mDialog = mBuilder.show();
- mButton = (Button)mDialog.getWindow().findViewById(R.id.button2);
+ mButton = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
mButton.performClick();
}
});
@@ -347,7 +240,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setNegativeButton(com.android.cts.stub.R.string.notify, mOnClickListener);
mDialog = mBuilder.show();
- mButton = (Button)mDialog.getWindow().findViewById(R.id.button2);
+ mButton = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
mButton.performClick();
}
});
@@ -367,7 +260,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setNeutralButton(com.android.cts.stub.R.string.notify, mOnClickListener);
mDialog = mBuilder.show();
- mButton = (Button)mDialog.getWindow().findViewById(R.id.button3);
+ mButton = mDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
mButton.performClick();
}
});
@@ -387,7 +280,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setNeutralButton(mTitle, mOnClickListener);
mDialog = mBuilder.show();
- mButton = (Button)mDialog.getWindow().findViewById(R.id.button3);
+ mButton = mDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
mButton.performClick();
}
});
@@ -476,8 +369,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setItems(com.android.cts.stub.R.array.difficultyLevel, mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
}
});
mInstrumentation.waitForIdleSync();
@@ -501,8 +393,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setItems(expect, mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
}
});
mInstrumentation.waitForIdleSync();
@@ -521,8 +412,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setAdapter(adapter, mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
}
});
mInstrumentation.waitForIdleSync();
@@ -544,8 +434,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setCursor(c, mOnClickListener, People.NAME);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mListView.performItemClick(null, 0, 0);
}
});
@@ -571,8 +460,7 @@
mBuilder.setMultiChoiceItems(com.android.cts.stub.R.array.difficultyLevel, null,
mOnMultiChoiceClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mSelectedItem = (CharSequence)mListView.getSelectedItem();
mListView.performItemClick(null, 0, 0);
mListView.performItemClick(null, 1, 0);
@@ -599,8 +487,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setMultiChoiceItems(items, null, mOnMultiChoiceClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mSelectedItem = (CharSequence)mListView.getSelectedItem();
mListView.performItemClick(null, 0, 0);
mListView.performItemClick(null, 1, 0);
@@ -629,8 +516,7 @@
mBuilder.setMultiChoiceItems(c, People.NAME, People.NAME,
mOnMultiChoiceClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mListView.performItemClick(null, 0, 0);
mListView.performItemClick(null, 1, 0);
}
@@ -657,8 +543,7 @@
mBuilder.setSingleChoiceItems(com.android.cts.stub.R.array.difficultyLevel, 0,
mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mSelectedItem = (CharSequence)mListView.getSelectedItem();
mListView.performItemClick(null, 0, 0);
}
@@ -696,8 +581,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setSingleChoiceItems(c, 0, People.NAME, mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mListView.performItemClick(null, 0, 0);
}
});
@@ -721,8 +605,7 @@
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setSingleChoiceItems(items, 0, mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mSelectedItem = (CharSequence)mListView.getSelectedItem();
mListView.performItemClick(null, 0, 0);
}
@@ -746,11 +629,10 @@
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setSingleChoiceItems(new ArrayAdapter<CharSequence>(mContext,
- R.layout.select_dialog_singlechoice, R.id.text1, items), 0,
+ android.R.layout.select_dialog_singlechoice, android.R.id.text1, items), 0,
mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mSelectedItem = (CharSequence)mListView.getSelectedItem();
mListView.performItemClick(null, 0, 0);
}
@@ -773,8 +655,7 @@
mBuilder.setOnItemSelectedListener(mOnItemSelectedListener);
mBuilder.setItems(com.android.cts.stub.R.array.difficultyLevel, mOnClickListener);
mDialog = mBuilder.show();
- mLinearLayout = (LinearLayout)mDialog.getWindow().findViewById(R.id.contentPanel);
- mListView = (ListView)mLinearLayout.getChildAt(0);
+ mListView = mDialog.getListView();
mListView.pointToPosition(0, 0);
}
});
@@ -789,13 +670,13 @@
)
public void testSetView() throws Throwable {
final View view = new View(mContext);
+ view.setId(100);
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setView(view);
mDialog = mBuilder.show();
- mFrameLayout = (FrameLayout)mDialog.getWindow().findViewById(R.id.custom);
- mView = mFrameLayout.getChildAt(0);
+ mView = mDialog.getWindow().findViewById(100);
}
});
mInstrumentation.waitForIdleSync();
@@ -813,22 +694,18 @@
final int viewSpacingRight = 30;
final int viewSpacingBottom = 40;
final View view = new View(mContext);
+ view.setId(100);
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setView(view, viewSpacingLeft, viewSpacingTop, viewSpacingRight,
viewSpacingBottom);
mDialog = mBuilder.show();
- mFrameLayout = (FrameLayout)mDialog.getWindow().findViewById(R.id.custom);
- mView = mFrameLayout.getChildAt(0);
+ mView = mDialog.getWindow().findViewById(100);
}
});
mInstrumentation.waitForIdleSync();
assertEquals(view, mView);
- assertEquals(viewSpacingTop, mFrameLayout.getPaddingTop());
- assertEquals(viewSpacingLeft, mFrameLayout.getPaddingLeft());
- assertEquals(viewSpacingRight, mFrameLayout.getPaddingRight());
- assertEquals(viewSpacingBottom, mFrameLayout.getPaddingBottom());
}
@TestTargetNew(