Get rid of Account#name

b/13249115

Change-Id: I5478b139cba9e3e37924c3af1c7a4f818a803fa3

2 files changed, 14 insertions, 9 deletions

diff --git a/tests/src/com/android/mail/compose/ComposeActivityTest.java b/tests/src/com/android/mail/compose/ComposeActivityTest.java
index 6cbe5645b..7fce8712e 100644
--- a/tests/src/com/android/mail/compose/ComposeActivityTest.java
+++ b/tests/src/com/android/mail/compose/ComposeActivityTest.java
@@ -117,7 +117,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
     private Account getAccountForName(Context context, String accountName) {
         Account[] results = getAccounts(context);
         for (Account account : results) {
-            if (account.name.equals(accountName)) {
+            if (account.getEmailAddress().equals(accountName)) {
                 return account;
             }
         }
@@ -146,7 +146,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
         array.put(a.serialize());
         mAccount.accountFromAddresses = array.toString();
         ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
-                mAccount.name, mAccount.name, customFrom, true, false);
+                mAccount.getEmailAddress(), mAccount.getEmailAddress(), customFrom, true, false);
         activity.mFromSpinner.setCurrentAccount(currentAccount);
 
         activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
@@ -180,7 +180,8 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
         final Account account = mAccount;
         activity.mFromSpinner = new FromAddressSpinner(activity);
         ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
-                mAccount.name, mAccount.name, mAccount.name, true, false);
+                mAccount.getEmailAddress(), mAccount.getEmailAddress(), mAccount.getEmailAddress(),
+                true, false);
         activity.mFromSpinner.setCurrentAccount(currentAccount);
 
         activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
@@ -219,7 +220,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
         array.put(a.serialize());
         mAccount.accountFromAddresses = array.toString();
         ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
-                mAccount.name, mAccount.name, customFrom, true, false);
+                mAccount.getEmailAddress(), mAccount.getEmailAddress(), customFrom, true, false);
         activity.mFromSpinner.setCurrentAccount(currentAccount);
 
         activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
@@ -548,7 +549,8 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
         array.put(a.serialize());
         mAccount.accountFromAddresses = array.toString();
         ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
-                mAccount.name, mAccount.name, mAccount.name, true, false);
+                mAccount.getEmailAddress(), mAccount.getEmailAddress(), mAccount.getEmailAddress(),
+                true, false);
         activity.mFromSpinner.setCurrentAccount(currentAccount);
         activity.mFromSpinner.initialize(ComposeActivity.REPLY, currentAccount.account,
                 EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
@@ -588,7 +590,8 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
         array.put(a.serialize());
         mAccount.accountFromAddresses = array.toString();
         ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
-                mAccount.name, mAccount.name, mAccount.name, true, false);
+                mAccount.getEmailAddress(), mAccount.getEmailAddress(), mAccount.getEmailAddress(),
+                true, false);
         activity.mFromSpinner.setCurrentAccount(currentAccount);
         activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
                 currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
@@ -630,7 +633,8 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
         array.put(a.serialize());
         mAccount.accountFromAddresses = array.toString();
         ReplyFromAccount currentAccount = new ReplyFromAccount(mAccount, mAccount.uri,
-                mAccount.name, mAccount.name, mAccount.name, true, false);
+                mAccount.getEmailAddress(), mAccount.getEmailAddress(), mAccount.getEmailAddress(),
+                true, false);
         activity.mFromSpinner.setCurrentAccount(currentAccount);
         activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
                 currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
diff --git a/tests/src/com/android/mail/providers/AccountTests.java b/tests/src/com/android/mail/providers/AccountTests.java
index be3d3afc1..3a2bf1ba7 100644
--- a/tests/src/com/android/mail/providers/AccountTests.java
+++ b/tests/src/com/android/mail/providers/AccountTests.java
@@ -48,7 +48,8 @@ public class AccountTests extends AndroidTestCase {
         final Account after = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
         assertNotNull(after);
 
-        assertEquals(before.name, after.name);
+        assertEquals(before.getEmailAddress(), after.getEmailAddress());
+        assertEquals(before.getDisplayName(), after.getDisplayName());
         assertEquals(before.accountFromAddresses, after.accountFromAddresses);
         assertEquals(before.capabilities, after.capabilities);
         assertEquals(before.providerVersion, after.providerVersion);
@@ -69,7 +70,7 @@ public class AccountTests extends AndroidTestCase {
         // null sender name (same thing as not putting a sender name at all)
         json.put(UIProvider.AccountColumns.SENDER_NAME, null);
 
-        final Account account = Account.newinstance(json.toString());
+        final Account account = Account.newInstance(json.toString());
         assertNotNull(account);
         assertNull(account.getSenderName());
     }