Merge "More logging for LogEventChecker appearing to skip events" into ub-launcher3-rvc-dev (dfd8c480) · Commits · e / os / BlissLauncher3

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ public class LogEventChecker {
		final String id = UUID.randomUUID().toString();
		mStartCommand = START_PREFIX + id;
		mFinishCommand = FINISH_PREFIX + id;
		Log.d(SKIP_EVENTS_TAG, "Expected finish command: " + mFinishCommand);
		Log.d(TestProtocol.TAPL_EVENTS_TAG, mStartCommand);
		}

		@@ -95,8 +96,7 @@ public class LogEventChecker {
		// Skip everything before the next start command.
		for (; ; ) {
		final String event = reader.readLine();
		if (event.contains(TestProtocol.TAPL_EVENTS_TAG)
		&& event.contains(mStartCommand)) {
		if (event.contains(mStartCommand)) {
		Log.d(SKIP_EVENTS_TAG, "Read start: " + event);
		break;
		}
		@@ -105,7 +105,6 @@ public class LogEventChecker {
		// Store all actual events until the finish command.
		for (; ; ) {
		final String event = reader.readLine();
		if (event.contains(TestProtocol.TAPL_EVENTS_TAG)) {
		if (event.contains(mFinishCommand)) {
		mFinished.countDown();
		Log.d(SKIP_EVENTS_TAG, "Read finish: " + event);
		@@ -116,7 +115,8 @@ public class LogEventChecker {
		mEvents.add(matcher.group("sequence"), matcher.group("event"));
		Log.d(SKIP_EVENTS_TAG, "Read event: " + event);
		mEventsCounter.release();
		}
		} else {
		Log.d(SKIP_EVENTS_TAG, "Read something unexpected: " + event);
		}
		}
		}