diff options
| author | Jason Monk <jmonk@google.com> | 2017-12-14 13:22:58 -0500 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2018-02-18 13:02:25 -0500 |
| commit | 1fc931a38a9335b3b4b498c7cc31d37a777c7a5a (patch) | |
| tree | 910234f60264e0a10f14106ce23f3e9f6f874751 /tests/testables/src | |
| parent | 700448e4b480b7315d781c92c4a8f5538a02a745 (diff) | |
Switch to inline mockito for a bunch of tests
So we can mock final stuff
Test: The tests
Change-Id: Ia3a47c6655c4b0b9af0aea0ee6f8f6cb9ebaab09
Diffstat (limited to 'tests/testables/src')
| -rw-r--r-- | tests/testables/src/android/testing/TestableContext.java | 1 | ||||
| -rw-r--r-- | tests/testables/src/android/testing/TestableSettingsProvider.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/testables/src/android/testing/TestableContext.java b/tests/testables/src/android/testing/TestableContext.java index ffe721993a37..cf84c7926549 100644 --- a/tests/testables/src/android/testing/TestableContext.java +++ b/tests/testables/src/android/testing/TestableContext.java @@ -83,6 +83,7 @@ public class TestableContext extends ContextWrapper implements TestRule { .acquireContentProviderClient(Settings.AUTHORITY); mSettingsProvider = TestableSettingsProvider.getFakeSettingsProvider(settings); mTestableContentResolver.addProvider(Settings.AUTHORITY, mSettingsProvider); + mSettingsProvider.clearValuesAndCheck(TestableContext.this); mReceiver = check != null ? check.getTracker("receiver") : null; mService = check != null ? check.getTracker("service") : null; mComponent = check != null ? check.getTracker("component") : null; diff --git a/tests/testables/src/android/testing/TestableSettingsProvider.java b/tests/testables/src/android/testing/TestableSettingsProvider.java index 5f2a2244b841..b158476bd438 100644 --- a/tests/testables/src/android/testing/TestableSettingsProvider.java +++ b/tests/testables/src/android/testing/TestableSettingsProvider.java @@ -36,7 +36,7 @@ import static org.junit.Assert.*; public class TestableSettingsProvider extends MockContentProvider { private static final String TAG = "TestableSettingsProvider"; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static final String MY_UNIQUE_KEY = "Key_" + TestableSettingsProvider.class.getName(); private static TestableSettingsProvider sInstance; @@ -54,6 +54,9 @@ public class TestableSettingsProvider extends MockContentProvider { mValues.put(key("secure", MY_UNIQUE_KEY, userId), MY_UNIQUE_KEY); mValues.put(key("system", MY_UNIQUE_KEY, userId), MY_UNIQUE_KEY); + Settings.Global.clearProviderForTest(); + Settings.Secure.clearProviderForTest(); + Settings.System.clearProviderForTest(); // Verify that if any test is using TestableContext, they all have the correct settings // provider. assertEquals("Incorrect settings provider, test using incorrect Context?", MY_UNIQUE_KEY, |