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

Fix testAccountIsEasAccount 

Bug 2953763

Change-Id: Iad1bf94e676c1fb41335e8bd7f3297af0033b0f5
This commit is contained in:
Makoto Onuki 2010-08-26 15:08:19 -07:00
parent bd3e7777c5
commit 25144e2b79
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/android/email/provider/ProviderTestUtils.java
View File

@ -85,7 +85,7 @@ public class ProviderTestUtils extends Assert {
boolean saveIt, Context context) {
HostAuth hostAuth = new HostAuth();
hostAuth.mProtocol = protocol + "-" + name;
hostAuth.mProtocol = protocol;
hostAuth.mAddress = "address-" + name;
hostAuth.mPort = 100;
hostAuth.mFlags = 200;

26
tests/src/com/android/email/provider/ProviderTests.java
View File

@ -178,8 +178,8 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
account1.mHostAuthSend = ProviderTestUtils.setupHostAuth("foo", "account-hostauth-send", -1,
false, mMockContext);
account1.save(mMockContext);
assertEquals("eas-account-hostauth-recv", Account.getProtocol(mMockContext, account1.mId));
assertEquals("eas-account-hostauth-recv", account1.getProtocol(mMockContext));
assertEquals("eas", Account.getProtocol(mMockContext, account1.mId));
assertEquals("eas", account1.getProtocol(mMockContext));
Account account2 = ProviderTestUtils.setupAccount("account-nohostauth", false,
mMockContext);
account2.save(mMockContext);
@ -1945,19 +1945,21 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
public void testAccountIsEasAccount() {
Account account = new Account();
// No hostauth
assertFalse(account.isEasAccount(mMockContext));
account.mHostAuthRecv = new HostAuth();
assertFalse(account.isEasAccount(mMockContext));
checkAccountIsEasAccount(null, false);
checkAccountIsEasAccount("", false);
checkAccountIsEasAccount("x", false);
checkAccountIsEasAccount("eas", true);
}
account.mHostAuthRecv.mProtocol = "";
assertFalse(account.isEasAccount(mMockContext));
account.mHostAuthRecv.mProtocol = "x";
assertFalse(account.isEasAccount(mMockContext));
account.mHostAuthRecv.mProtocol = "eas";
assertTrue(account.isEasAccount(mMockContext));
private void checkAccountIsEasAccount(String protocol, boolean expected) {
Account account = ProviderTestUtils.setupAccount("account", false, mMockContext);
account.mHostAuthRecv = ProviderTestUtils.setupHostAuth(protocol, "account-hostauth-recv",
account.mId, false, mMockContext);
account.save(mMockContext);
assertEquals(expected, account.isEasAccount(mMockContext));
}
public void testGetKeyColumnLong() {