From fce7edf87f77a4378bff6a2fa94a624f1e43431b Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Thu, 16 Apr 2020 23:51:48 -0700 Subject: [PATCH] Remove filter for automotive calsses in SysUI Tests Bug: 112863499 Test: atest SystemUITests on sdk_gphone_x86 Change-Id: I4c07abb0a1306c704c7fdd62ecfc4efb7259ce73 --- ...sPlusVerifySysuiRequiredTestPropertiesTest.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java b/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java index b97f55ce06d70..594f0b1a8deb2 100644 --- a/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java +++ b/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java @@ -18,7 +18,6 @@ import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import android.content.pm.PackageManager; import android.testing.AndroidTestingRunner; import android.text.TextUtils; import android.util.Log; @@ -117,12 +116,6 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC filter.add(s -> s.startsWith("com.android.systemui") || s.startsWith("com.android.keyguard")); - - if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { - // If it's not automotive target, exclude automotive classes from the test. - excludeAutomotiveClasses(filter); - } - try { return scanner.getClassPathEntries(filter); } catch (IOException e) { @@ -131,13 +124,6 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC return Collections.emptyList(); } - private void excludeAutomotiveClasses(ChainedClassNameFilter filter) { - // Modifies the passed in filter. - filter.add(s -> !s.startsWith("com.android.systemui.statusbar.car.")); - filter.add(s -> !s.startsWith("com.android.systemui.qs.car.")); - filter.add(s -> !s.startsWith("com.android.systemui.car.")); - } - private String getClsStr() { return TextUtils.join(",", Arrays.asList(BASE_CLS_WHITELIST) .stream().map(cls -> cls.getSimpleName()).toArray());