PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I10eb8818,I8f2152e2 into main

Browse Source 
* changes:
  Ignore failing tests under com.android.settings.location
  Ignore failing tests under com.android.settings.wifi.details
This commit is contained in:
Fan Wu
2023-11-28 06:26:55 +00:00
committed by Android (Google) Code Review
parent 4ac2d9c8db b593928ac2
commit 2991cfbc6a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
View File

@@ -44,6 +44,7 @@ import com.android.settings.widget.RestrictedAppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -114,6 +115,7 @@ public class LocationInjectedServicesPreferenceControllerTest {
verify(mContext).unregisterReceiver(mController.mInjectedSettingsReceiver); verify(mContext).unregisterReceiver(mController.mInjectedSettingsReceiver);
} }
@Ignore("b/313540388")
@Test @Test
public void workProfileDisallowShareLocationOn_getParentUserLocationServicesOnly() { public void workProfileDisallowShareLocationOn_getParentUserLocationServicesOnly() {
final int fakeWorkProfileId = 123; final int fakeWorkProfileId = 123;
@@ -166,6 +168,7 @@ public class LocationInjectedServicesPreferenceControllerTest {
verify(mSettingsInjector).reloadStatusMessages(); verify(mSettingsInjector).reloadStatusMessages();
} }
@Ignore("b/313540388")
@Test @Test
public void withUserRestriction_shouldDisableLocationAccuracy() { public void withUserRestriction_shouldDisableLocationAccuracy() {
final List<Preference> preferences = new ArrayList<>(); final List<Preference> preferences = new ArrayList<>();

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

@@ -94,6 +94,7 @@ import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback; import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -735,6 +736,7 @@ public class WifiDetailPreferenceController2Test {
verify(mMockRxLinkSpeedPref).setSummary("100 Mbps"); verify(mMockRxLinkSpeedPref).setSummary("100 Mbps");
} }
@Ignore("b/313536962")
@Test @Test
public void ssidPref_isSubscription_show() { public void ssidPref_isSubscription_show() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -934,6 +936,7 @@ public class WifiDetailPreferenceController2Test {
verify(mMockActivity, never()).finish(); verify(mMockActivity, never()).finish();
} }
@Ignore("b/313536962")
@Test @Test
public void noLinkProperties_allIpDetailsHidden() { public void noLinkProperties_allIpDetailsHidden() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -956,6 +959,7 @@ public class WifiDetailPreferenceController2Test {
verify(mMockDnsPref, never()).setVisible(true); verify(mMockDnsPref, never()).setVisible(true);
} }
@Ignore("b/313536962")
@Test @Test
public void disconnectedNetwork_allIpDetailsHidden() { public void disconnectedNetwork_allIpDetailsHidden() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
@@ -1005,6 +1009,7 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockIpv6AddressesPref).setSummary(text); inOrder.verify(mMockIpv6AddressesPref).setSummary(text);
} }
@Ignore("b/313536962")
@Test @Test
public void onLinkPropertiesChanged_updatesFields() { public void onLinkPropertiesChanged_updatesFields() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();