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

am 7e61436: Merge branch \'readonly-p4-donut\' into donut

Browse Source 
Merge commit '7e614360b60dd4c02dd82d3551a501e66d45d022'

* commit '7e614360b60dd4c02dd82d3551a501e66d45d022':
  AI 148381: Fix broken tests
This commit is contained in:
Andy Stadler 2009-05-06 18:01:24 -07:00 committed by The Android Open Source Project
commit 8550153911
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/src/com/android/email/activity/setup/AccountSettingsTests.java
View File

@ -43,7 +43,8 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
* Test that POP accounts aren't displayed with a push option
*/
public void testPushOptionPOP() {
Intent i = getTestIntent("Name", "pop3://user:password@server.com");
Intent i = getTestIntent("Name", "pop3://user:password@server.com",
"smtp://user:password@server.com");
this.setActivityIntent(i);
getActivityAndFields();
@ -56,7 +57,8 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
* Test that IMAP accounts aren't displayed with a push option
*/
public void testPushOptionIMAP() {
Intent i = getTestIntent("Name", "imap://user:password@server.com");
Intent i = getTestIntent("Name", "imap://user:password@server.com",
"smtp://user:password@server.com");
this.setActivityIntent(i);
getActivityAndFields();
@ -75,7 +77,8 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
return;
}
Intent i = getTestIntent("Name", "eas://user:password@server.com");
Intent i = getTestIntent("Name", "eas://user:password@server.com",
"eas://user:password@server.com");
this.setActivityIntent(i);
getActivityAndFields();
@ -108,10 +111,11 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
/**
* Create an intent with the Account in it
*/
private Intent getTestIntent(String name, String storeUri) {
private Intent getTestIntent(String name, String storeUri, String senderUri) {
Account account = new Account(this.getInstrumentation().getTargetContext());
account.setName(name);
account.setStoreUri(storeUri);
account.setSenderUri(senderUri);
Intent i = new Intent(Intent.ACTION_MAIN);
i.putExtra("account", account); // AccountSetupNames.EXTRA_ACCOUNT == "account"
return i;