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

Commit 67541a94 authored by Fan Wu's avatar Fan Wu Committed by Android (Google) Code Review
Browse files

Merge "Ignore existing failed tests and promote SettingsUnitTests to... 

Merge "Ignore existing failed tests and promote SettingsUnitTests to Presubmit. Exclude a few tests from Presubmit as they are failing in Presubmit but can pass locally." into main
parents 3e4a37ad f44ea077

TEST_MAPPING

+16 −19
Original line number Diff line number Diff line
@@ -7,22 +7,19 @@ 
      "name": "SettingsUnitTests",

      "options": [

              {

          "include-filter": "com.android.settings.biometrics"

                "exclude-filter": "com.android.settings.fuelgauge.batterysaver"

              },

              {

          "include-filter": "com.android.settings.biometrics2"

                "exclude-filter": "com.android.settings.network.telephony"

              },

              {

          "include-filter": "com.android.settings.password"

                "exclude-filter": "com.android.settings.privatespace"

              },

              {

          "include-filter": "com.android.settings.privatespace"

                "exclude-filter": "com.android.settings.regionalpreferences"

              },

              {

          "include-filter": "com.android.settings.safetycenter"

        },

        {

          "include-filter": "com.android.settings.security"

                "exclude-filter": "com.android.settings.vpn2"

              }

            ]

    }

tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settingslib.RestrictedSwitchPreference; 


import org.junit.Assert;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -188,6 +189,7 @@ public class ApprovalPreferenceControllerTest { 


    @Test

    @EnableFlags(Flags.FLAG_MODES_API)

    @Ignore("b/339550695")

    public void disable() {

        mController.disable(mCn);

        verify(mFeatureFactory.metricsFeatureProvider).action(

tests/unit/src/com/android/settings/bluetooth/QrCodeScanModeActivityTest.java

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.bluetooth; 
import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Intent;
@@ -28,11 +27,13 @@ import androidx.test.platform.app.InstrumentationRegistry; 
import com.android.settingslib.bluetooth.BluetoothBroadcastUtils;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;



@RunWith(AndroidJUnit4.class)

@Ignore("b/337418017")

public class QrCodeScanModeActivityTest {



    @Mock

tests/unit/src/com/android/settings/communal/CommunalPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ import com.android.settings.Utils; 
import com.android.settings.testutils.ResourcesUtils;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



@RunWith(AndroidJUnit4.class)

@Ignore("b/337417918")

public class CommunalPreferenceControllerTest {

    @Mock

    private UserManager mUserManager;

tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkFragmentControllerTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith 
import org.mockito.Mockito.mock

import org.mockito.Mockito.spy

import java.util.concurrent.Executor

import org.junit.Ignore



/** Unit tests for [ThreadNetworkFragmentController].  */

@RunWith(AndroidJUnit4::class)
@@ -99,6 +100,7 @@ class ThreadNetworkFragmentControllerTest { 
    }



    @Test

    @Ignore("b/339767488")

    fun getSummary_ThreadIsDisabled_returnsOff() {

        startController(controller)

        fakeThreadNetworkController.setEnabled(false, executor) {}