Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "viewRootImplTest failure" into qt-dev

Browse Source 
* changes:
  Introduce InsetsModeSession to InsetsAnimationControlImplTest
  Move no longer flaky tests into pre-submit
This commit is contained in:
TreeHugger Robot
2019-04-16 13:48:20 +00:00
committed by Android (Google) Code Review
parent 949305fe52 2783faff58
commit c574a91e44
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java
View File

@@ -39,11 +39,13 @@ import android.platform.test.annotations.Presubmit;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.SurfaceControl.Transaction; import android.view.SurfaceControl.Transaction;
import android.view.SyncRtSurfaceTransactionApplier.SurfaceParams; import android.view.SyncRtSurfaceTransactionApplier.SurfaceParams;
import android.view.test.InsetsModeSession;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -62,7 +64,6 @@ import java.util.List;
* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
*/ */
@Presubmit @Presubmit
@FlakyTest(detail = "Promote once confirmed non-flaky")
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class InsetsAnimationControlImplTest { public class InsetsAnimationControlImplTest {
@@ -72,15 +73,25 @@ public class InsetsAnimationControlImplTest {
private SurfaceControl mTopLeash; private SurfaceControl mTopLeash;
private SurfaceControl mNavLeash; private SurfaceControl mNavLeash;
private InsetsState mInsetsState; private InsetsState mInsetsState;
private static InsetsModeSession sInsetsModeSession;
@Mock Transaction mMockTransaction; @Mock Transaction mMockTransaction;
@Mock InsetsController mMockController; @Mock InsetsController mMockController;
@Mock WindowInsetsAnimationControlListener mMockListener; @Mock WindowInsetsAnimationControlListener mMockListener;
@Mock SyncRtSurfaceTransactionApplier mMockTransactionApplier; @Mock SyncRtSurfaceTransactionApplier mMockTransactionApplier;
@BeforeClass
public static void setupOnce() {
sInsetsModeSession = new InsetsModeSession(NEW_INSETS_MODE_FULL);
}
@AfterClass
public static void tearDownOnce() throws Exception {
sInsetsModeSession.close();
}
@Before @Before
public void setup() { public void setup() {
ViewRootImpl.sNewInsetsMode = NEW_INSETS_MODE_FULL;
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mTopLeash = new SurfaceControl.Builder(mSession) mTopLeash = new SurfaceControl.Builder(mSession)
.setName("testSurface") .setName("testSurface")

2
core/tests/coretests/src/android/view/InsetsControllerTest.java
View File

@@ -43,7 +43,6 @@ import android.view.WindowManager.LayoutParams;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Before; import org.junit.Before;
@@ -63,7 +62,6 @@ import java.util.concurrent.CountDownLatch;
* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
*/ */
@Presubmit @Presubmit
@FlakyTest(detail = "Promote once confirmed non-flaky")
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class InsetsControllerTest { public class InsetsControllerTest {

2
core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java
View File

@@ -34,7 +34,6 @@ import android.view.WindowManager.LayoutParams;
import android.widget.TextView; import android.widget.TextView;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Before; import org.junit.Before;
@@ -53,7 +52,6 @@ import org.mockito.MockitoAnnotations;
* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
*/ */
@Presubmit @Presubmit
@FlakyTest(detail = "Promote once confirmed non-flaky")
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class InsetsSourceConsumerTest { public class InsetsSourceConsumerTest {

2
core/tests/coretests/src/android/view/InsetsSourceTest.java
View File

@@ -24,7 +24,6 @@ import android.graphics.Insets;
import android.graphics.Rect; import android.graphics.Rect;
import android.platform.test.annotations.Presubmit; import android.platform.test.annotations.Presubmit;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Before; import org.junit.Before;
@@ -41,7 +40,6 @@ import org.junit.runner.RunWith;
* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
*/ */
@Presubmit @Presubmit
@FlakyTest(detail = "Promote once confirmed non-flaky")
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class InsetsSourceTest { public class InsetsSourceTest {

2
core/tests/coretests/src/android/view/InsetsStateTest.java
View File

@@ -40,7 +40,6 @@ import android.util.SparseIntArray;
import android.view.WindowInsets.Type; import android.view.WindowInsets.Type;
import android.view.test.InsetsModeSession; import android.view.test.InsetsModeSession;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
@@ -56,7 +55,6 @@ import org.junit.runner.RunWith;
* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
*/ */
@Presubmit @Presubmit
@FlakyTest(detail = "Promote once confirmed non-flaky")
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class InsetsStateTest { public class InsetsStateTest {