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

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

Merge "Update TEST_MAPPING files following the move of BatteryStatsImpl"

parents 4a2b1849 445e9364

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

+3 −6
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

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

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

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

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

      ]

    },

    {
@@ -75,13 +74,11 @@ 
      "name": "FrameworksCoreTests",

      "options": [

        {

          "include-filter": "com.android.internal.os.BstatsCpuTimesValidationTest"

          "include-filter": "com.android.server.power.stats.BstatsCpuTimesValidationTest"

        }

      ],

      "file_patterns": [

        "BatteryStatsImpl\\.java",

        "KernelCpuUidFreqTimeReader\\.java",

        "KernelSingleUidTimeReader\\.java"

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

      ]

    }

  ]

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

+1 −2
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

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

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

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

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

      ]

    }

  ]

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

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

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

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

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

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

      ]

    }

  ],