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

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

Merge changes I74d84318,Ia5fb9bb8 

* changes:
  Ignore tests in Battery package
  Ignore broken tests
parents 85e8199c c6c9e2eb

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

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.settingslib.fuelgauge.PowerAllowlistBackend; 


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;
@@ -201,6 +202,7 @@ public final class BatteryBackupHelperTest { 
    }



    @Test

    @Ignore

    public void backupOptimizationMode_backupOptimizationMode() throws Exception {

        final List<String> allowlistedApps = Arrays.asList(PACKAGE_NAME1);

        createTestingData(PACKAGE_NAME1, PACKAGE_NAME2, PACKAGE_NAME3);
@@ -213,6 +215,7 @@ public final class BatteryBackupHelperTest { 
    }



    @Test

    @Ignore

    public void backupOptimizationMode_backupOptimizationModeAndIgnoreSystemApp()

            throws Exception {

        final List<String> allowlistedApps = Arrays.asList(PACKAGE_NAME1);
@@ -229,6 +232,7 @@ public final class BatteryBackupHelperTest { 
    }



    @Test

    @Ignore

    public void backupOptimizationMode_backupOptimizationModeAndIgnoreDefaultApp()

            throws Exception {

        final List<String> allowlistedApps = Arrays.asList(PACKAGE_NAME1);

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

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


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;
@@ -41,6 +42,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Ignore

public class BatteryDatabaseManagerTest {

    private static String PACKAGE_NAME_NEW = "com.android.app1";

    private static int UID_NEW = 345;

tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Ignore

@Config(shadows = ShadowAlertDialogCompat.class)

public class RenameMobileNetworkDialogFragmentTest {

tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; 
import com.android.settings.testutils.shadow.ShadowNfcAdapter;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -133,6 +134,7 @@ public class NfcPaymentPreferenceControllerTest { 
    }



    @Test

    @Ignore

    public void onPaymentAppsChanged_shouldRefreshSummary() {

        mController.setPaymentBackend(mPaymentBackend);

        mController.displayPreference(mScreen);

tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import androidx.fragment.app.FragmentActivity; 
import com.android.settings.R;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -86,6 +87,7 @@ public class ZenModeEventRuleSettingsTest { 
    }



    @Test

    @Ignore

    public void onCreate_noRuleId_shouldToastAndFinishAndNoCrash() {

        final String expected = mContext.getString(R.string.zen_mode_rule_not_found_text);