diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-07-17 10:07:12 -0700 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-07-17 10:07:12 -0700 |
| commit | 2efacc5297c5a2f575a8c98181f4dcd51ed79f9e (patch) | |
| tree | 05759fa3223086121fc711b4b92689bd388b3339 /tests/src/com/android/mail/compose/ComposeActivityTest.java | |
| parent | d5d5d5235c8f6dd27e9d0aa12ef658447626c457 (diff) | |
| download | android_packages_apps_UnifiedEmail-2efacc5297c5a2f575a8c98181f4dcd51ed79f9e.tar.gz android_packages_apps_UnifiedEmail-2efacc5297c5a2f575a8c98181f4dcd51ed79f9e.tar.bz2 android_packages_apps_UnifiedEmail-2efacc5297c5a2f575a8c98181f4dcd51ed79f9e.zip | |
Fixed NPE in ComposeActivityTest
Change-Id: I5cbde624b31a408016c90135ba4415d6ff708818
Diffstat (limited to 'tests/src/com/android/mail/compose/ComposeActivityTest.java')
| -rw-r--r-- | tests/src/com/android/mail/compose/ComposeActivityTest.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/src/com/android/mail/compose/ComposeActivityTest.java b/tests/src/com/android/mail/compose/ComposeActivityTest.java index f7662e977..0eef8bb7b 100644 --- a/tests/src/com/android/mail/compose/ComposeActivityTest.java +++ b/tests/src/com/android/mail/compose/ComposeActivityTest.java @@ -45,6 +45,8 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos private ComposeActivity mActivity; private Account mAccount; + private static final Account[] EMPTY_ACCOUNT_LIST = new Account[0]; + public ComposeActivityTest() { super(ComposeActivity.class); } @@ -119,7 +121,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos mAccount.name, mAccount.name, customFrom, true, false); mActivity.mFromSpinner.setCurrentAccount(currentAccount); mActivity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL, - currentAccount.account, null, null); + currentAccount.account, EMPTY_ACCOUNT_LIST, null); mActivity.runOnUiThread(new Runnable() { @Override public void run() { @@ -152,7 +154,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos mAccount.name, mAccount.name, mAccount.name, true, false); mActivity.mFromSpinner.setCurrentAccount(currentAccount); mActivity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL, - currentAccount.account, null, null); + currentAccount.account, EMPTY_ACCOUNT_LIST, null); mActivity.runOnUiThread(new Runnable() { @Override public void run() { @@ -190,7 +192,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos mAccount.name, mAccount.name, customFrom, true, false); mActivity.mFromSpinner.setCurrentAccount(currentAccount); mActivity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL, - currentAccount.account, null, null); + currentAccount.account, EMPTY_ACCOUNT_LIST, null); mActivity.runOnUiThread(new Runnable() { @Override public void run() { @@ -517,7 +519,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos mAccount.name, mAccount.name, mAccount.name, true, false); mActivity.mFromSpinner.setCurrentAccount(currentAccount); mActivity.mFromSpinner.initialize(ComposeActivity.REPLY, currentAccount.account, - null, null); + EMPTY_ACCOUNT_LIST, null); mActivity.runOnUiThread(new Runnable() { @Override @@ -557,7 +559,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos mAccount.name, mAccount.name, mAccount.name, true, false); mActivity.mFromSpinner.setCurrentAccount(currentAccount); mActivity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL, - currentAccount.account, null, null); + currentAccount.account, EMPTY_ACCOUNT_LIST, null); mActivity.runOnUiThread(new Runnable() { @Override public void run() { @@ -599,7 +601,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos mAccount.name, mAccount.name, mAccount.name, true, false); mActivity.mFromSpinner.setCurrentAccount(currentAccount); mActivity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL, - currentAccount.account, null, null); + currentAccount.account, EMPTY_ACCOUNT_LIST, null); mActivity.runOnUiThread(new Runnable() { @Override public void run() { |