ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken MessageView tests

Browse Source 
I'm surprised these were working at all.
This commit is contained in:
Andrew Stadler 2009-09-21 12:59:15 -07:00
parent f20fa620d2
commit ad4ec0590d
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/email/activity/MessageView.java
View File

@ -1022,6 +1022,8 @@ public class MessageView extends Activity implements OnClickListener {
/** /**
* Async task for loading a single message outside of the UI thread * Async task for loading a single message outside of the UI thread
* Note: To support unit testing, a sentinel messageId of Long.MIN_VALUE prevents
* loading the message but leaves the activity open.
*/ */
private class LoadMessageTask extends AsyncTask<Void, Void, Message> { private class LoadMessageTask extends AsyncTask<Void, Void, Message> {
@ -1038,13 +1040,18 @@ public class MessageView extends Activity implements OnClickListener {
@Override @Override
protected Message doInBackground(Void... params) { protected Message doInBackground(Void... params) {
if (mId == Long.MIN_VALUE) {
return null;
}
return Message.restoreMessageWithId(MessageView.this, mId); return Message.restoreMessageWithId(MessageView.this, mId);
} }
@Override @Override
protected void onPostExecute(Message message) { protected void onPostExecute(Message message) {
if (message == null) { if (message == null) {
finish(); if (mId != Long.MIN_VALUE) {
finish();
}
return; return;
} }
reloadUiFromMessage(message, mOkToFetch); reloadUiFromMessage(message, mOkToFetch);

22
tests/src/com/android/email/activity/MessageViewTests.java
View File

@ -36,8 +36,6 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
/** /**
* Various instrumentation tests for MessageCompose. * Various instrumentation tests for MessageCompose.
@ -49,15 +47,9 @@ public class MessageViewTests
extends ActivityInstrumentationTestCase2<MessageView> { extends ActivityInstrumentationTestCase2<MessageView> {
// copied from MessageView (could be package class) // copied from MessageView (could be package class)
private static final String EXTRA_ACCOUNT_ID = "com.android.email.MessageView_account_id"; private static final String EXTRA_MESSAGE_ID = "com.android.email.MessageView_message_id";
private static final String EXTRA_FOLDER = "com.android.email.MessageView_folder"; private static final String EXTRA_MAILBOX_ID = "com.android.email.MessageView_mailbox_id";
private static final String EXTRA_MESSAGE = "com.android.email.MessageView_message";
private static final String EXTRA_FOLDER_UIDS = "com.android.email.MessageView_folderUids";
// used by the mock controller
private static final String FOLDER_NAME = "folder";
private static final String MESSAGE_UID = "message_uid";
private TextView mToView; private TextView mToView;
private TextView mSubjectView; private TextView mSubjectView;
private WebView mMessageContentView; private WebView mMessageContentView;
@ -75,14 +67,10 @@ public class MessageViewTests
Email.setServicesEnabled(mContext); Email.setServicesEnabled(mContext);
// setup an intent to spin up this activity with something useful // setup an intent to spin up this activity with something useful
ArrayList<String> FOLDER_UIDS = new ArrayList<String>( // Long.MIN_VALUE are sentinels to command MessageView to skip loading
Arrays.asList(new String[]{ "why", "is", "java", "so", "ugly?" }));
// Log.d("MessageViewTest", "--- folder:" + FOLDER_UIDS);
Intent i = new Intent() Intent i = new Intent()
.putExtra(EXTRA_ACCOUNT_ID, -1) .putExtra(EXTRA_MESSAGE_ID, Long.MIN_VALUE)
.putExtra(EXTRA_FOLDER, FOLDER_NAME) .putExtra(EXTRA_MAILBOX_ID, Long.MIN_VALUE);
.putExtra(EXTRA_MESSAGE, MESSAGE_UID)
.putStringArrayListExtra(EXTRA_FOLDER_UIDS, FOLDER_UIDS);
this.setActivityIntent(i); this.setActivityIntent(i);
// configure a mock controller // configure a mock controller