From 0b76b1c2d70409accbc04d5e62a983e377db8147 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Fri, 10 Apr 2020 13:00:34 -0700 Subject: [PATCH] Fix WindowContainerThumbnailTest A recent commit to WindowContainerThumbnail changed makeSurface to makeChildSurface but the test was already marked as flaky and so the CL was able to pass presubmit without updating the test. Bug: 153708519 Test: WindowContainerThumbnailTest Change-Id: Ic1ef7cb941b67f2f807d812a6a4cce82bdd917ac --- .../src/com/android/server/wm/WindowContainerThumbnailTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerThumbnailTest.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerThumbnailTest.java index b8de3ca4ea1cd..ee210b6eeaee0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerThumbnailTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerThumbnailTest.java @@ -18,6 +18,7 @@ package com.android.server.wm; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; +import static org.mockito.ArgumentMatchers.any; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -49,6 +50,7 @@ public class WindowContainerThumbnailTest extends WindowTestsBase { GraphicBuffer.USAGE_SW_READ_RARELY | GraphicBuffer.USAGE_SW_WRITE_NEVER); final ActivityRecord mockAr = mock(ActivityRecord.class); when(mockAr.getPendingTransaction()).thenReturn(new StubTransaction()); + when(mockAr.makeChildSurface(any())).thenReturn(new MockSurfaceControlBuilder()); when(mockAr.makeSurface()).thenReturn(new MockSurfaceControlBuilder()); return new WindowContainerThumbnail(new StubTransaction(), mockAr, buffer, false, mock(Surface.class), mock(SurfaceAnimator.class));