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

Allow ProviderTests to work with ContentCache 

Bug: 3204331
Change-Id: I5399345c2b759fb34d3dc7c694eb0eef8d7de493
This commit is contained in:
Marc Blank 2010-11-17 09:47:36 -08:00
parent 8afdca0bac
commit 349055aad4
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/email/provider/ContentCache.java
View File

@ -68,10 +68,12 @@ import java.util.Set;
public final class ContentCache extends LinkedHashMap<String, Cursor> {
private static final long serialVersionUID = 1L;
private static final boolean DEBUG_CACHE = false;
private static final boolean DEBUG_TOKENS = false;
private static final boolean DEBUG_NOT_CACHEABLE = false;
private static final boolean DEBUG_NO_OBJECTS_IN_CACHE = false;
private static final boolean DEBUG_CACHE = false; // DO NOT CHECK IN TRUE
private static final boolean DEBUG_TOKENS = false; // DO NOT CHECK IN TRUE
private static final boolean DEBUG_NOT_CACHEABLE = false; // DO NOT CHECK IN TRUE
// If false, reads will not use the cache; this is intended for debugging only
private static final boolean READ_CACHE_ENABLED = true; // DO NOT CHECK IN FALSE
// Count of non-cacheable queries (debug only)
private static int sNotCacheable = 0;
@ -228,15 +230,10 @@ public final class ContentCache extends LinkedHashMap<String, Cursor> {
public static final class CacheToken {
private static final long serialVersionUID = 1L;
private final String mId;
private boolean mIsValid = true;
private boolean mIsValid = READ_CACHE_ENABLED;
/*package*/ CacheToken(String id) {
mId = id;
// For debugging purposes only, this will cause all items to be rejected (as though
// there is no cache.)
if (DEBUG_NO_OBJECTS_IN_CACHE) {
mIsValid = false;
}
}
/*package*/ String getId() {
@ -718,6 +715,13 @@ public final class ContentCache extends LinkedHashMap<String, Cursor> {
}
}
// For use with unit tests
public static void invalidateAllCachesForTest() {
for (ContentCache cache: sContentCaches) {
cache.invalidate();
}
}
static class Statistics {
private final ContentCache mCache;
private final String mName;

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

@ -73,6 +73,8 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
public void setUp() throws Exception {
super.setUp();
mMockContext = getMockContext();
// Invalidate all caches, since we reset the database for each test
ContentCache.invalidateAllCachesForTest();
}
@Override