From 9eac60533300c39d040109f808b22a12833d54aa Mon Sep 17 00:00:00 2001 From: markchien Date: Wed, 19 May 2021 22:56:05 +0800 Subject: [PATCH] Fix tethering unit test fail in R The change aosp/1708088 break tethering unit test in R. Bug: 187946226 Test: atest TetheringTests in R and S Change-Id: I4eb4b757f6d7cd3458964c81310dcf0687a4f091 --- .../networkstack/tethering/EntitlementManagerTest.java | 2 ++ .../networkstack/tethering/TetheringConfigurationTest.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java index 8cfa7d01f2..5ae4b43f41 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java @@ -53,6 +53,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; +import android.content.pm.ModuleInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Resources; @@ -203,6 +204,7 @@ public final class EntitlementManagerTest { doReturn(mPm).when(mContext).getPackageManager(); doReturn(TEST_PACKAGE_NAME).when(mContext).getPackageName(); 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)) .thenReturn(new String[0]); diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java index 1f4e371c94..a6433a6330 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java @@ -35,6 +35,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; import android.content.Context; +import android.content.pm.ModuleInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; 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_APP_RESPONSE = "app_response"; 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; @Mock private Context mContext; @Mock private TelephonyManager mTelephonyManager; @Mock private Resources mResources; @Mock private Resources mResourcesForSubId; @Mock private PackageManager mPackageManager; + @Mock private ModuleInfo mMi; private Context mMockContext; private boolean mHasTelephonyManager; private boolean mEnableLegacyDhcpServer; @@ -143,6 +146,8 @@ public class TetheringConfigurationTest { final PackageInfo pi = new PackageInfo(); pi.setLongVersionCode(TEST_PACKAGE_VERSION); 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( new String[0]); @@ -505,7 +510,7 @@ public class TetheringConfigurationTest { .thenReturn(false); setTetherForceUpstreamAutomaticFlagVersion(TEST_PACKAGE_VERSION - 1); assertTrue(DeviceConfigUtils.isFeatureEnabled(mMockContext, NAMESPACE_CONNECTIVITY, - TetheringConfiguration.TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION)); + TetheringConfiguration.TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION, APEX_NAME, false)); assertChooseUpstreamAutomaticallyIs(true);