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

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

Merge changes I10eb8818,I8f2152e2 into main 

* changes:
  Ignore failing tests under com.android.settings.location
  Ignore failing tests under com.android.settings.wifi.details
parents 4ac2d9c8 b593928a

tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.settings.widget.RestrictedAppPreference; 
import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;
@@ -114,6 +115,7 @@ public class LocationInjectedServicesPreferenceControllerTest { 
        verify(mContext).unregisterReceiver(mController.mInjectedSettingsReceiver);

    }



    @Ignore("b/313540388")

    @Test

    public void workProfileDisallowShareLocationOn_getParentUserLocationServicesOnly() {

        final int fakeWorkProfileId = 123;
@@ -166,6 +168,7 @@ public class LocationInjectedServicesPreferenceControllerTest { 
        verify(mSettingsInjector).reloadStatusMessages();

    }



    @Ignore("b/313540388")

    @Test

    public void withUserRestriction_shouldDisableLocationAccuracy() {

        final List<Preference> preferences = new ArrayList<>();

tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import com.android.wifitrackerlib.WifiEntry; 
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;
@@ -735,6 +736,7 @@ public class WifiDetailPreferenceController2Test { 
        verify(mMockRxLinkSpeedPref).setSummary("100 Mbps");

    }



    @Ignore("b/313536962")

    @Test

    public void ssidPref_isSubscription_show() {

        setUpForConnectedNetwork();
@@ -934,6 +936,7 @@ public class WifiDetailPreferenceController2Test { 
        verify(mMockActivity, never()).finish();

    }



    @Ignore("b/313536962")

    @Test

    public void noLinkProperties_allIpDetailsHidden() {

        setUpForConnectedNetwork();
@@ -956,6 +959,7 @@ public class WifiDetailPreferenceController2Test { 
        verify(mMockDnsPref, never()).setVisible(true);

    }



    @Ignore("b/313536962")

    @Test

    public void disconnectedNetwork_allIpDetailsHidden() {

        setUpForDisconnectedNetwork();
@@ -1005,6 +1009,7 @@ public class WifiDetailPreferenceController2Test { 
        inOrder.verify(mMockIpv6AddressesPref).setSummary(text);

    }



    @Ignore("b/313536962")

    @Test

    public void onLinkPropertiesChanged_updatesFields() {

        setUpForConnectedNetwork();