PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AppStateAppBatteryUsageBridge test fail" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-07 13:46:15 +00:00
committed by Android (Google) Code Review
parent b905c0a0a7 9b68d1b5fb
commit 0212b6770e
1 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/src/com/android/settings/applications/AppStateAppBatteryUsageBridgeTest.java
View File

@@ -6,7 +6,9 @@ import static org.mockito.Mockito.when;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -15,7 +17,6 @@ import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@@ -26,8 +27,9 @@ public final class AppStateAppBatteryUsageBridgeTest {
private static final int UID_1 = 12345; private static final int UID_1 = 12345;
private static final int UID_2 = 7654321; private static final int UID_2 = 7654321;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext; private Context mContext;
private ApplicationInfo mApplicationInfo;
@Mock @Mock
private AppOpsManager mAppOpsManager; private AppOpsManager mAppOpsManager;
@Mock @Mock
@@ -36,6 +38,9 @@ public final class AppStateAppBatteryUsageBridgeTest {
@Before @Before
public void initMocks() { public void initMocks() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext();
mApplicationInfo = new ApplicationInfo();
mApplicationInfo.sourceDir = "test_dir";
} }
@Test @Test
@@ -47,7 +52,7 @@ public final class AppStateAppBatteryUsageBridgeTest {
new AppStateAppBatteryUsageBridge(mContext, null, null); new AppStateAppBatteryUsageBridge(mContext, null, null);
bridge.mAppOpsManager = mAppOpsManager; bridge.mAppOpsManager = mAppOpsManager;
bridge.mPowerAllowlistBackend = mPowerAllowlistBackend; 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); bridge.updateExtraInfo(entry, TEST_PACKAGE_1, UID_1);
@@ -59,14 +64,14 @@ public final class AppStateAppBatteryUsageBridgeTest {
@Test @Test
public void updateExtraInfo_updatesUnrestricted() { 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, when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
UID_2, TEST_PACKAGE_2)).thenReturn(AppOpsManager.MODE_ALLOWED); UID_2, TEST_PACKAGE_2)).thenReturn(AppOpsManager.MODE_ALLOWED);
AppStateAppBatteryUsageBridge bridge = AppStateAppBatteryUsageBridge bridge =
new AppStateAppBatteryUsageBridge(mContext, null, null); new AppStateAppBatteryUsageBridge(mContext, null, null);
bridge.mAppOpsManager = mAppOpsManager; bridge.mAppOpsManager = mAppOpsManager;
bridge.mPowerAllowlistBackend = mPowerAllowlistBackend; 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); bridge.updateExtraInfo(entry, TEST_PACKAGE_2, UID_2);