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

Commit c56011bb authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Extract out test package for Platinum tests" into main

parents 5759e94b cca00375

libs/WindowManager/Shell/tests/flicker/Android.bp

+25 −0
Original line number Diff line number Diff line
@@ -68,11 +68,23 @@ filegroup { 
    ],

}



filegroup {

    name: "WMShellFlickerServicePlatinumTests-src",

    srcs: [

        "src/com/android/wm/shell/flicker/service/*/platinum/**/*.kt",

        "src/com/android/wm/shell/flicker/service/*/scenarios/**/*.kt",

        "src/com/android/wm/shell/flicker/service/common/**/*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerServiceTests-src",

    srcs: [

        "src/com/android/wm/shell/flicker/service/**/*.kt",

    ],

    exclude_srcs: [

        "src/com/android/wm/shell/flicker/service/*/platinum/**/*.kt",

    ],

}



java_library {
@@ -143,6 +155,7 @@ android_test { 
        ":WMShellFlickerTestsSplitScreenGroup2-src",

        ":WMShellFlickerTestsSplitScreenBase-src",

        ":WMShellFlickerServiceTests-src",

        ":WMShellFlickerServicePlatinumTests-src",

    ],

}
@@ -210,3 +223,15 @@ android_test { 
        ":WMShellFlickerServiceTests-src",

    ],

}



android_test {

    name: "WMShellFlickerServicePlatinumTests",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestService.xml"],

    package_name: "com.android.wm.shell.flicker.service",

    instrumentation_target_package: "com.android.wm.shell.flicker.service",

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerServicePlatinumTests-src",

    ],

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/common/Utils.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.flicker.service

package com.android.wm.shell.flicker.service.common



import android.app.Instrumentation

import android.platform.test.rule.NavigationModeRule

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/CopyContentInSplit.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import com.android.wm.shell.flicker.service.common.Utils

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Before

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DismissSplitScreenByDivider.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import com.android.wm.shell.flicker.service.common.Utils

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Before

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DismissSplitScreenByGoHome.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import com.android.wm.shell.flicker.service.common.Utils

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Before