Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5089d993 authored by Priyanka Advani's avatar Priyanka Advani Committed by Automerger Merge Worker
Browse files

Merge "Revert "Re-enable and fix failing tests in... 

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

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



Change-Id: I7fd0583cd487cae099d257896b592652193f7c33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8768dbf ec8e33f1

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

+17 −2
Original line number Diff line number Diff line
@@ -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