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

Commit e59101c4 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Move BatteryStats and PowerStats tests to their own module 

Bug: 294400694
Test: atest PowerStatsTests

Change-Id: I6cce3db224daf9f23182bf718a132600f7917b54
parent b2bbe4b6

core/java/android/os/TEST_MAPPING

+2 −5
Original line number Diff line number Diff line
@@ -99,13 +99,10 @@ 
        "BatteryStats[^/]*\\.java",

        "BatteryUsageStats[^/]*\\.java",

        "PowerComponents\\.java",

        "PowerMonitor[^/]*\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.power.stats" },

        { "exclude-filter": "com.android.server.power.stats.BatteryStatsTests" }

      ]

      "name": "PowerStatsTests"

    },

    {

      "file_patterns": [

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

+9 −2
Original line number Diff line number Diff line
@@ -38,10 +38,17 @@ 
      ],

      "name": "FrameworksServicesTests",

      "options": [

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

        { "include-filter": "com.android.server.power.stats.BatteryStatsTests" }

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

      ]

    },

    {

      "file_patterns": [

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

        "Kernel[^/]*\\.java",

        "[^/]*Power[^/]*\\.java"

      ],

      "name": "PowerStatsTests"

    },

    {

      "name": "FrameworksCoreTests",

      "options": [

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

+1 −5
Original line number Diff line number Diff line
@@ -8,11 +8,7 @@ 
      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

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

        { "include-filter": "com.android.server.power.stats.BatteryStatsTests" }

      ]

      "name": "PowerStatsTests"

    }

  ]

}

core/tests/coretests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ android_test { 
    java_resources: [":ApkVerityTestCertDer"],



    data: [

        ":BstatsTestApp",

        ":BinderDeathRecipientHelperApp1",

        ":BinderDeathRecipientHelperApp2",

        ":com.android.cts.helpers.aosp",

core/tests/coretests/AndroidTest.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="FrameworksCoreTests.apk" />

        <option name="test-file-name" value="BstatsTestApp.apk" />

        <option name="test-file-name" value="BinderDeathRecipientHelperApp1.apk" />

        <option name="test-file-name" value="BinderDeathRecipientHelperApp2.apk" />

    </target_preparer>