PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up assertion methods in SliceTester

Browse Source 
Fixes: 120592507
Test: robotests
Change-Id: Ic20fa96aa500d9ab50ef2adcb59f48c328989ec8
This commit is contained in:
Yanting Yang
2018-12-19 23:09:22 +08:00
parent 847c0660a5
commit 1c9b97d537
13 changed files with 77 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
View File

@@ -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));
}
}

8
tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
View File

@@ -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