Merge "Fix AppStateAppBatteryUsageBridge test fail" into main (0212b677) · Commits · e / os / android_packages_apps_Settings

tests/unit/src/com/android/settings/applications/AppStateAppBatteryUsageBridgeTest.java

+60 −55

Original line number	Diff line number	Diff line
		@@ -6,7 +6,9 @@ import static org.mockito.Mockito.when;

		import android.app.AppOpsManager;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;

		import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;

		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		@@ -15,7 +17,6 @@ import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Answers;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@@ -26,8 +27,9 @@ public final class AppStateAppBatteryUsageBridgeTest {
		private static final int UID_1 = 12345;
		private static final int UID_2 = 7654321;

		@Mock(answer = Answers.RETURNS_DEEP_STUBS)
		private Context mContext;
		private ApplicationInfo mApplicationInfo;

		@Mock
		private AppOpsManager mAppOpsManager;
		@Mock
		@@ -36,6 +38,9 @@ public final class AppStateAppBatteryUsageBridgeTest {
		@Before
		public void initMocks() {
		MockitoAnnotations.initMocks(this);
		mContext = ApplicationProvider.getApplicationContext();
		mApplicationInfo = new ApplicationInfo();
		mApplicationInfo.sourceDir = "test_dir";
		}

		@Test
		@@ -47,7 +52,7 @@ public final class AppStateAppBatteryUsageBridgeTest {
		new AppStateAppBatteryUsageBridge(mContext, null, null);
		bridge.mAppOpsManager = mAppOpsManager;
		bridge.mPowerAllowlistBackend = mPowerAllowlistBackend;
		AppEntry entry = new AppEntry(mContext, null, 0);
		AppEntry entry = new AppEntry(mContext, mApplicationInfo, 0);

		bridge.updateExtraInfo(entry, TEST_PACKAGE_1, UID_1);

		@@ -59,14 +64,14 @@ public final class AppStateAppBatteryUsageBridgeTest {

		@Test
		public void updateExtraInfo_updatesUnrestricted() {
		when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE_1, UID_1)).thenReturn(true);
		when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE_2, UID_2)).thenReturn(true);
		when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
		UID_2, TEST_PACKAGE_2)).thenReturn(AppOpsManager.MODE_ALLOWED);
		AppStateAppBatteryUsageBridge bridge =
		new AppStateAppBatteryUsageBridge(mContext, null, null);
		bridge.mAppOpsManager = mAppOpsManager;
		bridge.mPowerAllowlistBackend = mPowerAllowlistBackend;
		AppEntry entry = new AppEntry(mContext, null, 0);
		AppEntry entry = new AppEntry(mContext, mApplicationInfo, 0);

		bridge.updateExtraInfo(entry, TEST_PACKAGE_2, UID_2);