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

Merge "Revert "Re-enable and fix failing tests in NotificationStackScrollLayoutTest"" into udc-dev am: 5f870b3826

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23595911

Change-Id: Ia560bc3b6f0e3a14909e6f3a57c28f8ca594f3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Priyanka Advani
2023-06-07 02:53:24 +00:00
committed by Automerger Merge Worker
parent 0c374be3f6 5f870b3826
commit ec8e33f11d
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
View File

@@ -89,6 +89,7 @@ import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -102,6 +103,7 @@ import java.util.ArrayList;
/**
* Tests for {@link NotificationStackScrollLayout}.
*/
@Ignore("b/255552856")
@SmallTest
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper
@@ -372,6 +374,20 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
mStackScroller.setExpandedHeight(expectedHeight);
}
@Test
public void testAppearFractionCalculation() {
// appear start position
when(mNotificationShelf.getIntrinsicHeight()).thenReturn(100);
// because it's the same as shelf height, appear start position equals shelf height
mStackScroller.mStatusBarHeight = 100;
// appear end position
when(mEmptyShadeView.getHeight()).thenReturn(200);
assertEquals(0f, mStackScroller.calculateAppearFraction(100));
assertEquals(1f, mStackScroller.calculateAppearFraction(200));
assertEquals(0.5f, mStackScroller.calculateAppearFraction(150));
}
@Test
public void testAppearFractionCalculationIsNotNegativeWhenShelfBecomesSmaller() {
// this situation might occur if status bar height is defined in pixels while shelf height
@@ -574,7 +590,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
@Test
public void testReInflatesFooterViews() {
when(mEmptyShadeView.getTextResource()).thenReturn(R.string.empty_shade_text);
clearInvocations(mStackScroller);
mStackScroller.reinflateViews();
verify(mStackScroller).setFooterView(any());
@@ -901,7 +916,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
mStackScroller.setHasFilteredOutSeenNotifications(true);
mStackScroller.updateEmptyShadeView(true, false);
verify(mEmptyShadeView).setFooterText(not(eq(0)));
verify(mEmptyShadeView).setFooterText(not(0));
}
@Test