diff options
Diffstat (limited to 'tests')
5 files changed, 42 insertions, 67 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 0ae6b0674..65a4bbdbd 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -16,80 +16,36 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -java_defaults { - name: "DocumentsUITests-defaults", - libs: [ - "android.test.base", - "android.test.mock", - "android.test.runner", - ], - - static_libs: [ - "DocumentsUI-lib", - "androidx.test.rules", - "androidx.test.espresso.core", - "androidx.test.ext.truth", - "guava", - "mockito-target", - "androidx.test.uiautomator_uiautomator", - ], -} - -android_library { - name: "DocumentsUIPerfTests-lib", +filegroup { + name: "DocumentsUIPerfTests-files", srcs: [ "common/com/android/documentsui/**/*.java", "functional/com/android/documentsui/ActivityTest.java", ], - resource_dirs: [], - libs: [ - "android.test.base", - "android.test.mock", - "android.test.runner", - "DocumentsUI-lib", - ], - - static_libs: [ - "androidx.legacy_legacy-support-v4", - "androidx.test.rules", - "androidx.test.espresso.core", - "mockito-target", - "ub-janktesthelper", - "androidx.test.uiautomator_uiautomator", - ], } -android_library { - name: "DocumentsUIUnitTests-lib", - defaults: ["DocumentsUITests-defaults"], - - manifest: "AndroidManifestUnitTests.xml", - +filegroup { + name: "DocumentsUITests-srcs", srcs: [ "common/**/*.java", + "functional/**/*.java", "unit/**/*.java", ], +} - resource_dirs: [ - "res", +filegroup { + name: "DocumentsUIUnitTests-srcs", + srcs: [ + "common/**/*.java", + "unit/**/*.java", ], - - min_sdk_version : "29", - target_sdk_version : "29", } android_library { - name: "DocumentsUITests-lib", - defaults: ["DocumentsUITests-defaults"], + name: "DocumentsUITests-res-lib", manifest: "AndroidManifest.xml", - srcs: [ - "common/**/*.java", - "functional/**/*.java", - "unit/**/*.java", - ], - asset_dirs: [ "assets", ], @@ -101,6 +57,7 @@ android_library { aaptflags: [ // pack some raw file locate in assets folder "-0 .zip", + "--auto-add-overlay", ], min_sdk_version : "29", @@ -109,14 +66,36 @@ android_library { android_test { name: "DocumentsUITests", - defaults: ["DocumentsUITests-defaults"], manifest: "AndroidManifest.xml", - resource_dirs: [], + srcs: [ + "common/**/*.java", + "functional/**/*.java", + "unit/**/*.java", + ], + + resource_dirs: [ + "res", + ], + + aaptflags: [ + "-0 .zip", + ], + + libs: [ + "android.test.base", + "android.test.mock", + "android.test.runner", + ], static_libs: [ - "DocumentsUITests-lib", + "androidx.test.rules", + "androidx.test.espresso.core", + "androidx.test.ext.truth", + "guava", + "mockito-target", + "androidx.test.uiautomator_uiautomator", ], jarjar_rules: "jarjar-rules.txt", diff --git a/tests/AndroidManifestUnitTests.xml b/tests/AndroidManifestUnitTests.xml deleted file mode 100644 index 13d7a08f7..000000000 --- a/tests/AndroidManifestUnitTests.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.documentsui.tests"> - -</manifest> diff --git a/tests/common/com/android/documentsui/bots/SearchBot.java b/tests/common/com/android/documentsui/bots/SearchBot.java index bde74cab7..51f93943a 100644 --- a/tests/common/com/android/documentsui/bots/SearchBot.java +++ b/tests/common/com/android/documentsui/bots/SearchBot.java @@ -33,13 +33,12 @@ import static org.hamcrest.CoreMatchers.anyOf; import android.content.Context; import android.view.View; +import androidx.recyclerview.R; import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiObject; import androidx.test.uiautomator.UiObjectNotFoundException; import androidx.test.uiautomator.UiSelector; -import com.android.documentsui.R; - import org.hamcrest.Matcher; /** @@ -61,7 +60,7 @@ public class SearchBot extends Bots.BaseBot { // require this input be not clickable. @SuppressWarnings("unchecked") private static final Matcher<View> SEARCH_INPUT = allOf( - withId(androidx.appcompat.R.id.search_src_text), + withId(R.id.search_src_text), isDisplayed()); public SearchBot(UiDevice device, Context context, int timeout) { diff --git a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java index a33cca37a..b8ef8d651 100644 --- a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java +++ b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java @@ -21,6 +21,7 @@ import static com.android.documentsui.StubProvider.ROOT_1_ID; import android.os.RemoteException; +import androidx.recyclerview.R; import androidx.test.filters.LargeTest; import com.android.documentsui.base.RootInfo; diff --git a/tests/functional/com/android/documentsui/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java index 78ce44a5e..04ea87a41 100644 --- a/tests/functional/com/android/documentsui/SearchViewUiTest.java +++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java @@ -19,6 +19,7 @@ package com.android.documentsui; import static com.android.documentsui.StubProvider.ROOT_0_ID; import static com.android.documentsui.StubProvider.ROOT_1_ID; +import androidx.recyclerview.R; import androidx.test.filters.LargeTest; import androidx.test.filters.Suppress; |