From 232737c8544ffd52e94543b7a6e33d47f13d6288 Mon Sep 17 00:00:00 2001 From: vadimt Date: Thu, 30 Apr 2020 10:19:10 -0700 Subject: [PATCH] More logging for LogEventChecker appearing to skip events Bug: 155347466 Change-Id: I6598bcf36c1f7ae76e9bb6b2eccefbd00899de2e --- .../launcher3/tapl/LogEventChecker.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java index 78dfc361f6..2141fab6c3 100644 --- a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java +++ b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java @@ -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,18 +105,18 @@ 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); - break; + if (event.contains(mFinishCommand)) { + mFinished.countDown(); + Log.d(SKIP_EVENTS_TAG, "Read finish: " + event); + break; + } else { + final Matcher matcher = EVENT_LOG_ENTRY.matcher(event); + if (matcher.find()) { + mEvents.add(matcher.group("sequence"), matcher.group("event")); + Log.d(SKIP_EVENTS_TAG, "Read event: " + event); + mEventsCounter.release(); } else { - final Matcher matcher = EVENT_LOG_ENTRY.matcher(event); - if (matcher.find()) { - mEvents.add(matcher.group("sequence"), matcher.group("event")); - Log.d(SKIP_EVENTS_TAG, "Read event: " + event); - mEventsCounter.release(); - } + Log.d(SKIP_EVENTS_TAG, "Read something unexpected: " + event); } } }