Merge "Rename to BASE_CLS_TO_INCLUDE, etc. as Android's inclusive language guidance" into udc-dev (5ea89d53) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC

		private static final String TAG = "AAA++VerifyTest";

		private static final Class[] BASE_CLS_WHITELIST = {
		private static final Class[] BASE_CLS_TO_INCLUDE = {
		SysuiTestCase.class,
		SysuiBaseFragmentTest.class,
		};
		@@ -81,7 +81,7 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC
		if (!isTestClass(cls)) continue;

		boolean hasParent = false;
		for (Class<?> parent : BASE_CLS_WHITELIST) {
		for (Class<?> parent : BASE_CLS_TO_INCLUDE) {
		if (parent.isAssignableFrom(cls)) {
		hasParent = true;
		break;
		@@ -131,13 +131,13 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC
		// with the main process dependency graph because it will not exist
		// at runtime and could lead to incorrect tests which assume
		// the main SystemUI process. Therefore, exclude this package
		// from the base class whitelist.
		// from the base class allowlist.
		filter.add(s -> !s.startsWith("com.android.systemui.screenshot"));
		return filter;
		}

		private String getClsStr() {
		return TextUtils.join(",", Arrays.asList(BASE_CLS_WHITELIST)
		return TextUtils.join(",", Arrays.asList(BASE_CLS_TO_INCLUDE)
		.stream().map(cls -> cls.getSimpleName()).toArray());
		}