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

Commit 1c9b97d5 authored by Yanting Yang's avatar Yanting Yang
Browse files

Clean up assertion methods in SliceTester

Fixes: 120592507
Test: robotests
Change-Id: Ic20fa96aa500d9ab50ef2adcb59f48c328989ec8
parent 847c0660
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -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
+3 −5
Original line number Diff line number Diff line
@@ -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));
    }
}
+5 −7
Original line number Diff line number Diff line
@@ -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));
    }
}
+13 −6
Original line number Diff line number Diff line
@@ -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));
    }
}
+11 −5
Original line number Diff line number Diff line
@@ -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));
    }
}
Loading