summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-27 10:25:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-27 10:25:48 +0000
commitca8a806df18d3841fa66c1dd4fae5b35d6fb653a (patch)
tree645ffbbe7aaf549ca76160037a7cab91dcfeddde
parent8944a2ed80a10094a8a51273721b9d5ee92591b4 (diff)
parent8cc6ed549693fdb8632036ebe5241591f71d02f8 (diff)
Merge "BinaryTransparencyServiceTest: Avoid schedule()" into tm-dev am: 8cc6ed5496
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17898100 Change-Id: I59b6067bab24690f540f939803a4fa7a73cd4cfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java b/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java
index 0e84e044e44b..42c4129513d0 100644
--- a/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java
@@ -16,6 +16,10 @@
package com.android.server;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.app.job.JobScheduler;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -43,13 +47,15 @@ public class BinaryTransparencyServiceTest {
@Before
public void setUp() {
- mContext = ApplicationProvider.getApplicationContext();
+ mContext = spy(ApplicationProvider.getApplicationContext());
mBinaryTransparencyService = new BinaryTransparencyService(mContext);
mTestInterface = mBinaryTransparencyService.new BinaryTransparencyServiceImpl();
}
private void prepSignedInfo() {
// simulate what happens on boot completed phase
+ // but we avoid calling JobScheduler.schedule by returning a null.
+ doReturn(null).when(mContext).getSystemService(JobScheduler.class);
mBinaryTransparencyService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);
}