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

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

Merge "Revert "Move AM/WM unit tests out of FrameworksServicesTests to WmTests""

parents 60871d84 3d294e73

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

+22 −0
Original line number Diff line number Diff line
@@ -36,6 +36,20 @@ 
        }

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "WmTests",

      "options": [
@@ -58,6 +72,14 @@ 
    {

      "name": "CtsActivityManagerDeviceSdk25TestCases"

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "WmTests",

      "options": [

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

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

  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        },

        {

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

        },

        {

          "exclude-annotation": "android.support.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "WmTests",

      "options": [
@@ -16,6 +30,14 @@ 
    }

  ],

  "postsubmit": [

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "WmTests",

      "options": [

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

+22 −0
Original line number Diff line number Diff line
@@ -11,6 +11,20 @@ 
        }

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        },

        {

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

        },

        {

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

        }

      ]

    },

    {

      "name": "WmTests",

      "options": [
@@ -30,6 +44,14 @@ 
    {

      "name": "CtsWindowManagerDeviceTestCases"

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "WmTests",

      "options": [

services/tests/wmtests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java→services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import org.junit.runner.RunWith; 
 * Tests for exercising resizing bounds due to activity options.

 *

 * Build/Install/Run:

 *  atest WmTests:ActivityLaunchParamsModifierTests

 *  atest FrameworksServicesTests:ActivityLaunchParamsModifierTests

 */

@MediumTest

@Presubmit

services/tests/wmtests/src/com/android/server/am/ActivityManagerInternalTest.java→services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java

+11 −2
Original line number Diff line number Diff line
@@ -34,8 +34,17 @@ import org.mockito.MockitoAnnotations; 
/**

 * Test class for {@link ActivityManagerInternal}.

 *

 * Build/Install/Run:

 *  atest WmTests:ActivityManagerInternalTest

 * To run the tests, use

 *

 * runtest -c com.android.server.am.ActivityManagerInternalTest frameworks-services

 *

 * or the following steps:

 *

 * Build: m FrameworksServicesTests

 * Install: adb install -r \

 *     ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk

 * Run: adb shell am instrument -e class com.android.server.am.ActivityManagerInternalTest -w \

 *     com.android.frameworks.servicestests/androidx.test.runner.AndroidJUnitRunner

 */

@RunWith(AndroidJUnit4.class)

public class ActivityManagerInternalTest {