Merge "Revert "Revert "setup robolectric for sysui""" into tm-qpr-dev-plus-aosp am: 982e468f1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20580786 Change-Id: I702c9669471bcc00f358517b61e7b3a7f872580d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -168,25 +168,14 @@ java_library {
|
||||
}
|
||||
|
||||
android_library {
|
||||
name: "SystemUI-tests",
|
||||
name: "SystemUI-tests-base",
|
||||
manifest: "tests/AndroidManifest-base.xml",
|
||||
additional_manifests: ["tests/AndroidManifest.xml"],
|
||||
|
||||
resource_dirs: [
|
||||
"tests/res",
|
||||
"res-product",
|
||||
"res-keyguard",
|
||||
"res",
|
||||
],
|
||||
srcs: [
|
||||
"tests/src/**/*.kt",
|
||||
"tests/src/**/*.java",
|
||||
"src/**/*.kt",
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
":ReleaseJavaFiles",
|
||||
":SystemUI-tests-utils",
|
||||
],
|
||||
static_libs: [
|
||||
"WifiTrackerLib",
|
||||
"SystemUIAnimationLib",
|
||||
@@ -225,9 +214,6 @@ android_library {
|
||||
"metrics-helper-lib",
|
||||
"hamcrest-library",
|
||||
"androidx.test.rules",
|
||||
"androidx.test.uiautomator_uiautomator",
|
||||
"mockito-target-extended-minus-junit4",
|
||||
"androidx.test.ext.junit",
|
||||
"testables",
|
||||
"truth-prebuilt",
|
||||
"monet",
|
||||
@@ -237,6 +223,27 @@ android_library {
|
||||
"LowLightDreamLib",
|
||||
"motion_tool_lib",
|
||||
],
|
||||
}
|
||||
|
||||
android_library {
|
||||
name: "SystemUI-tests",
|
||||
manifest: "tests/AndroidManifest-base.xml",
|
||||
additional_manifests: ["tests/AndroidManifest.xml"],
|
||||
srcs: [
|
||||
"tests/src/**/*.kt",
|
||||
"tests/src/**/*.java",
|
||||
"src/**/*.kt",
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
":ReleaseJavaFiles",
|
||||
":SystemUI-tests-utils",
|
||||
],
|
||||
static_libs: [
|
||||
"SystemUI-tests-base",
|
||||
"androidx.test.uiautomator_uiautomator",
|
||||
"mockito-target-extended-minus-junit4",
|
||||
"androidx.test.ext.junit",
|
||||
],
|
||||
libs: [
|
||||
"android.test.runner",
|
||||
"android.test.base",
|
||||
@@ -253,6 +260,45 @@ android_library {
|
||||
},
|
||||
}
|
||||
|
||||
android_app {
|
||||
name: "SystemUIRobo-stub",
|
||||
defaults: [
|
||||
"platform_app_defaults",
|
||||
"SystemUI_app_defaults",
|
||||
],
|
||||
manifest: "tests/AndroidManifest-base.xml",
|
||||
static_libs: [
|
||||
"SystemUI-tests-base",
|
||||
],
|
||||
aaptflags: [
|
||||
"--extra-packages",
|
||||
"com.android.systemui",
|
||||
],
|
||||
dont_merge_manifests: true,
|
||||
platform_apis: true,
|
||||
system_ext_specific: true,
|
||||
certificate: "platform",
|
||||
privileged: true,
|
||||
resource_dirs: [],
|
||||
}
|
||||
|
||||
android_robolectric_test {
|
||||
name: "SystemUiRoboTests",
|
||||
srcs: [
|
||||
"tests/robolectric/src/**/*.kt",
|
||||
"tests/robolectric/src/**/*.java",
|
||||
],
|
||||
libs: [
|
||||
"android.test.runner",
|
||||
"android.test.base",
|
||||
"android.test.mock",
|
||||
"truth-prebuilt",
|
||||
],
|
||||
kotlincflags: ["-Xjvm-default=enable"],
|
||||
instrumentation_for: "SystemUIRobo-stub",
|
||||
java_resource_dirs: ["tests/robolectric/config"],
|
||||
}
|
||||
|
||||
// Opt-out config for optimizing the SystemUI target using R8.
|
||||
// Disabled via `export SYSTEMUI_OPTIMIZE_JAVA=false`, or explicitly in Make via
|
||||
// `SYSTEMUI_OPTIMIZE_JAVA := false`.
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
sdk=NEWEST_SDK
|
||||
@@ -0,0 +1,35 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package com.android.systemui.robotests;
|
||||
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class SysuiResourceLoadingTest extends SysuiRoboBase {
|
||||
@Test
|
||||
public void testResources() {
|
||||
assertThat(getContext().getString(com.android.systemui.R.string.app_label))
|
||||
.isEqualTo("System UI");
|
||||
assertThat(getContext().getString(com.android.systemui.tests.R.string.test_content))
|
||||
.isNotEmpty();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package com.android.systemui.robotests;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
|
||||
public class SysuiRoboBase {
|
||||
public Context getContext() {
|
||||
return InstrumentationRegistry.getContext();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user