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

Commit c48e9c29 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iebbb335f,If7fd3978 

* changes:
  Clear the setttings provider cache before test runs
  Add test mappings to ensure settings backup tests run on appropriate changes.
parents 22e282b3 b2b510e3

core/java/android/provider/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ 
                    "include-annotation": "android.platform.test.annotations.Presubmit"

                }

            ]

        },

        {

            "name": "SettingsProviderTest",

            "options": [

                {

                    "include-annotation": "android.platform.test.annotations.Presubmit"

                }

            ]

        }

    ]

}

packages/SettingsProvider/test/src/com/android/providers/settings/BaseSettingsProviderTest.java

+16 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import androidx.test.runner.AndroidJUnit4; 


import libcore.io.Streams;



import org.junit.After;

import org.junit.Before;

import org.junit.runner.RunWith;



import java.io.FileInputStream;
@@ -60,6 +62,20 @@ abstract class BaseSettingsProviderTest { 


    private int mSecondaryUserId = Integer.MIN_VALUE;



    @Before

    public void setUp() {

        Settings.Global.clearProviderForTest();

        Settings.Secure.clearProviderForTest();

        Settings.System.clearProviderForTest();

    }



    @After

    public void tearDown() {

        Settings.Global.clearProviderForTest();

        Settings.Secure.clearProviderForTest();

        Settings.System.clearProviderForTest();

    }



    protected void setStringViaFrontEndApiSetting(int type, String name, String value, int userId) {

        ContentResolver contentResolver = getContext().getContentResolver();

packages/SettingsProvider/test/src/com/android/providers/settings/InstallNonMarketAppsDeprecationTest.java

+4 −0
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ public class InstallNonMarketAppsDeprecationTest extends BaseSettingsProviderTes 
        return line.trim();

    }



    @Override

    @Before

    public void setUp() {

        super.setUp();

        mUm = (UserManager) getContext().getSystemService(Context.USER_SERVICE);

        mHasUserRestriction = mUm.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);

        mSystemSetUserRestriction = mUm.getUserRestrictionSource(
@@ -145,8 +147,10 @@ public class InstallNonMarketAppsDeprecationTest extends BaseSettingsProviderTes 
        assertTrue("Invalid value", value.equals("1") || value.equals("0"));

    }



    @Override

    @After

    public void tearDown() {

        super.tearDown();

        if (!mHasUserRestriction || mSystemSetUserRestriction) {

            // The test may have modified the user restriction state. Restore it.

            mUm.setUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsBackupAgentTest.java

+2 −0
Original line number Diff line number Diff line
@@ -64,8 +64,10 @@ public class SettingsBackupAgentTest extends BaseSettingsProviderTest { 
    private TestFriendlySettingsBackupAgent mAgentUnderTest;

    private Context mContext;



    @Override

    @Before

    public void setUp() {

        super.setUp();

        mContext = new ContextWithMockContentResolver(getContext());



        mAgentUnderTest = new TestFriendlySettingsBackupAgent();