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

Commit f2da6b69 authored by Dieter Hsu's avatar Dieter Hsu
Browse files

Clear settings provider before testing in A11yShortcutControllerTest 

Some tests in AccessibilityShortcutControllerTest are accessing to
settins, but static Settings.ContentProviderHolder may hold a real
provider before testing and cause failure with message "Failed to lookup
info for package null"

Bug: 136786077
Test: atest AccessibilityShortcutControllerTest
Change-Id: If691192e0e210b39d315248cfa087260fb20117a
parent d211a321

core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ import com.android.internal.R; 
import com.android.internal.accessibility.AccessibilityShortcutController.FrameworkObjectProvider;

import com.android.internal.accessibility.AccessibilityShortcutController.FrameworkObjectProvider;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.internal.util.test.FakeSettingsProvider;





import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;
@@ -136,6 +136,7 @@ public class AccessibilityShortcutControllerTest { 




        mContentResolver = new MockContentResolver(mContext);

        mContentResolver = new MockContentResolver(mContext);

        mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        FakeSettingsProvider.clearSettingsProvider();

        when(mContext.getContentResolver()).thenReturn(mContentResolver);

        when(mContext.getContentResolver()).thenReturn(mContentResolver);





        when(mAccessibilityManagerService.getInstalledAccessibilityServiceList(anyInt()))

        when(mAccessibilityManagerService.getInstalledAccessibilityServiceList(anyInt()))
@@ -193,8 +194,9 @@ public class AccessibilityShortcutControllerTest { 
        when(mTextToSpeech.getVoice()).thenReturn(mVoice);

        when(mTextToSpeech.getVoice()).thenReturn(mVoice);

    }

    }





    @After

    @AfterClass

    public void tearDown() {

    public static void cleanUpSettingsProvider() {

        FakeSettingsProvider.clearSettingsProvider();

    }

    }





    @Test

    @Test