From 83d0de8d07c4a3aa6dd56a1975ea0eed1f430c98 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 26 Mar 2020 14:03:43 -0400
Subject: [PATCH] Fix broken test

Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
---
 .../app/ConversationListPreferenceController.java         | 2 ++
 .../app/ConversationListPreferenceControllerTest.java     | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index 2dc52bf050d..4d424839415 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -70,6 +70,8 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
 
         if (containerGroup.getPreferenceCount() == 0) {
             containerGroup.setVisible(false);
+        } else {
+            containerGroup.setVisible(true);
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
index 6cc20d78acd..dc82adbd028 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
@@ -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));