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

Commit 01e9ae19 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Split IME tests into 2 groups to adhere to runtime SLO 

Also fix a compilation warning about a null pointer exception

Fixes: 301574268
Test: atest FlickerTestsIme1 FlickerTestsIme2
Change-Id: I08486d1879b131ba505f71d8686a9ea1aafd4a5c
parent 0c491eb4

tests/FlickerTests/IME/Android.bp

+45 −0
Original line number Diff line number Diff line
@@ -23,6 +23,16 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "FlickerTestsImeCommon-src",

    srcs: ["src/**/common/*"],

}



filegroup {

    name: "FlickerTestsIme1-src",

    srcs: ["src/**/Close*"],

}



android_test {

    name: "FlickerTestsIme",

    defaults: ["FlickerTestsDefault"],
@@ -31,3 +41,38 @@ android_test { 
    srcs: ["src/**/*"],

    static_libs: ["FlickerTestsBase"],

}



java_library {

    name: "FlickerTestsImeCommon",

    defaults: ["FlickerTestsDefault"],

    srcs: [":FlickerTestsImeCommon-src"],

    static_libs: ["FlickerTestsBase"],

}



android_test {

    name: "FlickerTestsIme1",

    defaults: ["FlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [":FlickerTestsIme1-src"],

    static_libs: [

        "FlickerTestsBase",

        "FlickerTestsImeCommon",

    ],

}



android_test {

    name: "FlickerTestsIme2",

    defaults: ["FlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

    test_config_template: "AndroidTestTemplate.xml",

    srcs: ["src/**/*"],

    exclude_srcs: [

        ":FlickerTestsIme1-src",

        ":FlickerTestsImeCommon-src",

    ],

    static_libs: [

        "FlickerTestsBase",

        "FlickerTestsImeCommon",

    ],

}

tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/CommonAssertions.kt→tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/common/CommonAssertions.kt

+0 −0

File moved.

View file

tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/ImeShownOnAppStartHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ constructor( 
                    else -> null

                }

            if (matcher != null && matcher.find()) {

                return matcher.group(1).equals("VISIBLE")

                return matcher.group(1) == "VISIBLE"

            }

        }

        return false