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

Merge "Override 2 getSliceUri() instance to return platform slice"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-31 18:03:44 +00:00
committed by Android (Google) Code Review
parent 0213ca3583 ec81d6121e
commit 75a5ef8c16
8 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.PowerManager;
import android.provider.SettingsSlicesContract;
import android.widget.Button;
import androidx.preference.PreferenceScreen;
@@ -72,6 +73,12 @@ public class BatterySaverButtonPreferenceControllerTest {
mController.displayPreference(mPreferenceScreen);
}
@Test
public void getSliceUri_shouldUsePlatformAuthority() {
assertThat(mController.getSliceUri().getAuthority())
.isEqualTo(SettingsSlicesContract.AUTHORITY);
}
@Test
public void updateState_lowPowerOn_preferenceIsChecked() {
when(mPowerManager.isPowerSaveMode()).thenReturn(true);

12
tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
View File

@@ -85,6 +85,12 @@ public class AirplaneModePreferenceControllerTest {
mLifecycle.addObserver(mController);
}
@Test
public void getSliceUri_shouldUsePlatformAuthority() {
assertThat(mController.getSliceUri().getAuthority())
.isEqualTo(SettingsSlicesContract.AUTHORITY);
}
@Test
@Config(qualifiers = "mcc999")
public void airplaneModePreference_shouldNotBeAvailable_ifSetToNotVisible() {
@@ -182,9 +188,7 @@ public class AirplaneModePreferenceControllerTest {
}
@Test
public void isSliceableCorrectKey_returnsTrue() {
final AirplaneModePreferenceController controller =
new AirplaneModePreferenceController(mContext,"toggle_airplane");
assertThat(controller.isSliceable()).isTrue();
public void isSliceable_returnsTrue() {
assertThat(mController.isSliceable()).isTrue();
}
}

3
tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java
View File

@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.net.Uri;
import com.android.settings.network.AirplaneModePreferenceController;
import com.android.settings.slices.CustomSliceRegistry;
import org.junit.Before;
@@ -47,7 +48,7 @@ public class InternetConnectivityPanelTest {
final List<Uri> uris = mPanel.getSlices();
assertThat(uris).containsExactly(
CustomSliceRegistry.AIRPLANE_URI,
AirplaneModePreferenceController.SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
CustomSliceRegistry.WIFI_SLICE_URI);
}