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

Commit adb285ed authored by Adnan Begovic's avatar Adnan Begovic Committed by Gerrit Code Review
Browse files

SystemUI: Fix CallbackHandler and NetworkControllerBase tests. 

Change-Id: I075762da167072e15769012135b70c8f4cad2ba9
parent 2f47c989

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java

+5 −2
Original line number Diff line number Diff line
@@ -103,9 +103,10 @@ public class CallbackHandlerTest extends AndroidTestCase { 
        int type = R.drawable.stat_sys_data_fully_connected_1x;

        int qsType = R.drawable.ic_qs_signal_1x;

        boolean wide = true;

        boolean showSeparateRoamIndicator = false;

        int subId = 5;

        mHandler.setMobileDataIndicators(status, qs, type, qsType, in, out, typeDescription,

                description, wide, subId);

                description, wide, showSeparateRoamIndicator, subId);

        waitForCallbacks();



        ArgumentCaptor<IconState> statusArg = ArgumentCaptor.forClass(IconState.class);
@@ -117,11 +118,13 @@ public class CallbackHandlerTest extends AndroidTestCase { 
        ArgumentCaptor<String> typeContentArg = ArgumentCaptor.forClass(String.class);

        ArgumentCaptor<String> descArg = ArgumentCaptor.forClass(String.class);

        ArgumentCaptor<Boolean> wideArg = ArgumentCaptor.forClass(Boolean.class);

        ArgumentCaptor<Boolean> showSeparateRoamIndicatorArg =

                ArgumentCaptor.forClass(Boolean.class);

        ArgumentCaptor<Integer> subIdArg = ArgumentCaptor.forClass(Integer.class);

        Mockito.verify(mSignalCallback).setMobileDataIndicators(statusArg.capture(),

                qsArg.capture(), typeIconArg.capture(), qsTypeIconArg.capture(), inArg.capture(),

                outArg.capture(), typeContentArg.capture(), descArg.capture(), wideArg.capture(),

                subIdArg.capture());

                showSeparateRoamIndicatorArg.capture(), subIdArg.capture());

        assertEquals(status, statusArg.getValue());

        assertEquals(qs, qsArg.getValue());

        assertEquals(type, (int) typeIconArg.getValue());

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
                    ArgumentCaptor.forClass(String.class).capture(),

                    ArgumentCaptor.forClass(String.class).capture(),

                    ArgumentCaptor.forClass(Boolean.class).capture(),

                    ArgumentCaptor.forClass(Boolean.class).capture(),

                    ArgumentCaptor.forClass(Integer.class).capture());

        IconState iconState = iconArg.getValue();

        assertEquals("Visibility in, quick settings", visible, iconState.visible);
@@ -305,6 +306,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
                ArgumentCaptor.forClass(String.class).capture(),

                ArgumentCaptor.forClass(String.class).capture(),

                ArgumentCaptor.forClass(Boolean.class).capture(),

                ArgumentCaptor.forClass(Boolean.class).capture(),

                ArgumentCaptor.forClass(Integer.class).capture());

        IconState iconState = iconArg.getValue();