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

Merge "Do not block UI when this page didn't have slice"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-24 09:57:50 +00:00
committed by Android (Google) Code Review
parent 202b84b8df d49de61f96
commit 818ad60218
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.net.Uri;
import android.os.Bundle;
import androidx.preference.Preference;
@@ -240,14 +241,28 @@ public class DashboardFragmentTest {
}
@Test
public void checkUiBlocker_hasUiBlocker_controllerNotNull() {
public void checkUiBlocker_hasUiBlockerAndControllerIsAvailable_controllerNotNull() {
final BlockingSlicePrefController controller =
new BlockingSlicePrefController(mContext, "pref_key");
controller.setSliceUri(Uri.parse("testUri"));
mTestFragment.mBlockerController = null;
mControllers.add(new TestPreferenceController(mContext));
mControllers.add(controller);
mTestFragment.checkUiBlocker(mControllers);
assertThat(mTestFragment.mBlockerController).isNotNull();
}
@Test
public void checkUiBlocker_hasUiBlockerAndControllerIsNotAvailable_controllerIsNull() {
mTestFragment.mBlockerController = null;
mControllers.add(new TestPreferenceController(mContext));
mControllers.add(new BlockingSlicePrefController(mContext, "pref_key"));
mTestFragment.checkUiBlocker(mControllers);
assertThat(mTestFragment.mBlockerController).isNotNull();
assertThat(mTestFragment.mBlockerController).isNull();
}
public static class TestPreferenceController extends AbstractPreferenceController