Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d37d5df authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove ignore test case" into rvc-dev am: ad303450 am: e94cbd98 

Change-Id: I772373e7815dceac04431d16cb1de055a6d1634e
parents 857f09a4 e94cbd98

tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; 
import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;
@@ -81,7 +80,6 @@ public class AssistFlashScreenPreferenceControllerTest { 
    }



    @Test

    @Ignore

    @Config(shadows = {ShadowSecureSettings.class})

    public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {

        ReflectionHelpers.setField(mController, "mContext", mMockContext);
@@ -93,7 +91,6 @@ public class AssistFlashScreenPreferenceControllerTest { 
    }



    @Test

    @Ignore

    @Config(shadows = {ShadowSecureSettings.class})

    public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {

        ReflectionHelpers.setField(mController, "mContext", mMockContext);
@@ -112,7 +109,6 @@ public class AssistFlashScreenPreferenceControllerTest { 
    }



    @Test

    @Ignore

    @Config(shadows = {ShadowSecureSettings.class})

    public void onResume_shouldUpdatePreference() {

        Settings.Secure.putString(mContext.getContentResolver(),

tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; 
import com.android.settingslib.applications.DefaultAppInfo;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -95,7 +94,6 @@ public class DefaultAssistPreferenceControllerTest { 
    }



    @Test

    @Ignore

    @Config(shadows = {ShadowSecureSettings.class})

    public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {

        final String flattenKey = "com.android.settings/assist";

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; 
import com.android.settingslib.applications.DefaultAppInfo;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;
@@ -107,7 +106,6 @@ public class DefaultAutofillPickerTest { 
    }



    @Test

    @Ignore

    public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {

        mPicker.onAttach((Context) mActivity);

tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.provider.Settings; 
import com.android.settings.testutils.shadow.ShadowSecureSettings;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -61,7 +60,6 @@ public class StyleSuggestionActivityTest { 
    }



    @Test

    @Ignore

    @Config(shadows = ShadowSecureSettings.class)

    public void hasStyleSet_yes_shouldReturnTrue() {

        when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
@@ -73,7 +71,6 @@ public class StyleSuggestionActivityTest { 
    }



    @Test

    @Ignore

    @Config(shadows = ShadowSecureSettings.class)

    public void hasStyleSet_no_shouldReturnFalse() {

        when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))