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

Commit 3b9e9d28 authored by Kweku Adams's avatar Kweku Adams
Browse files

Remove DeviceConfig dependency. 

Remove dependency on writing and reading values to and from DeviceConfig
and just use the local DeviceConfig.Properties object instead.

Bug: 255679453
Test: atest FrameworksServicesTests:WorkTypeConfigTest
Change-Id: If904b0dc89ea60edbf1de3a6d8cda14a38343cfa
parent bd224c8a

services/tests/servicestests/src/com/android/server/job/WorkTypeConfigTest.java

+3 −30
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.test.runner.AndroidJUnit4; 




import com.android.server.job.JobConcurrencyManager.WorkTypeConfig;

import com.android.server.job.JobConcurrencyManager.WorkTypeConfig;





import org.junit.After;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;
@@ -59,30 +58,6 @@ public class WorkTypeConfigTest { 
    private static final String KEY_MIN_BGUSER_IMPORTANT = "concurrency_min_bguser_important_test";

    private static final String KEY_MIN_BGUSER_IMPORTANT = "concurrency_min_bguser_important_test";

    private static final String KEY_MIN_BGUSER = "concurrency_min_bguser_test";

    private static final String KEY_MIN_BGUSER = "concurrency_min_bguser_test";





    @After

    public void tearDown() throws Exception {

        resetConfig();

    }



    private void resetConfig() {

        // DeviceConfig.resetToDefaults() doesn't work here. Need to reset constants manually.

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MAX_TOTAL, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MAX_TOP, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MAX_FGS, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MAX_EJ, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MAX_BG, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER,

                KEY_MAX_BGUSER_IMPORTANT, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MAX_BGUSER, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MIN_TOP, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MIN_FGS, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MIN_EJ, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MIN_BG, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER,

                KEY_MIN_BGUSER_IMPORTANT, null, false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_JOB_SCHEDULER, KEY_MIN_BGUSER, null, false);

    }



    private void check(@Nullable DeviceConfig.Properties config,

    private void check(@Nullable DeviceConfig.Properties config,

            int defaultTotal,

            int defaultTotal,

            @NonNull List<Pair<Integer, Integer>> defaultMin,

            @NonNull List<Pair<Integer, Integer>> defaultMin,
@@ -90,10 +65,6 @@ public class WorkTypeConfigTest { 
            boolean expectedValid, int expectedTotal,

            boolean expectedValid, int expectedTotal,

            @NonNull List<Pair<Integer, Integer>> expectedMinLimits,

            @NonNull List<Pair<Integer, Integer>> expectedMinLimits,

            @NonNull List<Pair<Integer, Integer>> expectedMaxLimits) throws Exception {

            @NonNull List<Pair<Integer, Integer>> expectedMaxLimits) throws Exception {

        resetConfig();

        if (config != null) {

            DeviceConfig.setProperties(config);

        }





        final WorkTypeConfig counts;

        final WorkTypeConfig counts;

        try {

        try {
@@ -112,7 +83,9 @@ public class WorkTypeConfigTest { 
            }

            }

        }

        }





        counts.update(DeviceConfig.getProperties(DeviceConfig.NAMESPACE_JOB_SCHEDULER));

        if (config != null) {

            counts.update(config);

        }





        assertEquals(expectedTotal, counts.getMaxTotal());

        assertEquals(expectedTotal, counts.getMaxTotal());

        for (Pair<Integer, Integer> min : expectedMinLimits) {

        for (Pair<Integer, Integer> min : expectedMinLimits) {