Commit 163db598 authored by Wenyu Fu's avatar Wenyu Fu Committed by Commit Bot

Fix setup for MainSettingsFragmentTest

NightMode is not default enabled (supported) for Kitkat testers. Set
static test Boolean for NightModeUtil to avoid test errors on Kitkat.

Bug: 1067575
Change-Id: I4062b97279904e08b61c568c89a421308542485e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135887
Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756412}
parent 58eae936
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
package org.chromium.chrome.browser.settings; package org.chromium.chrome.browser.settings;
import android.accounts.Account; import android.accounts.Account;
import android.os.Build.VERSION_CODES;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -23,7 +22,6 @@ import org.mockito.Mockito; ...@@ -23,7 +22,6 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.about_settings.AboutChromeSettings; import org.chromium.chrome.browser.about_settings.AboutChromeSettings;
import org.chromium.chrome.browser.accessibility.settings.AccessibilitySettings; import org.chromium.chrome.browser.accessibility.settings.AccessibilitySettings;
...@@ -80,11 +78,13 @@ public class MainSettingsFragmentTest { ...@@ -80,11 +78,13 @@ public class MainSettingsFragmentTest {
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
DeveloperSettings.setIsEnabledForTests(true); DeveloperSettings.setIsEnabledForTests(true);
NightModeUtils.setNightModeSupportedForTesting(true);
} }
@After @After
public void tearDown() { public void tearDown() {
DeveloperSettings.setIsEnabledForTests(null); DeveloperSettings.setIsEnabledForTests(null);
NightModeUtils.setNightModeSupportedForTesting(null);
if (mActualTemplateUrlService != null) { if (mActualTemplateUrlService != null) {
// Reset the actual service if the mock is used. // Reset the actual service if the mock is used.
TemplateUrlServiceFactory.setInstanceForTesting(mActualTemplateUrlService); TemplateUrlServiceFactory.setInstanceForTesting(mActualTemplateUrlService);
...@@ -117,7 +117,6 @@ public class MainSettingsFragmentTest { ...@@ -117,7 +117,6 @@ public class MainSettingsFragmentTest {
*/ */
@Test @Test
@SmallTest @SmallTest
@DisableIf.Build(sdk_is_less_than = VERSION_CODES.LOLLIPOP)
public void testStartup() { public void testStartup() {
launchSettingsActivity(); launchSettingsActivity();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment