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

Merge "Fix broken dark ui test" into qt-dev

Browse Source 
am: 1eb92917c9

Change-Id: I96fb30ab6a4fd1a0b82727c4e3969b2e59c5d721
This commit is contained in:
Salvador Martinez
2019-04-30 00:02:41 -07:00
committed by android-build-merger
parent 4bcd5b2cfd 1eb92917c9
commit 0677441d03
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/display/DarkUIInfoDialogFragment.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.display;
import static com.android.settings.display.DarkUIPreferenceController.DARK_MODE_PREFS;
import static com.android.settings.display.DarkUIPreferenceController.PREF_DARK_MODE_DIALOG_SEEN;
import android.app.Dialog;
import android.app.UiModeManager;
import android.content.Context;

8
tests/robotests/src/com/android/settings/display/DarkUIInfoDialogFragmentTest.java
View File

@@ -26,9 +26,9 @@ import static org.mockito.Mockito.verify;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.provider.Settings;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -50,7 +50,6 @@ public class DarkUIInfoDialogFragmentTest {
}
@Test
@Ignore("b/130897882")
public void dialogDismissedOnConfirmation() {
doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
SharedPreferences prefs = RuntimeEnvironment.application.getSharedPreferences(
@@ -60,8 +59,7 @@ public class DarkUIInfoDialogFragmentTest {
.isFalse();
mFragment.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
verify(dialog, times(1)).dismiss();
assertThat(prefs.getBoolean(DarkUIPreferenceController.PREF_DARK_MODE_DIALOG_SEEN, false))
.isTrue();
assertThat(Settings.Secure.getInt(RuntimeEnvironment.application.getContentResolver(),
Settings.Secure.DARK_MODE_DIALOG_SEEN, -1)).isEqualTo(1);
}
}