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

Merge "Fix two errors reported by continous test"

Browse Source
This commit is contained in:
Andy Stadler 2010-12-09 09:39:11 -08:00 committed by Android (Google) Code Review
commit a8133823ec
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/email/RefreshManager.java
View File

@ -303,18 +303,14 @@ public class RefreshManager {
return mMessageListStatus.get(mailboxId).isRefreshing();
}
public boolean isRefreshingAnyMailboxList() {
public boolean isRefreshingAnyMailboxListForTest() {
return mMailboxListStatus.isRefreshingAny();
}
public boolean isRefreshingAnyMessageList() {
public boolean isRefreshingAnyMessageListForTest() {
return mMessageListStatus.isRefreshingAny();
}
public boolean isRefreshingAny() {
return isRefreshingAnyMailboxList() || isRefreshingAnyMessageList();
}
public String getErrorMessage() {
return mErrorMessage;
}

16
tests/src/com/android/email/RefreshManagerTest.java
View File

@ -134,7 +134,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
assertEquals(-1, mController.mMailboxId);
mController.reset();
assertTrue(mTarget.isMailboxListRefreshing(ACCOUNT_1));
assertTrue(mTarget.isRefreshingAnyMailboxList());
assertTrue(mTarget.isRefreshingAnyMailboxListForTest());
// Request again -- shouldn't be accepted.
assertFalse(mTarget.refreshMailboxList(ACCOUNT_1));
@ -158,7 +158,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
assertEquals(-1, mController.mMailboxId);
mController.reset();
assertTrue(mTarget.isMailboxListRefreshing(ACCOUNT_2));
assertTrue(mTarget.isRefreshingAnyMailboxList());
assertTrue(mTarget.isRefreshingAnyMailboxListForTest());
// Refreshing for account 1...
mController.mListener.updateMailboxListCallback(null, ACCOUNT_1, 0);
@ -185,7 +185,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
.getLastRefreshTime());
// Check "any" method.
assertTrue(mTarget.isRefreshingAnyMailboxList()); // still refreshing account 2
assertTrue(mTarget.isRefreshingAnyMailboxListForTest()); // still refreshing account 2
// Refreshing for account 2...
mClock.advance();
@ -214,7 +214,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
.getLastRefreshTime());
// Check "any" method.
assertFalse(mTarget.isRefreshingAnyMailboxList());
assertFalse(mTarget.isRefreshingAnyMailboxListForTest());
}
public void testRefreshMessageList() {
@ -231,7 +231,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
assertEquals(MAILBOX_1, mController.mMailboxId);
mController.reset();
assertTrue(mTarget.isMessageListRefreshing(MAILBOX_1));
assertTrue(mTarget.isRefreshingAnyMessageList());
assertTrue(mTarget.isRefreshingAnyMessageListForTest());
// Request again -- shouldn't be accepted.
assertFalse(mTarget.refreshMessageList(ACCOUNT_1, MAILBOX_1));
@ -255,7 +255,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
assertEquals(MAILBOX_2, mController.mMailboxId);
mController.reset();
assertTrue(mTarget.isMessageListRefreshing(MAILBOX_2));
assertTrue(mTarget.isRefreshingAnyMessageList());
assertTrue(mTarget.isRefreshingAnyMessageListForTest());
// Refreshing mailbox 1...
mController.mListener.updateMailboxCallback(null, ACCOUNT_1, MAILBOX_1, 0, 0);
@ -282,7 +282,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
.getLastRefreshTime());
// Check "any" method.
assertTrue(mTarget.isRefreshingAnyMessageList()); // still refreshing mailbox 2
assertTrue(mTarget.isRefreshingAnyMessageListForTest()); // still refreshing mailbox 2
// Refreshing mailbox 2...
mClock.advance();
@ -311,7 +311,7 @@ public class RefreshManagerTest extends InstrumentationTestCase {
.getLastRefreshTime());
// Check "any" method.
assertFalse(mTarget.isRefreshingAnyMessageList());
assertFalse(mTarget.isRefreshingAnyMessageListForTest());
}
public void testSendPendingMessages() {