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

Commit de88a981 authored by Ahmad Khalil's avatar Ahmad Khalil
Browse files

Extract vibrator cts tests from CtsOsTestCases 

Trigger the vibrator cts tests from services and core TEST_MAPPING files.

Fix: 290746931
Test: atest CtsVibratorTestCases
Change-Id: I1e955321f03c90ad3b5f3c4a2401093139cf4726
parent 90a49af2

core/java/android/os/TEST_MAPPING

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,19 @@ 
        {"exclude-annotation": "org.junit.Ignore"}

      ]

    },

    {

      "file_patterns": [

        "[^/]*(Vibrator|Vibration)[^/]*\\.java",

        "vibrator/.*"

      ],

      "name": "CtsVibratorTestCases",

      "options": [

        {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    },

    {

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

      "name": "BugreportManagerTestCases",

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

+4 −15
Original line number Diff line number Diff line 
{

  "presubmit": [

  "imports": [

    {

      "name": "FrameworksVibratorServicesTests",

      "options": [

        {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ],

  "postsubmit": [

      "path": "frameworks/base/services/tests/vibrator"

    },

    {

      "name": "FrameworksVibratorServicesTests",

      "options": [

        {"exclude-annotation": "org.junit.Ignore"}

      ]

      "path": "cts/tests/vibrator"

    }

  ]

}

services/core/jni/TEST_MAPPING

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

  "presubmit": [

    {

      "file_patterns": [

        "[^/]*(vibrator)[^/]*\\.[^/]*"

      ],

      "name": "CtsVibratorTestCases",

      "options": [

        {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ]

}

services/tests/vibrator/TEST_MAPPING

+16 −2
Original line number Diff line number Diff line 
{

  "imports": [

  "presubmit": [

    {

      "path": "frameworks/base/services/core/java/com/android/server/vibrator"

      "name": "FrameworksVibratorServicesTests",

      "options": [

        {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "FrameworksVibratorServicesTests",

      "options": [

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ]

}