aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Deflake BubbleBarViewAnimatorTest" into main

Browse Source
This commit is contained in:
Liran Binyamin
2024-11-21 14:53:22 +00:00
committed by Android (Google) Code Review
parent ad43c3dbc9 2ceb63a94d
commit a673a1b456
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
View File

@@ -48,6 +48,8 @@ import com.android.wm.shell.shared.animation.PhysicsAnimator
import com.android.wm.shell.shared.animation.PhysicsAnimatorTestUtils
import com.android.wm.shell.shared.bubbles.BubbleInfo
import com.google.common.truth.Truth.assertThat
import java.util.concurrent.Semaphore
import java.util.concurrent.TimeUnit
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -765,10 +767,12 @@ class BubbleBarViewAnimatorTest {
whenever(bubbleStashController.bubbleBarTranslationY)
.thenReturn(BAR_TRANSLATION_Y_FOR_HOTSEAT)
val barAnimator = PhysicsAnimator.getInstance(bubbleBarView)
val semaphore = Semaphore(0)
var notifiedExpanded = false
val onExpanded = Runnable { notifiedExpanded = true }
val onExpanded = Runnable {
notifiedExpanded = true
semaphore.release()
}
val animator =
BubbleBarViewAnimator(
bubbleBarView,
@@ -793,7 +797,12 @@ class BubbleBarViewAnimatorTest {
// the lift animation is complete; the spring back animation should start now
InstrumentationRegistry.getInstrumentation().runOnMainSync {}
barAnimator.assertIsRunning()
InstrumentationRegistry.getInstrumentation().waitForIdleSync()
assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue()
// we should be expanded now
assertThat(bubbleBarView.isExpanded).isTrue()
PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y)
// verify there is no hide animation
@@ -801,7 +810,6 @@ class BubbleBarViewAnimatorTest {
assertThat(animator.isAnimating).isFalse()
assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT)
assertThat(bubbleBarView.isExpanded).isTrue()
verify(bubbleStashController).showBubbleBarImmediate()
assertThat(notifiedExpanded).isTrue()
}