Loading packages/SystemUI/tests/src/com/android/systemui/dreams/touch/CommunalTouchHandlerTest.java +4 −10 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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; Loading @@ -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) Loading @@ -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), Loading @@ -79,8 +74,7 @@ public class CommunalTouchHandlerTest extends SysuiTestCase { mKosmos.getConfigurationInteractor(), mKosmos.getSceneInteractor(), Optional.of(mKosmos.getMockWindowRootViewProvider()), mLifecycle ); mLifecycleOwner.getLifecycle()); } @Test Loading Loading
packages/SystemUI/tests/src/com/android/systemui/dreams/touch/CommunalTouchHandlerTest.java +4 −10 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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; Loading @@ -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) Loading @@ -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), Loading @@ -79,8 +74,7 @@ public class CommunalTouchHandlerTest extends SysuiTestCase { mKosmos.getConfigurationInteractor(), mKosmos.getSceneInteractor(), Optional.of(mKosmos.getMockWindowRootViewProvider()), mLifecycle ); mLifecycleOwner.getLifecycle()); } @Test Loading