Merge "Ignore physics animation tests that have suddenly become flaky." (829ba3dd) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/bubbles/animation/ExpandedAnimationControllerTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
		}

		@Test
		@Ignore
		public void testExpansionAndCollapse() throws InterruptedException {
		Runnable afterExpand = Mockito.mock(Runnable.class);
		mExpandedController.expandFromStack(afterExpand);
		@@ -88,6 +89,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
		}

		@Test
		@Ignore
		public void testOnChildAdded() throws InterruptedException {
		expand();

		@@ -100,6 +102,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
		}

		@Test
		@Ignore
		public void testOnChildRemoved() throws InterruptedException {
		expand();

		@@ -111,6 +114,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
		}

		@Test
		@Ignore
		public void testBubbleDraggedNotDismissedSnapsBack() throws InterruptedException {
		expand();

		@@ -128,6 +132,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
		}

		@Test
		@Ignore
		public void testBubbleDismissed() throws InterruptedException {
		expand();

packages/SystemUI/tests/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayoutTest.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import androidx.test.filters.SmallTest;
		import com.google.android.collect.Sets;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.InOrder;
		@@ -76,6 +77,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testHierarchyChanges() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -101,6 +103,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testUpdateValueNotChained() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -127,11 +130,13 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testUpdateValueXChained() throws InterruptedException {
		testChainedTranslationAnimations();
		}

		@Test
		@Ignore
		public void testSetEndActions() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -175,6 +180,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testRemoveEndListeners() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -213,6 +219,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testSetController() throws InterruptedException {
		// Add the bubbles, then set the controller, to make sure that a controller added to an
		// already-initialized view works correctly.
		@@ -269,6 +276,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testArePropertiesAnimating() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -293,6 +301,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testCancelAllAnimations() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -346,6 +355,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testPhysicsAnimator() throws InterruptedException {
		mLayout.setActiveController(mTestableController);
		addOneMoreThanBubbleLimitBubbles();
		@@ -390,6 +400,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testAnimationsForChildrenFromIndex() throws InterruptedException {
		// Don't chain since we're going to invoke each animation independently.
		mTestableController.setChainedProperties(new HashSet<>());
		@@ -415,6 +426,7 @@ public class PhysicsAnimationLayoutTest extends PhysicsAnimationLayoutTestCase {
		}

		@Test
		@Ignore
		public void testAnimationsForChildrenFromIndex_noChildren() {
		mLayout.setActiveController(mTestableController);