From 660327dda6e1e87a995d9afd7dab37cf50b7381a Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 4 May 2018 11:26:41 -0700 Subject: [PATCH] Spun off Autofill PERF tests on its own package... ...so bugs on it (like starving the UI Thread) don't impact other tests Test: mmma -j ./frameworks/base/apct-tests/perftests/autofill/ && \ adb install -r $OUT/data/app/AutofillPerfTests/AutofillPerfTests.apk && \ adb shell am instrument -w -e class android.view.autofill.LoginTest \ com.android.perftests.autofill/android.support.test.runner.AndroidJUnitRunner Bug: 38345816 Change-Id: I76346f1d1c45790788400fcd9765f6b424d99f4c --- apct-tests/perftests/autofill/Android.mk | 34 ++++++++++++++++++ apct-tests/perftests/autofill/AndroidManifest.xml | 40 ++++++++++++++++++++++ apct-tests/perftests/autofill/AndroidTest.xml | 28 +++++++++++++++ .../layout/autofill_dataset_picker_text_only.xml | 0 .../res/layout/test_autofill_login.xml | 0 .../autofill/AbstractAutofillPerfTestCase.java | 2 +- .../src/android/view/autofill/LoginTest.java | 2 +- .../android/view/autofill/MyAutofillCallback.java | 0 .../android/view/autofill/MyAutofillService.java | 4 +-- 9 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 apct-tests/perftests/autofill/Android.mk create mode 100644 apct-tests/perftests/autofill/AndroidManifest.xml create mode 100644 apct-tests/perftests/autofill/AndroidTest.xml rename apct-tests/perftests/{core => autofill}/res/layout/autofill_dataset_picker_text_only.xml (100%) rename apct-tests/perftests/{core => autofill}/res/layout/test_autofill_login.xml (100%) rename apct-tests/perftests/{core => autofill}/src/android/view/autofill/AbstractAutofillPerfTestCase.java (99%) rename apct-tests/perftests/{core => autofill}/src/android/view/autofill/LoginTest.java (99%) rename apct-tests/perftests/{core => autofill}/src/android/view/autofill/MyAutofillCallback.java (100%) rename apct-tests/perftests/{core => autofill}/src/android/view/autofill/MyAutofillService.java (99%) diff --git a/apct-tests/perftests/autofill/Android.mk b/apct-tests/perftests/autofill/Android.mk new file mode 100644 index 000000000000..28555a0d5ca5 --- /dev/null +++ b/apct-tests/perftests/autofill/Android.mk @@ -0,0 +1,34 @@ +# 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. + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + androidx.annotation_annotation \ + apct-perftests-utils + +LOCAL_PACKAGE_NAME := AutofillPerfTests +LOCAL_PRIVATE_PLATFORM_APIS := true + +LOCAL_COMPATIBILITY_SUITE += device-tests + +include $(BUILD_PACKAGE) diff --git a/apct-tests/perftests/autofill/AndroidManifest.xml b/apct-tests/perftests/autofill/AndroidManifest.xml new file mode 100644 index 000000000000..e706a32ad0c8 --- /dev/null +++ b/apct-tests/perftests/autofill/AndroidManifest.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/apct-tests/perftests/autofill/AndroidTest.xml b/apct-tests/perftests/autofill/AndroidTest.xml new file mode 100644 index 000000000000..29f9f94bcac7 --- /dev/null +++ b/apct-tests/perftests/autofill/AndroidTest.xml @@ -0,0 +1,28 @@ + + + + diff --git a/apct-tests/perftests/core/res/layout/autofill_dataset_picker_text_only.xml b/apct-tests/perftests/autofill/res/layout/autofill_dataset_picker_text_only.xml similarity index 100% rename from apct-tests/perftests/core/res/layout/autofill_dataset_picker_text_only.xml rename to apct-tests/perftests/autofill/res/layout/autofill_dataset_picker_text_only.xml diff --git a/apct-tests/perftests/core/res/layout/test_autofill_login.xml b/apct-tests/perftests/autofill/res/layout/test_autofill_login.xml similarity index 100% rename from apct-tests/perftests/core/res/layout/test_autofill_login.xml rename to apct-tests/perftests/autofill/res/layout/test_autofill_login.xml diff --git a/apct-tests/perftests/core/src/android/view/autofill/AbstractAutofillPerfTestCase.java b/apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java similarity index 99% rename from apct-tests/perftests/core/src/android/view/autofill/AbstractAutofillPerfTestCase.java rename to apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java index 706da620d631..86a5c109f95a 100644 --- a/apct-tests/perftests/core/src/android/view/autofill/AbstractAutofillPerfTestCase.java +++ b/apct-tests/perftests/autofill/src/android/view/autofill/AbstractAutofillPerfTestCase.java @@ -28,7 +28,7 @@ import android.support.test.filters.LargeTest; import android.support.test.rule.ActivityTestRule; import android.support.test.InstrumentationRegistry; -import com.android.perftests.core.R; +import com.android.perftests.autofill.R; import java.util.Locale; import java.util.Collection; diff --git a/apct-tests/perftests/core/src/android/view/autofill/LoginTest.java b/apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java similarity index 99% rename from apct-tests/perftests/core/src/android/view/autofill/LoginTest.java rename to apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java index 07ab5e333950..a93fa3256802 100644 --- a/apct-tests/perftests/core/src/android/view/autofill/LoginTest.java +++ b/apct-tests/perftests/autofill/src/android/view/autofill/LoginTest.java @@ -28,7 +28,7 @@ import android.perftests.utils.StubActivity; import android.provider.Settings; import android.support.test.rule.ActivityTestRule; import android.support.test.InstrumentationRegistry; -import com.android.perftests.core.R; +import com.android.perftests.autofill.R; import java.util.Locale; import java.util.Collection; diff --git a/apct-tests/perftests/core/src/android/view/autofill/MyAutofillCallback.java b/apct-tests/perftests/autofill/src/android/view/autofill/MyAutofillCallback.java similarity index 100% rename from apct-tests/perftests/core/src/android/view/autofill/MyAutofillCallback.java rename to apct-tests/perftests/autofill/src/android/view/autofill/MyAutofillCallback.java diff --git a/apct-tests/perftests/core/src/android/view/autofill/MyAutofillService.java b/apct-tests/perftests/autofill/src/android/view/autofill/MyAutofillService.java similarity index 99% rename from apct-tests/perftests/core/src/android/view/autofill/MyAutofillService.java rename to apct-tests/perftests/autofill/src/android/view/autofill/MyAutofillService.java index 7428209bea82..7060233fc80f 100644 --- a/apct-tests/perftests/core/src/android/view/autofill/MyAutofillService.java +++ b/apct-tests/perftests/autofill/src/android/view/autofill/MyAutofillService.java @@ -30,7 +30,7 @@ import android.widget.RemoteViews; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.perftests.core.R; +import com.android.perftests.autofill.R; import java.util.ArrayList; import java.util.List; @@ -46,7 +46,7 @@ public class MyAutofillService extends AutofillService { private static final String TAG = "MyAutofillService"; private static final int TIMEOUT_MS = 5000; - private static final String PACKAGE_NAME = "com.android.perftests.core"; + private static final String PACKAGE_NAME = "com.android.perftests.autofill"; static final String COMPONENT_NAME = PACKAGE_NAME + "/android.view.autofill.MyAutofillService"; private static final BlockingQueue sFillRequests = new LinkedBlockingQueue<>(); -- 2.11.0