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

Merge "Fixes to interstitial activity transitions" into main

Browse Source
This commit is contained in:
Yuri Lin
2024-08-07 21:05:38 +00:00
committed by Android (Google) Code Review
parent 5f60b880ea 707014b3f9
commit 74be225a4e
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/robotests/src/com/android/settings/notification/modes/SetupInterstitialActivityTest.java
View File

@@ -81,6 +81,41 @@ public class SetupInterstitialActivityTest {
when(mImage.getLayoutParams()).thenReturn(new ViewGroup.LayoutParams(0, 0));
}
@Test
public void invalidIntent_doesNotQueryBackend() {
// Mode is set up sensibly
ZenMode mode = new TestModeBuilder().setId(MODE_ID).setEnabled(false).build();
when(mBackend.getMode(MODE_ID)).thenReturn(mode);
// but the intent is lacking the zen mode extra
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class));
// creating the scenario takes it through onResume(), which would query the backend if
// it had mode data.
scenario.onActivity(activity -> {
assertThat(activity.isFinishing()).isTrue();
verify(mBackend, never()).getMode(any());
});
scenario.close();
}
@Test
public void invalidModeId_doesNotCrash() {
when(mBackend.getMode(MODE_ID)).thenReturn(null);
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
// do nothing, but it would crash if attempting to work with a null mode at any point
scenario.onActivity(activity -> {
assertThat(activity.isFinishing()).isTrue();
});
scenario.close();
}
@Test
public void enableButton_enablesModeAndRedirectsToModePage() {
ZenMode mode = new TestModeBuilder().setId(MODE_ID).setEnabled(false).build();