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

Commit ba918dbf authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

Move @Ignore from class-level to test level. 

Workaround for reporting error.

Test: runtest systemui
Bug: 63521982
Change-Id: I81e70605471469b0ffa630ff874427a621fc1135
parent 9df88e1f

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

+13 −1
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ import org.junit.runner.RunWith; 


@SmallTest

@RunWith(AndroidJUnit4.class)

@Ignore("Flaky")

public class NetworkControllerDataTest extends NetworkControllerBaseTest {



    @Test

    @Ignore("Flaky")

    public void test3gDataIcon() {

        setupDefaultSignal();
@@ -30,6 +30,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void test2gDataIcon() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -40,6 +41,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCdmaDataIcon() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -50,6 +52,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testEdgeDataIcon() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -60,6 +63,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testLteDataIcon() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -70,6 +74,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testHspaDataIcon() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -80,6 +85,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testWfcNoDataIcon() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -89,6 +95,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void test4gDataIcon() {

        // Switch to showing 4g icon and re-initialize the NetworkController.

        mConfig.show4gForLte = true;
@@ -108,6 +115,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testDataDisabledIcon() {

        setupNetworkController();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);
@@ -120,6 +128,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testDataDisabledIcon_UserNotSetup() {

        setupNetworkController();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);
@@ -134,6 +143,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void test4gDataIconConfigChange() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -151,6 +161,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testDataChangeWithoutConnectionState() {

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
@@ -167,6 +178,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testDataActivity() {

        setupDefaultSignal();

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

+29 −1
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ import static org.mockito.Mockito.mock; 


@SmallTest

@RunWith(AndroidJUnit4.class)

@Ignore("Flaky")

public class NetworkControllerSignalTest extends NetworkControllerBaseTest {



    @Test

    @Ignore("Flaky")

    public void testNoIconWithoutMobile() {

        // Turn off mobile network support.

        Mockito.when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
@@ -66,6 +66,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoSimsIconPresent() {

        // No Subscriptions.

        mNetworkController.mMobileSignalControllers.clear();
@@ -75,6 +76,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testEmergencyOnly() {

        setupDefaultSignal();

        mNetworkController.recalculateEmergency();
@@ -86,6 +88,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testEmergencyOnlyNoSubscriptions() {

        setupDefaultSignal();

        setSubscriptions();
@@ -96,6 +99,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoEmergencyOnlyWrongSubscription() {

        setupDefaultSignal();

        setDefaultSubId(42);
@@ -104,6 +108,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoEmengencyNoSubscriptions() {

        setupDefaultSignal();

        setSubscriptions();
@@ -114,6 +119,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoSimlessIconWithoutMobile() {

        // Turn off mobile network support.

        Mockito.when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
@@ -132,6 +138,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testSignalStrength() {

        for (int testStrength = 0;

                testStrength < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; testStrength++) {
@@ -149,6 +156,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCdmaSignalStrength() {

        for (int testStrength = 0;

                testStrength < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; testStrength++) {
@@ -163,6 +171,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testSignalRoaming() {

        for (int testStrength = 0;

                testStrength < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; testStrength++) {
@@ -177,6 +186,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCdmaSignalRoaming() {

        for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

                testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
@@ -192,6 +202,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testQsSignalStrength() {

        for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

                testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
@@ -205,6 +216,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCdmaQsSignalStrength() {

        for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

                testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
@@ -219,6 +231,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoBangWithWifi() {

        setupDefaultSignal();

        setConnectivity(mMobileSignalController.mTransportType, false, false);
@@ -230,6 +243,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    // Some tests of actual NetworkController code, just internals not display stuff

    // TODO: Put this somewhere else, maybe in its own file.

    @Test

    @Ignore("Flaky")

    public void testHasCorrectMobileControllers() {

        int[] testSubscriptions = new int[] { 1, 5, 3 };

        int notTestSubscription = 0;
@@ -257,6 +271,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testSetCurrentSubscriptions() {

        // We will not add one controller to make sure it gets created.

        int indexToSkipController = 0;
@@ -310,6 +325,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testHistorySize() {

        // Verify valid history size, otherwise it gits printed out the wrong order and whatnot.

        assertEquals(0, SignalController.HISTORY_SIZE & (SignalController.HISTORY_SIZE - 1));
@@ -323,6 +339,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_spn() {

        String expectedMNetworkName = "Test";

        Intent intent = createStringsUpdatedIntent(true /* showSpn */,
@@ -336,6 +353,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_plmn() {

        String expectedMNetworkName = "Test";
@@ -350,6 +368,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_bothFalse() {

        Intent intent = createStringsUpdatedIntent(false /* showSpn */,

              "Irrelevant" /* spn */,
@@ -365,6 +384,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_bothTrueAndNull() {

        Intent intent = createStringsUpdatedIntent(true /* showSpn */,

            null /* spn */,
@@ -379,6 +399,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_bothTrueAndNonNull() {

        String spn = "Test1";

        String plmn = "Test2";
@@ -413,6 +434,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataIn() {

        setupDefaultSignal();
@@ -427,6 +449,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataOut() {

      setupDefaultSignal();
@@ -440,6 +463,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataInOut() {

      setupDefaultSignal();
@@ -454,6 +478,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataActivityNone() {

      setupDefaultSignal();
@@ -468,6 +493,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCarrierNetworkChange_carrierNetworkChange() {

      int strength = SignalStrength.SIGNAL_STRENGTH_GREAT;
@@ -497,6 +523,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCarrierNetworkChange_roamingBeforeNetworkChange() {

      int strength = SignalStrength.SIGNAL_STRENGTH_GREAT;
@@ -530,6 +557,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testCarrierNetworkChange_roamingAfterNetworkChange() {

      int strength = SignalStrength.SIGNAL_STRENGTH_GREAT;