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

Browse Source
This commit is contained in:
Priyanka Advani
2023-06-07 02:43:09 +00:00
committed by Android (Google) Code Review
parent c7e6a78235 b4cac54653
commit 5f870b3826
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.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -102,6 +103,7 @@ import java.util.ArrayList;
/** /**
* Tests for {@link NotificationStackScrollLayout}. * Tests for {@link NotificationStackScrollLayout}.
*/ */
@Ignore("b/255552856")
@SmallTest @SmallTest
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper @TestableLooper.RunWithLooper
@@ -372,6 +374,20 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
mStackScroller.setExpandedHeight(expectedHeight); 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 @Test
public void testAppearFractionCalculationIsNotNegativeWhenShelfBecomesSmaller() { public void testAppearFractionCalculationIsNotNegativeWhenShelfBecomesSmaller() {
// this situation might occur if status bar height is defined in pixels while shelf height // 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 @Test
public void testReInflatesFooterViews() { public void testReInflatesFooterViews() {
when(mEmptyShadeView.getTextResource()).thenReturn(R.string.empty_shade_text);
clearInvocations(mStackScroller); clearInvocations(mStackScroller);
mStackScroller.reinflateViews(); mStackScroller.reinflateViews();
verify(mStackScroller).setFooterView(any()); verify(mStackScroller).setFooterView(any());
@@ -901,7 +916,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase {
mStackScroller.setHasFilteredOutSeenNotifications(true); mStackScroller.setHasFilteredOutSeenNotifications(true);
mStackScroller.updateEmptyShadeView(true, false); mStackScroller.updateEmptyShadeView(true, false);
verify(mEmptyShadeView).setFooterText(not(eq(0))); verify(mEmptyShadeView).setFooterText(not(0));
} }
@Test @Test