Merge "Rename closeEvents to reduce confusion" into ub-launcher3-rvc-dev (7cdb4cfe) · Commits · e / os / android_packages_apps_Trebuchet

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ public final class LauncherInstrumentation {
		public void checkForAnomaly() {
		final String systemAnomalyMessage = getSystemAnomalyMessage();
		if (systemAnomalyMessage != null) {
		Assert.fail(formatSystemHealthMessage(closeEvents(
		Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
		"http://go/tapl : Tests are broken by a non-Launcher system error: "
		+ systemAnomalyMessage, false)));
		}
		@@ -424,7 +424,7 @@ public final class LauncherInstrumentation {
		return message;
		}

		private String closeEvents(String message, boolean checkEvents) {
		private String formatErrorWithEvents(String message, boolean checkEvents) {
		if (sCheckingEvents) {
		sCheckingEvents = false;
		if (checkEvents) {
		@@ -454,7 +454,7 @@ public final class LauncherInstrumentation {

		private void fail(String message) {
		checkForAnomaly();
		Assert.fail(formatSystemHealthMessage(closeEvents(
		Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
		"http://go/tapl : " + getContextDescription() + message
		+ " (visible state: " + getVisibleStateMessage() + ")", true)));
		}
		@@ -1309,7 +1309,8 @@ public final class LauncherInstrumentation {
		if (mOnLauncherCrashed != null) mOnLauncherCrashed.run();
		checkForAnomaly();
		Assert.fail(
		formatSystemHealthMessage(closeEvents("Launcher crashed", false)));
		formatSystemHealthMessage(
		formatErrorWithEvents("Launcher crashed", false)));
		}

		if (sCheckingEvents) {