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

Commit 8d735ccb authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Remove STOPSHIP code from CarrierTextControllerTest 

This code was added when the path to obtain the Subscription List was
changed to droidfood Telephony code. With the new behavior controlled by
the variable
CarrierTextController#mDisplayOpportunisticSubscriptionCarrierText we
don't need the extra code.

This change makes the tests more constrained

Test: this test
Fixes: 131433453
Change-Id: Iae911858f3271509e47de295773fe8d46ea195a8
parent 46669aa7

packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java

+1 −33
Original line number Diff line number Diff line
@@ -189,10 +189,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSimState(anyInt())).thenReturn(IccCardConstants.State.READY);

        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =
@@ -217,10 +213,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSimState(anyInt())).thenReturn(IccCardConstants.State.READY);

        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =
@@ -243,11 +235,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(

                new ArrayList<>());



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(

                new ArrayList<>());



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =

                ArgumentCaptor.forClass(

                        CarrierTextController.CarrierTextCallbackInfo.class);
@@ -271,10 +258,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSimState(anyInt())).thenReturn(IccCardConstants.State.READY);

        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =
@@ -300,10 +283,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
                .thenReturn(IccCardConstants.State.NOT_READY);

        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =
@@ -329,10 +308,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
                .thenReturn(IccCardConstants.State.READY);

        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =
@@ -361,10 +336,6 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);

        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =

                ArgumentCaptor.forClass(

                        CarrierTextController.CarrierTextCallbackInfo.class);
@@ -385,12 +356,9 @@ public class CarrierTextControllerTest extends SysuiTestCase { 
        list.add(TEST_SUBSCRIPTION_2);

        when(mKeyguardUpdateMonitor.getSimState(anyInt()))

            .thenReturn(IccCardConstants.State.READY);

        when(mKeyguardUpdateMonitor.getSubscriptionInfo(anyBoolean())).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

        mCarrierTextController.updateDisplayOpportunisticSubscriptionCarrierText();



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(list);



        ArgumentCaptor<CarrierTextController.CarrierTextCallbackInfo> captor =