Merge "Init mocks after checking assumptions in MapClientStateMachineTest"
diff --git a/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java b/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java
index 5ace94d..ad8b55f 100644
--- a/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java
+++ b/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java
@@ -102,13 +102,12 @@
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
mTargetContext = InstrumentationRegistry.getTargetContext();
- mMockContentProvider = new MockSmsContentProvider();
- mMockContentResolver = new MockContentResolver();
-
Assume.assumeTrue("Ignore test when MapClientService is not enabled",
mTargetContext.getResources().getBoolean(R.bool.profile_supported_mapmce));
+ MockitoAnnotations.initMocks(this);
+ mMockContentProvider = new MockSmsContentProvider();
+ mMockContentResolver = new MockContentResolver();
TestUtils.setAdapterService(mAdapterService);
when(mAdapterService.getDatabase()).thenReturn(mDatabaseManager);
doReturn(true, false).when(mAdapterService).isStartedProfile(anyString());