LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tethering unit test fail in R am: 9eac605333

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711436

Change-Id: I4a6c05d5b12ef159367e70df661fa2d386124fa9
This commit is contained in:
markchien
2021-05-20 05:54:03 +00:00
committed by Automerger Merge Worker
parent 82e910ecc5 9eac605333
commit b582c81ee8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java
View File

@@ -53,6 +53,7 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ModuleInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
@@ -203,6 +204,7 @@ public final class EntitlementManagerTest {
doReturn(mPm).when(mContext).getPackageManager(); doReturn(mPm).when(mContext).getPackageManager();
doReturn(TEST_PACKAGE_NAME).when(mContext).getPackageName(); doReturn(TEST_PACKAGE_NAME).when(mContext).getPackageName();
doReturn(new PackageInfo()).when(mPm).getPackageInfo(anyString(), anyInt()); doReturn(new PackageInfo()).when(mPm).getPackageInfo(anyString(), anyInt());
doReturn(new ModuleInfo()).when(mPm).getModuleInfo(anyString(), anyInt());
when(mResources.getStringArray(R.array.config_tether_dhcp_range)) when(mResources.getStringArray(R.array.config_tether_dhcp_range))
.thenReturn(new String[0]); .thenReturn(new String[0]);

7
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
View File

@@ -35,6 +35,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.pm.ModuleInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
@@ -75,12 +76,14 @@ public class TetheringConfigurationTest {
private static final String PROVISIONING_NO_UI_APP_NAME = "no_ui_app"; private static final String PROVISIONING_NO_UI_APP_NAME = "no_ui_app";
private static final String PROVISIONING_APP_RESPONSE = "app_response"; private static final String PROVISIONING_APP_RESPONSE = "app_response";
private static final String TEST_PACKAGE_NAME = "com.android.tethering.test"; private static final String TEST_PACKAGE_NAME = "com.android.tethering.test";
private static final String APEX_NAME = "com.android.tethering";
private static final long TEST_PACKAGE_VERSION = 1234L; private static final long TEST_PACKAGE_VERSION = 1234L;
@Mock private Context mContext; @Mock private Context mContext;
@Mock private TelephonyManager mTelephonyManager; @Mock private TelephonyManager mTelephonyManager;
@Mock private Resources mResources; @Mock private Resources mResources;
@Mock private Resources mResourcesForSubId; @Mock private Resources mResourcesForSubId;
@Mock private PackageManager mPackageManager; @Mock private PackageManager mPackageManager;
@Mock private ModuleInfo mMi;
private Context mMockContext; private Context mMockContext;
private boolean mHasTelephonyManager; private boolean mHasTelephonyManager;
private boolean mEnableLegacyDhcpServer; private boolean mEnableLegacyDhcpServer;
@@ -143,6 +146,8 @@ public class TetheringConfigurationTest {
final PackageInfo pi = new PackageInfo(); final PackageInfo pi = new PackageInfo();
pi.setLongVersionCode(TEST_PACKAGE_VERSION); pi.setLongVersionCode(TEST_PACKAGE_VERSION);
doReturn(pi).when(mPackageManager).getPackageInfo(eq(TEST_PACKAGE_NAME), anyInt()); doReturn(pi).when(mPackageManager).getPackageInfo(eq(TEST_PACKAGE_NAME), anyInt());
doReturn(mMi).when(mPackageManager).getModuleInfo(eq(APEX_NAME), anyInt());
doReturn(TEST_PACKAGE_NAME).when(mMi).getPackageName();
when(mResources.getStringArray(R.array.config_tether_dhcp_range)).thenReturn( when(mResources.getStringArray(R.array.config_tether_dhcp_range)).thenReturn(
new String[0]); new String[0]);
@@ -505,7 +510,7 @@ public class TetheringConfigurationTest {
.thenReturn(false); .thenReturn(false);
setTetherForceUpstreamAutomaticFlagVersion(TEST_PACKAGE_VERSION - 1); setTetherForceUpstreamAutomaticFlagVersion(TEST_PACKAGE_VERSION - 1);
assertTrue(DeviceConfigUtils.isFeatureEnabled(mMockContext, NAMESPACE_CONNECTIVITY, assertTrue(DeviceConfigUtils.isFeatureEnabled(mMockContext, NAMESPACE_CONNECTIVITY,
TetheringConfiguration.TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION)); TetheringConfiguration.TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION, APEX_NAME, false));
assertChooseUpstreamAutomaticallyIs(true); assertChooseUpstreamAutomaticallyIs(true);