Clean up assertion methods in SliceTester

Fixes: 120592507
Test: robotests
Change-Id: Ic20fa96aa500d9ab50ef2adcb59f48c328989ec8

diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
index 4deec56..4504d84 100644 (file)
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
@@ -25,14 +25,12 @@ import android.content.Intent;
 
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +58,10 @@ public class BluetoothSliceBuilderTest {
     @Test
     public void getBluetoothSlice_correctSliceContent() {
         final Slice BluetoothSlice = BluetoothSliceBuilder.getSlice(mContext);
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, BluetoothSlice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.bluetooth_settings_title));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).hasSize(1);
@@ -69,9 +70,6 @@ public class BluetoothSliceBuilderTest {
         final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_bluetooth);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
-
-        final List<SliceItem> sliceItems = BluetoothSlice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.bluetooth_settings_title));
     }
 
     @Test

diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
index fe7a685..224d2ee 100644 (file)
--- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
+++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
@@ -23,14 +23,12 @@ import android.content.Context;
 import android.provider.Settings;
 
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -57,13 +55,13 @@ public class FlashlightSliceTest {
     public void getFlashlightSlice_correctData() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), Settings.Secure.FLASHLIGHT_AVAILABLE, 1);
+
         final Slice slice = new FlashlightSlice(mContext).getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.power_flashlight));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).hasSize(1);
-
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.power_flashlight));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
index 4699587..289a57d 100644 (file)
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
@@ -26,14 +26,12 @@ import android.content.Context;
 
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,8 +39,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import java.util.List;
-
 @RunWith(RobolectricTestRunner.class)
 public class BatterySliceTest {
 
@@ -64,14 +60,16 @@ public class BatterySliceTest {
         doNothing().when(mBatterySlice).loadBatteryInfo();
         doReturn("10%").when(mBatterySlice).getBatteryPercentString();
         doReturn("test").when(mBatterySlice).getSummary();
+
         final Slice slice = mBatterySlice.getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.power_usage_summary_title));
+
         final SliceAction primaryAction = metadata.getPrimaryAction();
         final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_battery);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
-
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.power_usage_summary_title));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
index 1a3be6c..588b7aa 100644 (file)
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
@@ -69,24 +69,31 @@ public class DataUsageSliceTest {
         ShadowDataUsageUtils.HAS_SIM = true;
         doReturn(DATA_USAGE_TITLE).when(mDataUsageSlice).getDataUsageText(any());
         doReturn(DATA_USAGE_SUMMARY).when(mDataUsageSlice).getCycleTime(any());
+
         final Slice slice = mDataUsageSlice.getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.data_usage_summary_title));
+
         final SliceAction primaryAction = metadata.getPrimaryAction();
         final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_data_usage);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
-
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.data_usage_summary_title));
     }
 
     @Test
     public void getSlice_hasNoSim_shouldShowNoSimCard() {
         ShadowDataUsageUtils.HAS_SIM = false;
+
         final Slice slice = mDataUsageSlice.getSlice();
-        final List<SliceItem> sliceItems = slice.getItems();
 
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.data_usage_summary_title));
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.no_sim_card));
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.data_usage_summary_title));
+
+        final List<SliceItem> sliceItems = slice.getItems();
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems,
+                mContext.getString(R.string.no_sim_card));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
index c1d7329..ddc7218 100644 (file)
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
@@ -70,24 +70,30 @@ public class DeviceInfoSliceTest {
         final String phoneNumber = "1111111111";
         doReturn(mSubscriptionInfo).when(mDeviceInfoSlice).getFirstSubscriptionInfo();
         doReturn(phoneNumber).when(mDeviceInfoSlice).getPhoneNumber();
+
         final Slice slice = mDeviceInfoSlice.getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.device_info_label));
+
         final SliceAction primaryAction = metadata.getPrimaryAction();
         final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_info_outline_24dp);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
 
         final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.device_info_label));
-        SliceTester.assertTitle(sliceItems, phoneNumber);
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems, phoneNumber);
     }
 
     @Test
     public void getSlice_hasNoSubscriptionInfo_shouldShowUnknown() {
         final Slice slice = mDeviceInfoSlice.getSlice();
-        final List<SliceItem> sliceItems = slice.getItems();
 
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.device_info_label));
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.device_info_default));
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.device_info_label));
+
+        final List<SliceItem> sliceItems = slice.getItems();
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems,
+                mContext.getString(R.string.device_info_default));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
index dc125e2..a758a94 100644 (file)
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
@@ -26,14 +26,12 @@ import android.content.Context;
 
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 
 import org.junit.Before;
