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

Commit ea885b5e authored by Linus Tufvesson's avatar Linus Tufvesson
Browse files

Fix AppCompactorTest and add a presubmit TEST_RULE 

Test will run as presubmit if AppCompactor.java is modified.

Modifying server/TEST_MAPPING to add "include-filter":
"com.android.server." to make sure it still runs as expected.

Bug: 128613287
Bug: 129341058

Test: atest --test-mapping [while in com/android/server/am/]
Test: atest FrameworksMockingServicesTests:AppCompactorTest
Change-Id: I6238f83c0f94d9a9ca593ddab5169667150a5583
parent fdafee50

services/core/java/com/android/server/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
            "name": "FrameworksMockingServicesTests",

            "file_patterns": ["AlarmManagerService\\.java"],

            "options": [

                {

                  "include-filter": "com.android.server."

                },

                {

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

                },

services/core/java/com/android/server/am/TEST_MAPPING

+15 −0
Original line number Diff line number Diff line
@@ -27,6 +27,21 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "FrameworksMockingServicesTests",

      "file_patterns": ["AppCompactor\\.java"],

      "options": [

        {

          "include-filter": "com.android.server.am."

        },

        {

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

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    }

  ],

  "postsubmit": [

services/tests/mockingservicestests/src/com/android/server/am/AppCompactorTest.java

+23 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; 


import android.os.Handler;

import android.os.HandlerThread;

import android.platform.test.annotations.Presubmit;

import android.provider.DeviceConfig;



import com.android.server.appop.AppOpsService;
@@ -46,6 +47,7 @@ import java.util.concurrent.TimeUnit; 
 * Build/Install/Run:

 * atest FrameworksMockingServicesTests:AppCompactorTest

 */

@Presubmit

@RunWith(MockitoJUnitRunner.class)

public final class AppCompactorTest {
@@ -128,6 +130,12 @@ public final class AppCompactorTest { 
        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_4,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_5,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_6,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_STATSD_SAMPLE_RATE,

                Float.toString(AppCompactor.DEFAULT_STATSD_SAMPLE_RATE + 0.1f), false);
@@ -151,6 +159,10 @@ public final class AppCompactorTest { 
                AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1);

        assertThat(mCompactorUnderTest.mStatsdSampleRate).isEqualTo(

                AppCompactor.DEFAULT_STATSD_SAMPLE_RATE + 0.1f);

        assertThat(mCompactorUnderTest.mCompactThrottleBFGS).isEqualTo(

                AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1);

        assertThat(mCompactorUnderTest.mCompactThrottlePersistent).isEqualTo(

                AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1);

    }



    @Test
@@ -254,7 +266,7 @@ public final class AppCompactorTest { 
        mCompactorUnderTest.init();



        // When we override new reasonable throttle values after init...

        mCountDown = new CountDownLatch(4);

        mCountDown = new CountDownLatch(6);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_1,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_1 + 1), false);
@@ -267,6 +279,12 @@ public final class AppCompactorTest { 
        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_4,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_5,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                AppCompactor.KEY_COMPACT_THROTTLE_6,

                Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1), false);

        assertThat(mCountDown.await(5, TimeUnit.SECONDS)).isTrue();



        // Then those flags values are reflected in the compactor.
@@ -278,6 +296,10 @@ public final class AppCompactorTest { 
                AppCompactor.DEFAULT_COMPACT_THROTTLE_3 + 1);

        assertThat(mCompactorUnderTest.mCompactThrottleFullFull).isEqualTo(

                AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1);

        assertThat(mCompactorUnderTest.mCompactThrottleBFGS).isEqualTo(

                AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1);

        assertThat(mCompactorUnderTest.mCompactThrottlePersistent).isEqualTo(

                AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1);

    }



    @Test