From 8a98f5803994ca1538d53973ebc72e1c5dfdba5a Mon Sep 17 00:00:00 2001 From: Ken Shirriff Date: Tue, 4 Aug 2009 12:32:03 -0700 Subject: [PATCH] Fix broken calendar tests. DO NOT MERGE 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 --- test-runner/android/test/ProviderTestCase2.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test-runner/android/test/ProviderTestCase2.java b/test-runner/android/test/ProviderTestCase2.java index ac17ebf47923b..a923d2ab65936 100644 --- a/test-runner/android/test/ProviderTestCase2.java +++ b/test-runner/android/test/ProviderTestCase2.java @@ -3,6 +3,7 @@ package android.test; import android.content.ContentProvider; import android.content.ContentResolver; import android.content.Context; +import android.content.res.Resources; import android.test.mock.MockContext; import android.test.mock.MockContentResolver; import android.database.DatabaseUtils; @@ -26,6 +27,14 @@ public abstract class ProviderTestCase2 extends Andro private IsolatedContext mProviderContext; private MockContentResolver mResolver; + private class MockContext2 extends MockContext { + + @Override + public Resources getResources() { + return getContext().getResources(); + } + } + public ProviderTestCase2(Class providerClass, String providerAuthority) { mProviderClass = providerClass; mProviderAuthority = providerAuthority; @@ -47,7 +56,7 @@ public abstract class ProviderTestCase2 extends Andro mResolver = new MockContentResolver(); final String filenamePrefix = "test."; 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 filenamePrefix); mProviderContext = new IsolatedContext(mResolver, targetContextWrapper);