Loading services/tests/servicestests/src/com/android/server/wm/DragDropControllerTests.java +4 −4 Original line number Diff line number Diff line Loading @@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; Loading Loading @@ -56,7 +57,7 @@ import java.util.concurrent.TimeUnit; /** * Tests for the {@link DragDropController} class. * * atest com.android.server.wm.DragDropControllerTests * atest FrameworksServicesTests:com.android.server.wm.DragDropControllerTests */ @SmallTest @RunWith(AndroidJUnit4.class) Loading Loading @@ -118,7 +119,7 @@ public class DragDropControllerTests extends WindowTestsBase { mTarget = new TestDragDropController(sWm, sWm.mH.getLooper()); mDisplayContent = spy(mDisplayContent); mWindow = createDropTargetWindow("Drag test window", 0); when(mDisplayContent.getTouchableWinAtPointLocked(0, 0)).thenReturn(mWindow); doReturn(mWindow).when(mDisplayContent).getTouchableWinAtPointLocked(0, 0); when(sWm.mInputManager.transferTouchFocus(any(), any())).thenReturn(true); synchronized (sWm.mWindowMap) { Loading Loading @@ -159,8 +160,7 @@ public class DragDropControllerTests extends WindowTestsBase { public void testPerformDrag_NullDataToOtherUser() throws Exception { final WindowState otherUsersWindow = createDropTargetWindow("Other user's window", 1 * UserHandle.PER_USER_RANGE); when(mDisplayContent.getTouchableWinAtPointLocked(10, 10)) .thenReturn(otherUsersWindow); doReturn(otherUsersWindow).when(mDisplayContent).getTouchableWinAtPointLocked(10, 10); dragFlow(0, null, 10, 10); } Loading Loading
services/tests/servicestests/src/com/android/server/wm/DragDropControllerTests.java +4 −4 Original line number Diff line number Diff line Loading @@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; Loading Loading @@ -56,7 +57,7 @@ import java.util.concurrent.TimeUnit; /** * Tests for the {@link DragDropController} class. * * atest com.android.server.wm.DragDropControllerTests * atest FrameworksServicesTests:com.android.server.wm.DragDropControllerTests */ @SmallTest @RunWith(AndroidJUnit4.class) Loading Loading @@ -118,7 +119,7 @@ public class DragDropControllerTests extends WindowTestsBase { mTarget = new TestDragDropController(sWm, sWm.mH.getLooper()); mDisplayContent = spy(mDisplayContent); mWindow = createDropTargetWindow("Drag test window", 0); when(mDisplayContent.getTouchableWinAtPointLocked(0, 0)).thenReturn(mWindow); doReturn(mWindow).when(mDisplayContent).getTouchableWinAtPointLocked(0, 0); when(sWm.mInputManager.transferTouchFocus(any(), any())).thenReturn(true); synchronized (sWm.mWindowMap) { Loading Loading @@ -159,8 +160,7 @@ public class DragDropControllerTests extends WindowTestsBase { public void testPerformDrag_NullDataToOtherUser() throws Exception { final WindowState otherUsersWindow = createDropTargetWindow("Other user's window", 1 * UserHandle.PER_USER_RANGE); when(mDisplayContent.getTouchableWinAtPointLocked(10, 10)) .thenReturn(otherUsersWindow); doReturn(otherUsersWindow).when(mDisplayContent).getTouchableWinAtPointLocked(10, 10); dragFlow(0, null, 10, 10); } Loading