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

Commit a05c9972 authored by Matthew DeVore's avatar Matthew DeVore
Browse files

Connected display: TestHandler is top-level class 

This is needed to test an upcoming DisplayBlock unit test which will
not be an ExternalDisplayTestBase child, so won't get a TestHandler
automatically.

Test: ExternalDisplayPreferenceFragmentTest
Bug: b/352648432
Flag: EXEMPT refactor
Change-Id: I595f647caa513d5baa8bd214778fc41ca38de928
parent 52e9b923

tests/robotests/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java

+0 −36
Original line number Diff line number Diff line
@@ -26,12 +26,9 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.robolectric.Shadows.shadowOf;



import android.content.Context;

import android.content.res.Resources;

import android.os.Handler;

import android.os.Message;

import android.os.RemoteException;

import android.view.Display.Mode;
@@ -46,7 +43,6 @@ import org.junit.Before; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.ArrayDeque;

import java.util.List;



public class ExternalDisplayTestBase {
@@ -66,38 +62,6 @@ public class ExternalDisplayTestBase { 
    PreferenceScreen mPreferenceScreen;

    List<DisplayDevice> mDisplays;



    static class TestHandler extends Handler {

        private final ArrayDeque<Message> mPending = new ArrayDeque<>();

        private final Handler mSubhandler;



        TestHandler(Handler subhandler) {

            mSubhandler = subhandler;

        }



        ArrayDeque<Message> getPendingMessages() {

            return mPending;

        }



        /**

         * Schedules to send the message upon next invocation of {@link #flush()}. This ignores the

         * time argument since our code doesn't meaningfully use it, but this is the most convenient

         * way to intercept both Message and Callback objects synchronously.

         */

        @Override

        public boolean sendMessageAtTime(Message msg, long uptimeMillis) {

            mPending.add(msg);

            return true;

        }



        void flush() {

            for (var msg : mPending) {

                mSubhandler.sendMessage(msg);

            }

            mPending.clear();

            shadowOf(mSubhandler.getLooper()).idle();

        }

    }



    /**

     * Setup.

     */

tests/robotests/src/com/android/settings/connecteddevice/display/TestHandler.java

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.settings.connecteddevice.display;



import static org.robolectric.Shadows.shadowOf;



import android.os.Handler;

import android.os.Message;



import java.util.ArrayDeque;



/**

 * A Handler for use in tests which prevents an actual delay from being used when a message is

 * queued, and allows all queued messages to be run by calling {@link #flush()}.

 */

class TestHandler extends Handler {

    private final ArrayDeque<Message> mPending = new ArrayDeque<>();

    private final Handler mSubhandler;



    TestHandler(Handler subhandler) {

        mSubhandler = subhandler;

    }



    ArrayDeque<Message> getPendingMessages() {

        return mPending;

    }



    /**

     * Schedules to send the message upon next invocation of {@link #flush()}. This ignores the

     * time argument since our code doesn't meaningfully use it, but this is the most convenient

     * way to intercept both Message and Callback objects synchronously.

     */

    @Override

    public boolean sendMessageAtTime(Message msg, long uptimeMillis) {

        mPending.add(msg);

        return true;

    }



    void flush() {

        for (var msg : mPending) {

            mSubhandler.sendMessage(msg);

        }

        mPending.clear();

        shadowOf(mSubhandler.getLooper()).idle();

    }

}