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

Commit fef1c5d9 authored by Vineel Sadineni (xWF)'s avatar Vineel Sadineni (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Fix a test failure in CommunalTouchHandlerTest" into main

parents edcbb43a 73408201
Loading
Loading
Loading
Loading
+4 −10
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import android.graphics.Rect;
import android.graphics.Region;
@@ -29,7 +28,8 @@ import android.util.LayoutDirection;
import android.view.GestureDetector;
import android.view.MotionEvent;

import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.testing.TestLifecycleOwner;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;

@@ -48,7 +48,6 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;

import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

@SmallTest
@RunWith(AndroidJUnit4.class)
@@ -60,17 +59,13 @@ public class CommunalTouchHandlerTest extends SysuiTestCase {
    @Mock
    TouchHandler.TouchSession mTouchSession;
    CommunalTouchHandler mTouchHandler;
    @Mock
    Lifecycle mLifecycle;
    private final LifecycleOwner mLifecycleOwner = new TestLifecycleOwner();

    private static final int INITIATION_WIDTH = 20;

    @Before
    public void setup() {
        MockitoAnnotations.initMocks(this);
        AtomicReference reference = new AtomicReference<>(null);
        when(mLifecycle.getInternalScopeRef()).thenReturn(reference);
        when(mLifecycle.getCurrentState()).thenReturn(Lifecycle.State.CREATED);

        mTouchHandler = new CommunalTouchHandler(
                Optional.of(mCentralSurfaces),
@@ -79,8 +74,7 @@ public class CommunalTouchHandlerTest extends SysuiTestCase {
                mKosmos.getConfigurationInteractor(),
                mKosmos.getSceneInteractor(),
                Optional.of(mKosmos.getMockWindowRootViewProvider()),
                mLifecycle
                );
                mLifecycleOwner.getLifecycle());
    }

    @Test