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

Commit 8da8065d authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Split scenario and tests on flicker service tests

This is necessary to simplify running, identifying and maintaining failures, as well as improving module isolation.

Key issues:
- Split screen platinum, benchmark and flicker tests were clustered together in a confusing way
- Desktop mode and split screen tests were in the same module and flakiness in one type of tests affected the other

The new format is:

```
shell/tests/e2e
--------> desktopmode
----------------> scenario definition
----------------> flicker-service
--------> splitscreen
----------------> scenario definition
----------------> flicker-service
----------------> flicker-legacy
----------------> platinum
--------> <others still to be moved>
```

Flag: TEST_ONLY
Test: atest WMShellFlickerServiceTests
Change-Id: If33da2953ac4f6829c973c7414c4e6c88a1c7f69
parent 2d0d9366
Loading
Loading
Loading
Loading
+38 −0
Original line number Diff line number Diff line
//
// Copyright (C) 2020 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

package {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_base_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_applicable_licenses: ["frameworks_base_license"],
}

android_test {
    name: "WMShellFlickerTestsDesktopMode",
    defaults: ["WMShellFlickerTestsDefault"],
    manifest: "AndroidManifest.xml",
    test_config_template: "AndroidTestTemplate.xml",
    srcs: ["src/**/*.kt"],
    static_libs: [
        "WMShellFlickerTestsBase",
        "WMShellScenariosDesktopMode",
        "WMShellTestUtils",
    ],
    data: ["trace_config/*"],
}
+77 −0
Original line number Diff line number Diff line
<!--
  ~ Copyright (C) 2023 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools"
          package="com.android.wm.shell.flicker">

    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
    <!-- Read and write traces from external storage -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <!-- Allow the test to write directly to /sdcard/ -->
    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
    <!-- Write secure settings -->
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
    <!-- Capture screen contents -->
    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
    <!-- Enable / Disable tracing !-->
    <uses-permission android:name="android.permission.DUMP" />
    <!-- Run layers trace -->
    <uses-permission android:name="android.permission.HARDWARE_TEST"/>
    <!-- Capture screen recording -->
    <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
    <!-- Workaround grant runtime permission exception from b/152733071 -->
    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
    <uses-permission android:name="android.permission.READ_LOGS"/>
    <!-- Force-stop test apps -->
    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES"/>
    <!-- Control test app's media session -->
    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
    <!-- ATM.removeRootTasksWithActivityTypes() -->
    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS" />
    <!-- Enable bubble notification-->
    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
    <!-- Allow the test to connect to perfetto trace processor -->
    <uses-permission android:name="android.permission.INTERNET"/>

    <!-- Allow the test to write directly to /sdcard/ and connect to trace processor -->
    <application android:requestLegacyExternalStorage="true"
                 android:networkSecurityConfig="@xml/network_security_config"
                 android:largeHeap="true">
        <uses-library android:name="android.test.runner"/>

        <service android:name=".NotificationListener"
                 android:exported="true"
                 android:label="WMShellTestsNotificationListenerService"
                 android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
            <intent-filter>
                <action android:name="android.service.notification.NotificationListenerService" />
            </intent-filter>
        </service>

        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
        <provider
            android:name="androidx.startup.InitializationProvider"
            android:authorities="${applicationId}.androidx-startup"
            tools:node="remove" />
    </application>

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                     android:targetPackage="com.android.wm.shell.flicker"
                     android:label="WindowManager Shell Flicker Tests">
    </instrumentation>
</manifest>
+1 −8
Original line number Diff line number Diff line
@@ -59,13 +59,6 @@
        <option name="test-file-name" value="{MODULE}.apk"/>
        <option name="test-file-name" value="FlickerTestApp.apk"/>
    </target_preparer>
    <!-- Enable mocking GPS location by the test app -->
    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
        <option name="run-command"
                value="appops set com.android.wm.shell.flicker.pip.apps android:mock_location allow"/>
        <option name="teardown-command"
                value="appops set com.android.wm.shell.flicker.pip.apps android:mock_location deny"/>
    </target_preparer>

    <!-- Needed for pushing the trace config file -->
    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
@@ -97,7 +90,7 @@
    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
        <option name="pull-pattern-keys" value="perfetto_file_path"/>
        <option name="directory-keys"
                value="/data/user/0/com.android.wm.shell.flicker.service/files"/>
                value="/data/user/0/com.android.wm.shell.flicker/files"/>
        <option name="collect-on-run-ended-only" value="true"/>
        <option name="clean-up" value="true"/>
    </metrics_collector>
+0 −0

File moved.

Loading