Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4c9afd8 authored by Chalard Jean's avatar Chalard Jean
Browse files

Use ConnectivityManager.MockHelpers 

Telephony tests mock ConnectivityManager private methods
but don't have access to their private types. In the
context that Connectivity would like to change the return
type of CM#registerNetworkAgent to a private type, offer
a simple solution to still mock it without having to
remove all checks from Telephony.

See also aosp/3543704

Test: FrameworksTelephonyTests
Change-Id: I61e5fa4b8ba6d8825d2c41bae907a0492c1f8b14
Merged-In: I61e5fa4b8ba6d8825d2c41bae907a0492c1f8b14
parent 8b2c3142

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+3 −2
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ public class ContextFixture implements TestFixture<Context> { 
        doReturn(mBundle).when(mCarrierConfigManager).getConfig();

        doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString());

        doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId();

        doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent(

        doReturn(ConnectivityManager.MockHelpers.registerNetworkAgentResult(mNetwork, null))

                .when(mConnectivityManager).registerNetworkAgent(

                        any(), any(), any(), any(), any(), any(), anyInt());



        doReturn(true).when(mEuiccManager).isEnabled();