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

Commit 85e74cc4 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "TEST_MAPPING for BatteryStats" into sc-dev am: 47fe2c6a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd3867d363fe0c70543886fd175ffe72a0cf9d72
parents 439a250c 47fe2c6a

core/java/android/os/TEST_MAPPING

+17 −0
Original line number Diff line number Diff line
@@ -38,6 +38,23 @@ 
          "include-filter": "com.android.server.pm.parsing.PackageInfoUserFieldsTest"

        }

      ]

    },

    {

      "file_patterns": ["BatteryStats.java"],

      "name": "FrameworksCoreTests",

      "options": [

        { "include-filter": "com.android.internal.os.BatteryStatsTests" },

        { "exclude-annotation": "com.android.internal.os.SkipPresubmit" }

      ]

    },

    {

      "file_patterns": ["BatteryStats.java"],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" },

        { "include-filter": "com.android.server.am.MeasuredEnergySnapshotTest" },

        { "include-filter": "com.android.server.am.BatteryExternalStatsWorkerTest" }

      ]

    }

  ],

  "postsubmit": [

core/java/com/android/internal/os/TEST_MAPPING

+17 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "file_patterns": ["Battery[^/]*\\.java"],

      "name": "FrameworksCoreTests",

      "options": [

        { "include-filter": "com.android.internal.os.BatteryStatsTests" },

        { "exclude-annotation": "com.android.internal.os.SkipPresubmit" }

      ]

    },

    {

      "file_patterns": ["Battery[^/]*\\.java"],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" },

        { "include-filter": "com.android.server.am.MeasuredEnergySnapshotTest" },

        { "include-filter": "com.android.server.am.BatteryExternalStatsWorkerTest" }

      ]

    },

    {

      "name": "FrameworksCoreTests",

      "options": [

core/java/com/android/internal/power/TEST_MAPPING

0 → 100644
+19 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksCoreTests",

      "options": [

        { "include-filter": "com.android.internal.os.BatteryStatsTests" },

        { "exclude-annotation": "com.android.internal.os.SkipPresubmit" }

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" },

        { "include-filter": "com.android.server.am.MeasuredEnergySnapshotTest" },

        { "include-filter": "com.android.server.am.BatteryExternalStatsWorkerTest" }

      ]

    }

  ]

}

core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import java.util.Arrays; 
 * bit FrameworksCoreTests:com.android.internal.os.BatteryStatsCpuTimesTest

 */

@SmallTest

@SkipPresubmit("b/180015146")

@RunWith(AndroidJUnit4.class)

public class BatteryStatsCpuTimesTest {

    @Mock

core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class BatteryStatsImplTest { 
    }



    @Test

    @SkipPresubmit("b/180015146")

    public void testUpdateProcStateCpuTimes() {

        mBatteryStatsImpl.setOnBatteryInternal(true);

        mBatteryStatsImpl.updateTimeBasesLocked(false, Display.STATE_ON, 0, 0);
@@ -230,6 +231,7 @@ public class BatteryStatsImplTest { 
    }



    @Test

    @SkipPresubmit("b/180015146")

    public void testCopyFromAllUidsCpuTimes() {

        mBatteryStatsImpl.setOnBatteryInternal(false);

        mBatteryStatsImpl.updateTimeBasesLocked(false, Display.STATE_ON, 0, 0);