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

Don't use MockIContentProvider

Browse Source 
MockIContentProvider is not part of the public API of android.test.mock.
This test has been able to use the private API directly because it is
with 'platform_apis: true' and thus was provided with the impl lib
of the mock library. However, this will be prohibited when the mock
library is built with 'default_to_stubs: true' to hide the impl lib.

In preparation for the change, let the test implement the mock
directly from IContentProvider using Mockito.

Bug: 157007292
Test: m
Test: atest FrameworksUiServicesTests
Merged-In: I6de7f880baa19eebbc46076f6402173c68c44f8d
(cherry picked from commit c6f838e516)
Change-Id: I6de7f880baa19eebbc46076f6402173c68c44f8d
This commit is contained in:
Jiyong Park
2020-06-01 17:56:42 +09:00
parent 89b673a276
commit 0e3c24b0a7
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
View File

@@ -56,6 +56,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -70,6 +71,7 @@ import android.app.NotificationChannel;
import android.app.NotificationChannelGroup;
import android.app.NotificationManager;
import android.content.ContentProvider;
import android.content.ContentResolver;
import android.content.Context;
import android.content.IContentProvider;
import android.content.pm.ApplicationInfo;
@@ -80,13 +82,16 @@ import android.content.res.Resources;
import android.graphics.Color;
import android.media.AudioAttributes;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.RemoteCallback;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
import android.service.notification.ConversationChannelWrapper;
import android.test.mock.MockIContentProvider;
import android.test.suitebuilder.annotation.SmallTest;
import android.testing.TestableContentResolver;
import android.util.ArrayMap;
@@ -108,7 +113,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlSerializer;
@@ -146,7 +150,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
@Mock NotificationUsageStats mUsageStats;
@Mock RankingHandler mHandler;
@Mock PackageManager mPm;
@Spy IContentProvider mTestIContentProvider = new MockIContentProvider();
IContentProvider mTestIContentProvider;
@Mock Context mContext;
@Mock ZenModeHelper mMockZenModeHelper;
@Mock AppOpsManager mAppOpsManager;
@@ -193,6 +197,39 @@ public class PreferencesHelperTest extends UiServiceTestCase {
Global.putInt(contentResolver, Global.NOTIFICATION_BUBBLES, 1);
ContentProvider testContentProvider = mock(ContentProvider.class);
mTestIContentProvider = mock(IContentProvider.class, invocation -> {
throw new UnsupportedOperationException("unimplemented mock method");
});
doAnswer(invocation -> {
String callingPkg = invocation.getArgument(0);
String featureId = invocation.getArgument(1);
Uri uri = invocation.getArgument(2);
RemoteCallback cb = invocation.getArgument(3);
IContentProvider mock = (IContentProvider) (invocation.getMock());
AsyncTask.SERIAL_EXECUTOR.execute(() -> {
final Bundle bundle = new Bundle();
try {
bundle.putParcelable(ContentResolver.REMOTE_CALLBACK_RESULT,
mock.canonicalize(callingPkg, featureId, uri));
} catch (RemoteException e) { /* consume */ }
cb.sendResult(bundle);
});
return null;
}).when(mTestIContentProvider).canonicalizeAsync(any(), any(), any(), any());
doAnswer(invocation -> {
Uri uri = invocation.getArgument(0);
RemoteCallback cb = invocation.getArgument(1);
IContentProvider mock = (IContentProvider) (invocation.getMock());
AsyncTask.SERIAL_EXECUTOR.execute(() -> {
final Bundle bundle = new Bundle();
try {
bundle.putString(ContentResolver.REMOTE_CALLBACK_RESULT, mock.getType(uri));
} catch (RemoteException e) { /* consume */ }
cb.sendResult(bundle);
});
return null;
}).when(mTestIContentProvider).getTypeAsync(any(), any());
when(testContentProvider.getIContentProvider()).thenReturn(mTestIContentProvider);
contentResolver.addProvider(TEST_AUTHORITY, testContentProvider);