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

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

Turn some systemui tests back on. 

Test: runtest systemui
Fixes: 63887322
Change-Id: I8bcf8c1d2d118a7327736734a39529e51a2a8d2f
parent 75e7ee93

packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java

+0 −2
Original line number Diff line number Diff line
@@ -38,14 +38,12 @@ import com.android.systemui.plugins.ActivityStarter; 
import com.android.systemui.plugins.qs.DetailAdapter;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@SmallTest

@Ignore("failing")

public class QSDetailTest extends SysuiTestCase {



    private MetricsLogger mMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import java.util.concurrent.Executor; 


@SmallTest

@RunWith(AndroidJUnit4.class)

@FlakyTest

public class NotificationInflaterTest extends SysuiTestCase {



    private NotificationInflater mNotificationInflater;

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

+0 −14
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import android.test.suitebuilder.annotation.SmallTest; 


import com.android.settingslib.net.DataUsageController;



import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -21,7 +20,6 @@ import org.junit.runner.RunWith; 
public class NetworkControllerDataTest extends NetworkControllerBaseTest {



    @Test

    @Ignore("Flaky")

    public void test3gDataIcon() {

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



    @Test

    @Ignore("Flaky")

    public void test2gDataIcon() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testCdmaDataIcon() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testEdgeDataIcon() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testLteDataIcon() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testHspaDataIcon() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testWfcNoDataIcon() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void test4gDataIcon() {

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

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



    @Test

    @Ignore("Flaky")

    public void testDataDisabledIcon() {

        setupNetworkController();

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



    @Test

    @Ignore("Flaky")

    public void testDataDisabledIcon_UserNotSetup() {

        setupNetworkController();

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



    @Test

    @Ignore("Flaky")

    public void test4gDataIconConfigChange() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testDataChangeWithoutConnectionState() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testDataActivity() {

        setupDefaultSignal();

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

+0 −30
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.settingslib.net.DataUsageController; 
import com.android.systemui.R;

import com.android.systemui.statusbar.phone.SignalDrawable;



import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -51,7 +50,6 @@ import static org.mockito.Mockito.mock; 
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,7 +64,6 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoSimsIconPresent() {

        // No Subscriptions.

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



    @Test

    @Ignore("Flaky")

    public void testEmergencyOnly() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testEmergencyOnlyNoSubscriptions() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testNoEmergencyOnlyWrongSubscription() {

        setupDefaultSignal();

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



    @Test

    @Ignore("Flaky")

    public void testNoEmengencyNoSubscriptions() {

        setupDefaultSignal();

        setSubscriptions();
@@ -119,7 +112,6 @@ 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);
@@ -138,7 +130,6 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testSignalStrength() {

        for (int testStrength = 0;

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



    @Test

    @Ignore("Flaky")

    public void testCdmaSignalStrength() {

        for (int testStrength = 0;

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



    @Test

    @Ignore("Flaky")

    public void testSignalRoaming() {

        for (int testStrength = 0;

                testStrength < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; testStrength++) {
@@ -186,7 +175,6 @@ 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++) {
@@ -202,7 +190,6 @@ 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++) {
@@ -216,7 +203,6 @@ 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++) {
@@ -231,7 +217,6 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testNoBangWithWifi() {

        setupDefaultSignal();

        setConnectivity(mMobileSignalController.mTransportType, false, false);
@@ -243,7 +228,6 @@ 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;
@@ -271,7 +255,6 @@ 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;
@@ -325,7 +308,6 @@ 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));
@@ -339,7 +321,6 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_spn() {

        String expectedMNetworkName = "Test";

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



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_plmn() {

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



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_bothFalse() {

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

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



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_bothTrueAndNull() {

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

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



    @Test

    @Ignore("Flaky")

    public void testOnReceive_stringsUpdatedAction_bothTrueAndNonNull() {

        String spn = "Test1";

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



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataIn() {

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



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataOut() {

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



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataInOut() {

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



    @Test

    @Ignore("Flaky")

    public void testOnUpdateDataActivity_dataActivityNone() {

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



    @Test

    @Ignore("Flaky")

    public void testCarrierNetworkChange_carrierNetworkChange() {

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



    @Test

    @Ignore("Flaky")

    public void testCarrierNetworkChange_roamingBeforeNetworkChange() {

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



    @Test

    @Ignore("Flaky")

    public void testCarrierNetworkChange_roamingAfterNetworkChange() {

      int strength = SignalStrength.SIGNAL_STRENGTH_GREAT;