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

Commit fe4095f7 authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix test failures on HSUM build 

- In setup, call switch user which will set up the mocks for
  the user on the device -- necessary for HSUM build where
  the user isn't 0
- Set the user on the group entry builder (it defaults
  to 0 which will fail on HSUM).

Flag: EXEMPT test fix
Test: atest BubblesTest on HSUM build
      (lunch tangorpro_hsum-trunk_staging-eng)
Bug: 384280396
Change-Id: Ifec01bba0494988351058f1f96bacb8ac098df6a
parent 48012db1

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ public class NotificationTestHelper { 
                .setUid(UID)

                .setInitialPid(2000)

                .setNotification(summary)

                .setUser(USER_HANDLE)

                .setParent(GroupEntry.ROOT_ENTRY)

                .build();

        GroupEntryBuilder groupEntry = new GroupEntryBuilder()

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+3 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ import com.android.systemui.statusbar.RankingBuilder; 
import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.collection.GroupEntry;

import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;
@@ -605,6 +604,9 @@ public class BubblesTest extends SysuiTestCase { 
        // Get a reference to KeyguardStateController.Callback

        verify(mKeyguardStateController, atLeastOnce())

                .addCallback(mKeyguardStateControllerCallbackCaptor.capture());



        // Make sure mocks are set up for current user

        switchUser(ActivityManager.getCurrentUser());

    }



    @After