Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken calendar tests. DO NOT MERGE

Browse Source 
The tests end up in the widget code, which calls getResources(). This needs to
be supported by the mock.

This is a back-port of change 8886 from eclair to donut.

bug=1985641
This commit is contained in:
Ken Shirriff
2009-08-04 12:32:03 -07:00
parent b0508476e3
commit 8a98f58039
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test-runner/android/test/ProviderTestCase2.java
View File

@@ -3,6 +3,7 @@ package android.test;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.test.mock.MockContext; import android.test.mock.MockContext;
import android.test.mock.MockContentResolver; import android.test.mock.MockContentResolver;
import android.database.DatabaseUtils; import android.database.DatabaseUtils;
@@ -26,6 +27,14 @@ public abstract class ProviderTestCase2<T extends ContentProvider> extends Andro
private IsolatedContext mProviderContext; private IsolatedContext mProviderContext;
private MockContentResolver mResolver; private MockContentResolver mResolver;
private class MockContext2 extends MockContext {
@Override
public Resources getResources() {
return getContext().getResources();
}
}
public ProviderTestCase2(Class<T> providerClass, String providerAuthority) { public ProviderTestCase2(Class<T> providerClass, String providerAuthority) {
mProviderClass = providerClass; mProviderClass = providerClass;
mProviderAuthority = providerAuthority; mProviderAuthority = providerAuthority;
@@ -47,7 +56,7 @@ public abstract class ProviderTestCase2<T extends ContentProvider> extends Andro
mResolver = new MockContentResolver(); mResolver = new MockContentResolver();
final String filenamePrefix = "test."; final String filenamePrefix = "test.";
RenamingDelegatingContext targetContextWrapper = new RenamingDelegatingContext( RenamingDelegatingContext targetContextWrapper = new RenamingDelegatingContext(
new MockContext(), // The context that most methods are delegated to new MockContext2(), // The context that most methods are delegated to
getContext(), // The context that file methods are delegated to getContext(), // The context that file methods are delegated to
filenamePrefix); filenamePrefix);
mProviderContext = new IsolatedContext(mResolver, targetContextWrapper); mProviderContext = new IsolatedContext(mResolver, targetContextWrapper);