@@ -42,8 +40,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import java.util.List;
-
 @RunWith(RobolectricTestRunner.class)
 public class StorageSliceTest {
     private static final String USED_BYTES_TEXT = "test used bytes";
@@ -68,14 +64,15 @@ public class StorageSliceTest {
         doReturn(info).when(mStorageSlice).getPrivateStorageInfo();
         doReturn(USED_BYTES_TEXT).when(mStorageSlice).getStorageUsedText(any());
         doReturn(SUMMARY_TEXT).when(mStorageSlice).getStorageSummaryText(any());
+
         final Slice slice = mStorageSlice.getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.storage_label));
+
         final SliceAction primaryAction = metadata.getPrimaryAction();
         final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_homepage_storage);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
-
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.storage_label));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
index 12ae707..bc34fd5 100644 (file)
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
@@ -106,8 +106,8 @@ public class BluetoothDevicesSliceTest {
 
         final Slice slice = mBluetoothDevicesSlice.getSlice();
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.bluetooth_devices));
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_devices));
     }
 
     @Test
@@ -118,7 +118,7 @@ public class BluetoothDevicesSliceTest {
         final Slice slice = mBluetoothDevicesSlice.getSlice();
 
         final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, BLUETOOTH_MOCK_TITLE);
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems, BLUETOOTH_MOCK_TITLE);
     }
 
     @Test
@@ -129,7 +129,7 @@ public class BluetoothDevicesSliceTest {
         final Slice slice = mBluetoothDevicesSlice.getSlice();
 
         final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems,
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems,
                 mContext.getString(R.string.bluetooth_pairing_pref_title));
     }
 
@@ -139,8 +139,9 @@ public class BluetoothDevicesSliceTest {
 
         final Slice slice = mBluetoothDevicesSlice.getSlice();
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.no_bluetooth_devices));
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.no_bluetooth_devices));
     }
 
     @Test

diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java
index 3bd29b9..99f2723 100644 (file)
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java
@@ -23,12 +23,11 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
@@ -43,8 +42,6 @@ import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
 
-import java.util.List;
-
 @RunWith(RobolectricTestRunner.class)
 public class LowStorageSliceTest {
 
@@ -73,8 +70,8 @@ public class LowStorageSliceTest {
 
         final Slice slice = mLowStorageSlice.getSlice();
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.storage_menu_free));
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.storage_menu_free));
     }
 
     @Test
@@ -94,8 +91,8 @@ public class LowStorageSliceTest {
 
         final Slice slice = mLowStorageSlice.getSlice();
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.storage_settings));
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.storage_settings));
     }
 
     @Test

diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java
index 427307d..0618cd9 100644 (file)
--- a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java
@@ -6,14 +6,12 @@ import android.content.Context;
 
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +37,10 @@ public class LocationSliceTest {
     @Test
     public void getLocationSlice_correctSliceContent() {
         final Slice LocationSlice = new LocationSlice(mContext).getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, LocationSlice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.location_settings_title));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).isEmpty();
@@ -48,8 +49,5 @@ public class LocationSliceTest {
         final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_signal_location);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
-
-        final List<SliceItem> sliceItems = LocationSlice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.location_settings_title));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
index bc9e370..ac185ac 100644 (file)
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
@@ -26,14 +26,12 @@ import android.content.Intent;
 import android.provider.Settings;
 
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 import com.android.settings.testutils.shadow.ShadowNotificationManager;
 
 import org.junit.Before;
@@ -62,16 +60,16 @@ public class ZenModeSliceBuilderTest {
     @Test
     public void getZenModeSlice_correctSliceContent() {
         final Slice dndSlice = ZenModeSliceBuilder.getSlice(mContext);
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, dndSlice);
+        assertThat(metadata.getTitle()).isEqualTo(
+                mContext.getString(R.string.zen_mode_settings_title));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).hasSize(1);
 
         final SliceAction primaryAction = metadata.getPrimaryAction();
         assertThat(primaryAction.getIcon()).isNull();
-
-        final List<SliceItem> sliceItems = dndSlice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.zen_mode_settings_title));
     }
 
     @Test

diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index c0ffdcd..17edb6e 100644 (file)
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -79,8 +79,7 @@ public class SliceTester {
         assertThat(primaryPendingIntent).isEqualTo(
                 SliceBuilderUtils.getContentPendingIntent(context, sliceData));
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, sliceData.getTitle());
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
 
         assertKeywords(metadata, sliceData);
     }
@@ -122,8 +121,7 @@ public class SliceTester {
         assertThat(primaryPendingIntent).isEqualTo(
                 SliceBuilderUtils.getContentPendingIntent(context, sliceData));
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, sliceData.getTitle());
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
 
         assertKeywords(metadata, sliceData);
     }
@@ -160,8 +158,7 @@ public class SliceTester {
         assertThat(primaryPendingIntent).isEqualTo(
                 SliceBuilderUtils.getContentPendingIntent(context, sliceData));
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, sliceData.getTitle());
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
 
         assertKeywords(metadata, sliceData);
     }
@@ -197,8 +194,7 @@ public class SliceTester {
         assertThat(primaryPendingIntent).isEqualTo(
                 SliceBuilderUtils.getContentPendingIntent(context, sliceData));
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, sliceData.getTitle());
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
 
         assertKeywords(metadata, sliceData);
     }
@@ -230,14 +226,18 @@ public class SliceTester {
         assertThat(primaryPendingIntent).isEqualTo(SliceBuilderUtils.getContentPendingIntent(
                 context, sliceData));
 
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, sliceData.getTitle());
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
 
         assertKeywords(metadata, sliceData);
     }
 
-    // TODO(b/120592507): Clean up method of SliceTester
-    public static void assertTitle(List<SliceItem> sliceItems, String title) {
+    /**
+     * Assert any slice item contains title.
+     *
+     * @param sliceItems All slice items of a Slice.
+     * @param title Title for asserting.
+     */
+    public static void assertAnySliceItemContainsTitle(List<SliceItem> sliceItems, String title) {
         boolean hasTitle = false;
         for (SliceItem item : sliceItems) {
             List<SliceItem> titleItems = SliceQuery.findAll(item, FORMAT_TEXT, HINT_TITLE,
@@ -256,7 +256,6 @@ public class SliceTester {
         assertThat(hasTitle).isTrue();
     }
 
-    // TODO(b/120592507): Clean up method of SliceTester
     private static void assertKeywords(SliceMetadata metadata, SliceData data) {
         final List<String> keywords = metadata.getSliceKeywords();
         final Set<String> expectedKeywords = Arrays.stream(data.getKeywords().split(","))
@@ -266,4 +265,4 @@ public class SliceTester {
         expectedKeywords.add(data.getScreenTitle().toString());
         assertThat(keywords).containsExactlyElementsIn(expectedKeywords);
     }
-}
+}
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
index bf5fba8..b7f713d 100644 (file)
--- a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
@@ -29,14 +29,12 @@ import android.net.wifi.WifiManager;
 
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.widget.SliceLiveData;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SliceTester;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -87,7 +85,9 @@ public class ContextualWifiSliceTest {
         mWifiManager.connect(config, null /* listener */);
 
         final Slice wifiSlice = mWifiSlice.getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, wifiSlice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.wifi_settings));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).hasSize(1);
@@ -96,8 +96,5 @@ public class ContextualWifiSliceTest {
         final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_wireless);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
-
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.wifi_settings));
     }
 }

diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
index 3c78749..ae352cc 100644 (file)
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
@@ -81,7 +81,9 @@ public class WifiSliceTest {
     @Test
     public void getWifiSlice_shouldHaveTitleAndToggle() {
         final Slice wifiSlice = mWifiSlice.getSlice();
+
         final SliceMetadata metadata = SliceMetadata.from(mContext, wifiSlice);
+        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.wifi_settings));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).hasSize(1);
@@ -90,9 +92,6 @@ public class WifiSliceTest {
         final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_wireless);
         assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
-
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.wifi_settings));
     }
 
     @Test
@@ -119,7 +118,8 @@ public class WifiSliceTest {
         // All AP rows + title row
         assertThat(rows).isEqualTo(DEFAULT_EXPANDED_ROW_COUNT + 1);
         // Has scanning text
-        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.wifi_empty_list_wifi_on));
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems,
+                mContext.getString(R.string.wifi_empty_list_wifi_on));
     }
 
     @Test