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

Commit 70d13a4b authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge changes I08486d18,I2dfc90dd,I2dfc90dd into main 

* changes:
  Split IME tests into 2 groups to adhere to runtime SLO
  Format code according to linter rules
  Split flicker tests into completely independent folders, which can be transferred to the respective teams.
parents 512cf072 01e9ae19

tests/FlickerTests/ActivityEmbedding/Android.bp

0 → 100644
+34 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2018 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: "FlickerTestsOther",

    defaults: ["FlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

    package_name: "com.android.server.wm.flicker",

    instrumentation_target_package: "com.android.server.wm.flicker",

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

    static_libs: ["FlickerTestsBase"],

}

tests/FlickerTests/manifests/AndroidManifest.xml→tests/FlickerTests/ActivityEmbedding/AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.server.wm.flicker">

          package="com.android.server.wm.flick">



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>

    <!-- Read and write traces from external storage -->
@@ -59,4 +59,9 @@ 
            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.server.wm.flicker"

                     android:label="WindowManager Flicker Tests">

    </instrumentation>

</manifest>

tests/FlickerTests/ActivityEmbedding/AndroidTestTemplate.xml

0 → 100644
+90 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright 2018 Google Inc. All Rights Reserved.

 -->

<configuration description="Runs WindowManager {MODULE}">

    <option name="test-tag" value="FlickerTests"/>

    <!-- Needed for storing the perfetto trace files in the sdcard/test_results-->

    <option name="isolated-storage" value="false"/>



    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">

        <!-- keeps the screen on during tests -->

        <option name="screen-always-on" value="on"/>

        <!-- prevents the phone from restarting -->

        <option name="force-skip-system-props" value="true"/>

        <!-- set WM tracing verbose level to all -->

        <option name="run-command" value="cmd window tracing level all"/>

        <!-- set WM tracing to frame (avoid incomplete states) -->

        <option name="run-command" value="cmd window tracing frame"/>

        <!-- ensure lock screen mode is swipe -->

        <option name="run-command" value="locksettings set-disabled false"/>

        <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests -->

        <option name="run-command" value="pm disable com.google.android.internal.betterbug"/>

        <!-- restart launcher to activate TAPL -->

        <option name="run-command"

                value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher"/>

        <!-- Increase trace size: 20mb for WM and 80mb for SF -->

        <option name="run-command" value="cmd window tracing size 20480"/>

        <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920"/>

        <!-- b/307664397 - Ensure camera has the correct permissions and doesn't show a dialog -->

        <option name="run-command"

                value="pm grant com.google.android.GoogleCamera android.permission.CAMERA"/>

        <option name="run-command"

                value="pm grant com.google.android.GoogleCamera android.permission.RECORD_AUDIO"/>

        <option name="run-command"

                value="pm grant com.google.android.GoogleCamera android.permission.ACCESS_FINE_LOCATION"/>

        <option name="run-command"

                value="pm grant com.google.android.GoogleCamera android.permission.ACCESS_COARSE_LOCATION"/>

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>

        <option name="run-command" value="settings put system pointer_location 1"/>

        <option name="teardown-command"

                value="settings delete secure show_ime_with_hard_keyboard"/>

        <option name="teardown-command" value="settings delete system show_touches"/>

        <option name="teardown-command" value="settings delete system pointer_location"/>

        <option name="teardown-command"

                value="cmd overlay enable com.android.internal.systemui.navbar.gestural"/>

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true"/>

        <option name="test-file-name" value="{MODULE}.apk"/>

        <option name="test-file-name" value="FlickerTestApp.apk"/>

    </target_preparer>

    <!-- Needed for pushing the trace config file -->

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="push-file"

                key="trace_config.textproto"

                value="/data/misc/perfetto-traces/trace_config.textproto"

        />

        <!--Install the content provider automatically when we push some file in sdcard folder.-->

        <!--Needed to avoid the installation during the test suite.-->

        <option name="push-file" key="trace_config.textproto" value="/sdcard/sample.textproto"/>

    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="{PACKAGE}"/>

        <option name="shell-timeout" value="6600s"/>

        <option name="test-timeout" value="6600s"/>

        <option name="hidden-api-checks" value="false"/>

        <option name="device-listeners" value="android.device.collectors.PerfettoListener"/>

        <!-- PerfettoListener related arguments -->

        <option name="instrumentation-arg" key="perfetto_config_text_proto" value="true"/>

        <option name="instrumentation-arg"

                key="perfetto_config_file"

                value="trace_config.textproto"

        />

        <option name="instrumentation-arg" key="per_run" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <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.server.wm.flicker/files"/>

        <option name="collect-on-run-ended-only" value="true"/>

        <option name="clean-up" value="true"/>

    </metrics_collector>

</configuration>

tests/FlickerTests/ActivityEmbedding/res/anim/show_hide_show_3000ms.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 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.

  -->



<set

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:fillAfter="true">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="0.0"

        android:duration="1000" />



    <alpha

        android:startOffset="2000"

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:duration="1000" />

</set>
 
 No newline at end of file

tests/FlickerTests/manifests/AndroidManifestOther.xml→tests/FlickerTests/ActivityEmbedding/res/xml/network_security_config.xml

+6 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~
@@ -14,11 +15,8 @@ 
  ~ limitations under the License.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.server.wm.flicker">



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.server.wm.flicker"

                     android:label="WindowManager Flicker Tests">

    </instrumentation>

</manifest>
 
<network-security-config>

    <domain-config cleartextTrafficPermitted="true">

        <domain includeSubdomains="true">localhost</domain>

    </domain-config>

</network-security-config>