Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3835163 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding tracing for apparently skipping verifiable events" into... 

Merge "Adding tracing for apparently skipping verifiable events" into ub-launcher3-rvc-dev am: 77cf9b78

Change-Id: Iee60d12a673fd54a8705714da5a30d0d854cd399
parents 40f7ea40 77cf9b78

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

+9 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class LogEventChecker { 


    private static final String START_PREFIX = "START_READER ";

    private static final String FINISH_PREFIX = "FINISH_READER ";

    private static final String SKIP_EVENTS_TAG = "b/153670015";



    private volatile CountDownLatch mFinished;
@@ -72,6 +73,7 @@ public class LogEventChecker { 
            mFinished = null;

        }

        mEvents.clear();

        Log.d(SKIP_EVENTS_TAG, "Cleared events");

        mExpectedEvents.clear();

        mEventsCounter.drainPermits();

        final String id = UUID.randomUUID().toString();
@@ -95,6 +97,7 @@ public class LogEventChecker { 
                        final String event = reader.readLine();

                        if (event.contains(TestProtocol.TAPL_EVENTS_TAG)

                                && event.contains(mStartCommand)) {

                            Log.d(SKIP_EVENTS_TAG, "Read start: " + event);

                            break;

                        }

                    }
@@ -105,11 +108,13 @@ public class LogEventChecker { 
                        if (event.contains(TestProtocol.TAPL_EVENTS_TAG)) {

                            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();

                                }

                            }
@@ -154,6 +159,7 @@ public class LogEventChecker { 
            String sequence = expectedEvents.getKey();



            List<String> actual = new ArrayList<>(mEvents.getNonNull(sequence));

            Log.d(SKIP_EVENTS_TAG, "Verifying events");

            final int mismatchPosition = getMismatchPosition(expectedEvents.getValue(), actual);

            hasMismatches = hasMismatches || mismatchPosition != -1;

            formatSequenceWithMismatch(