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

Commit 5a950b76 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix broken test" into rvc-dev

parents 50aeb48c 83d0de8d

src/com/android/settings/notification/app/ConversationListPreferenceController.java

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe 


        if (containerGroup.getPreferenceCount() == 0) {

            containerGroup.setVisible(false);

        } else {

            containerGroup.setVisible(true);

        }

    }

tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java

+7 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -34,6 +35,8 @@ import android.provider.Settings; 
import android.service.notification.ConversationChannelWrapper;



import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;



import com.android.settings.applications.AppInfoBase;

import com.android.settings.notification.NotificationBackend;
@@ -85,7 +88,10 @@ public class ConversationListPreferenceControllerTest { 


    @Test

    public void testPopulateList_validConversations() {

        PreferenceCategory outerContainer = mock(PreferenceCategory.class);

        final PreferenceManager preferenceManager = new PreferenceManager(mContext);

        PreferenceScreen ps = preferenceManager.createPreferenceScreen(mContext);

        PreferenceCategory outerContainer = spy(new PreferenceCategory(mContext));

        ps.addPreference(outerContainer);



        ConversationChannelWrapper ccw = new ConversationChannelWrapper();

        ccw.setNotificationChannel(mock(NotificationChannel.class));