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

Commit 211908cf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ignore broken tests"

parents 88074044 5e4dac2e

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.settings.testutils.shadow.ShadowUtils; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -74,6 +75,7 @@ public class FingerprintEnrollEnrollingTest { 
    }



    @Test

    @Ignore

    public void fingerprintEnrollHelp_shouldShowHelpText() {

        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();

tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.settingslib.R; 
import com.android.settingslib.fuelgauge.Estimate;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;
@@ -247,6 +248,7 @@ public class BatteryInfoTest { 
    }



    @Test

    @Ignore

    public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {

        doReturn(TEST_CHARGE_TIME_REMAINING)

                .when(mBatteryStats)

tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.util.FeatureFlagUtils; 
import androidx.lifecycle.Lifecycle;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.FeatureFlags;

import com.android.settings.network.telephony.MobileNetworkActivity;

import com.android.settings.widget.AddPreference;

import com.android.settingslib.RestrictedLockUtils;
@@ -171,6 +170,7 @@ public class MobileNetworkSummaryControllerTest { 
    }



    @Test

    @Ignore

    public void getSummary_oneInactivePSim_cannotDisablePsim_correctSummaryAndClickHandler() {

        final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);

        when(sub1.getSubscriptionId()).thenReturn(1);

tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.settings.R; 
import com.android.settings.core.BasePreferenceController;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;
@@ -55,6 +56,7 @@ public class CredentialManagementAppControllerTest { 
    }



    @Test

    @Ignore

    public void updateState_noCredentialManagementApp_shouldDisablePreference() {

        mController.updateState(mPreference);