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

Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev

Browse Source
This commit is contained in:
Andrei Litvin
2020-04-17 17:07:37 +00:00
committed by Android (Google) Code Review
parent 9a89a81625 9f71403e1d
commit bbf2a29472
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/tv/TvRemoteProviderWatcher.java
View File

@@ -59,9 +59,9 @@ final class TvRemoteProviderWatcher {
private boolean mRunning; private boolean mRunning;
TvRemoteProviderWatcher(Context context, Object lock) { TvRemoteProviderWatcher(Context context, Object lock, Handler handler) {
mContext = context; mContext = context;
mHandler = new Handler(true); mHandler = handler;
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
mPackageManager = context.getPackageManager(); mPackageManager = context.getPackageManager();
mLock = lock; mLock = lock;
@@ -79,6 +79,10 @@ final class TvRemoteProviderWatcher {
}); });
} }
TvRemoteProviderWatcher(Context context, Object lock) {
this(context, lock, new Handler(true));
}
public void start() { public void start() {
if (DEBUG) Slog.d(TAG, "start()"); if (DEBUG) Slog.d(TAG, "start()");
if (!mRunning) { if (!mRunning) {

24
services/tests/servicestests/src/com/android/server/tv/TvRemoteProviderWatcherTest.java
View File

@@ -29,6 +29,7 @@ import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
@@ -88,7 +89,12 @@ public class TvRemoteProviderWatcherTest {
// Test intentionally includes empty spacing for a more complex test // Test intentionally includes empty spacing for a more complex test
when(mMockResources.getString(com.android.internal.R.string.config_tvRemoteServicePackage)) when(mMockResources.getString(com.android.internal.R.string.config_tvRemoteServicePackage))
.thenReturn(",,foo, " + TV_REMOTE_SERVICE_PACKAGE_NAME + ",bar, baz,,"); .thenReturn(",,foo, " + TV_REMOTE_SERVICE_PACKAGE_NAME + ",bar, baz,,");
assertTrue(mTvRemoteProviderWatcher.verifyServiceTrusted(createTvServiceInfo()));
// Re-create the object since package name is loaded in the constructor
TvRemoteProviderWatcher watcher =
new TvRemoteProviderWatcher(
mMockContext, new Object(), new Handler(Looper.getMainLooper()));
assertTrue(watcher.verifyServiceTrusted(createTvServiceInfo()));
} }
@Test @Test
@@ -96,7 +102,12 @@ public class TvRemoteProviderWatcherTest {
// Checks include empty strings to validate that processing as well // Checks include empty strings to validate that processing as well
when(mMockResources.getString(com.android.internal.R.string.config_tvRemoteServicePackage)) when(mMockResources.getString(com.android.internal.R.string.config_tvRemoteServicePackage))
.thenReturn(",,foo,, ,bar, baz,,"); .thenReturn(",,foo,, ,bar, baz,,");
assertFalse(mTvRemoteProviderWatcher.verifyServiceTrusted(createTvServiceInfo()));
// Re-create the object since package name is loaded in the constructor
TvRemoteProviderWatcher watcher =
new TvRemoteProviderWatcher(
mMockContext, new Object(), new Handler(Looper.getMainLooper()));
assertFalse(watcher.verifyServiceTrusted(createTvServiceInfo()));
} }
@Test @Test
@@ -139,14 +150,9 @@ public class TvRemoteProviderWatcherTest {
public void whitelistingPackageNameIsRequired() { public void whitelistingPackageNameIsRequired() {
reset(mMockResources); reset(mMockResources);
when(mMockResources.getString(anyInt())).thenReturn(""); when(mMockResources.getString(anyInt())).thenReturn("");
// Create a new watcher, as the resources are read in the constructor of the class
if (Looper.myLooper() == null) {
Looper.prepare();
}
TvRemoteProviderWatcher watcher = TvRemoteProviderWatcher watcher =
new TvRemoteProviderWatcher(mMockContext, new Object()); new TvRemoteProviderWatcher(
mMockContext, new Object(), new Handler(Looper.getMainLooper()));
assertFalse(watcher.verifyServiceTrusted(createTvServiceInfo())); assertFalse(watcher.verifyServiceTrusted(createTvServiceInfo()));
} }