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

Commit 61ea59ab authored by Zoey Chen's avatar Zoey Chen
Browse files

[Provider Model] Implement Calls & SMS fragment test case 

New test case: NetworkProviderCallsSmsFragmentTest
Modify the key of preference

Bug: 172053880
Test: manual & atest -c NetworkProviderCallsSmsFragmentTest
Change-Id: I218aaf1194898e70b2118428c1ea5a389d85d036
parent 2d09dab4

res/xml/network_provider_calls_sms.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -17,11 +17,11 @@ 
<PreferenceScreen

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="calls_and_sms_screen"

    android:key="provider_model_calls_and_sms_screen"

    android:title="@string/calls_and_sms">

    android:title="@string/calls_and_sms">





    <ListPreference

    <ListPreference

        android:key="calls_preference"

        android:key="provider_model_calls_preference"

        android:title="@string/calls_preference_title"

        android:title="@string/calls_preference_title"

        settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController"

        settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController"

        android:order="10"

        android:order="10"
@@ -29,7 +29,7 @@ 
        />

        />





    <ListPreference

    <ListPreference

        android:key="sms_preference"

        android:key="provider_model_sms_preference"

        android:title="@string/sms_preference_title"

        android:title="@string/sms_preference_title"

        settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"

        settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"

        android:order="15"

        android:order="15"
@@ -45,7 +45,7 @@ 
        />

        />





    <com.android.settingslib.widget.FooterPreference

    <com.android.settingslib.widget.FooterPreference

        android:key="calls_sms_footer"

        android:key="provider_model_calls_sms_footer"

        android:title="@string/calls_sms_footnote"

        android:title="@string/calls_sms_footnote"

        android:selectable="false"

        android:selectable="false"

        settings:searchable="false"

        settings:searchable="false"

src/com/android/settings/network/NetworkProviderCallsSmsFragment.java

+10 −4
Original line number Original line Diff line number Diff line
@@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums; 
import android.content.Context;

import android.content.Context;

import android.os.UserManager;

import android.os.UserManager;





import androidx.annotation.VisibleForTesting;



import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.Utils;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.DashboardFragment;
@@ -35,10 +37,14 @@ import java.util.List; 




@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class NetworkProviderCallsSmsFragment extends DashboardFragment {

public class NetworkProviderCallsSmsFragment extends DashboardFragment {

    private static final String LOG_TAG = "NetworkProviderCallsSmsFragment";

    @VisibleForTesting

    private static final String KEY_PREFERENCE_CATEGORY_CALLING = "provider_model_calling_category";

    static final String LOG_TAG = "NetworkProviderCallsSmsFragment";

    private static final String KEY_PREFERENCE_CALLS= "calls_preference";

    @VisibleForTesting

    private static final String KEY_PREFERENCE_SMS = "sms_preference";

    static final String KEY_PREFERENCE_CATEGORY_CALLING = "provider_model_calling_category";

    @VisibleForTesting

    static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference";

    @VisibleForTesting

    static final String KEY_PREFERENCE_SMS = "provider_model_sms_preference";





    private NetworkProviderWifiCallingPreferenceController

    private NetworkProviderWifiCallingPreferenceController

            mNetworkProviderWifiCallingPreferenceController;

            mNetworkProviderWifiCallingPreferenceController;

tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java

0 → 100644
+87 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.network;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.spy;



import android.app.Instrumentation;

import android.content.Context;

import android.os.Looper;

import android.provider.SearchIndexableResource;

import android.util.FeatureFlagUtils;



import androidx.test.annotation.UiThreadTest;

import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.List;



@RunWith(AndroidJUnit4.class)

public class NetworkProviderCallsSmsFragmentTest {



    private Context mContext;

    private NetworkProviderCallsSmsFragment mNetworkProviderCallsSmsFragment;

    private List<String> mPreferenceKeyList;



    @Before

    @UiThreadTest

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());



        if (Looper.myLooper() == null) {

            Looper.prepare();

        }



        mNetworkProviderCallsSmsFragment = new NetworkProviderCallsSmsFragment();

    }



    @Test

    @UiThreadTest

    public void isPageSearchEnabled_providerModelEnable_shouldIncludeFragmentXml() {

        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);

        mPreferenceKeyList =

                NetworkProviderCallsSmsFragment.SEARCH_INDEX_DATA_PROVIDER

                        .getNonIndexableKeys(mContext);

        assertThat(mPreferenceKeyList).doesNotContain(

                NetworkProviderCallsSmsFragment.KEY_PREFERENCE_CALLS);

        assertThat(mPreferenceKeyList).doesNotContain(

                NetworkProviderCallsSmsFragment.KEY_PREFERENCE_SMS);

    }



    @Test

    @UiThreadTest

    public void isPageSearchEnabled_providerModelDisable_shouldNotIncludeFragmentXml() {

        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);

        mPreferenceKeyList =

                NetworkProviderCallsSmsFragment.SEARCH_INDEX_DATA_PROVIDER

                        .getNonIndexableKeys(mContext);

        assertThat(mPreferenceKeyList).contains(NetworkProviderCallsSmsFragment

                .KEY_PREFERENCE_CALLS);

        assertThat(mPreferenceKeyList).contains(NetworkProviderCallsSmsFragment

                .KEY_PREFERENCE_SMS);

    }

}