Base implementation of WFC disclaimer UI
Test: manual - Check that no error occurred when changing the wifi calling settings to turn on. Test: auto - Passed WifiCallingSettingsForSubTest, WifiCallingDisclaimerFragmentTest and DisclaimerItemListAdapterTest. Bug: 67872298 Change-Id: I789f530d3e16baa6e56feaa4269f6696976f747e
This commit is contained in:
manabu, shimoda
committed by
Hall Liu
Hall Liu
parent
60d64cecd4
commit
9fae73915c
@@ -0,0 +1,126 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.wifi.calling;
|
||||
|
||||
import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
|
||||
.DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
|
||||
import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
|
||||
.DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_DESCRIPTION;
|
||||
import static org.mockito.Matchers.anyBoolean;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Matchers.anyObject;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class DisclaimerItemListAdapterTest {
|
||||
|
||||
private static final int ITEM_POSITION = 0;
|
||||
private static final int DISCLAIMER_TITLE_STRING_ID = 0;
|
||||
private static final int DISCLAIMER_MESSAGE_STRING_ID = 1;
|
||||
|
||||
@Mock
|
||||
private LayoutInflater mLayoutInflater;
|
||||
@Mock
|
||||
private TextView mTestView;
|
||||
@Mock
|
||||
private TextView mDescView;
|
||||
@Mock
|
||||
private View mView;
|
||||
@Mock
|
||||
private ViewGroup mViewGroup;
|
||||
@Mock
|
||||
private Context mContext;
|
||||
|
||||
private MockDisclaimerItem mDisclaimerItem;
|
||||
private DisclaimerItemListAdapter mDisclaimerItemListAdapter;
|
||||
private List<DisclaimerItem> mDisclaimerItemList = new ArrayList<>();
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */));
|
||||
mDisclaimerItemList.add(mDisclaimerItem);
|
||||
|
||||
when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView);
|
||||
when(mViewGroup.getContext()).thenReturn(mContext);
|
||||
when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn(
|
||||
mLayoutInflater);
|
||||
when(mView.findViewById(ID_DISCLAIMER_ITEM_TITLE)).thenReturn(mTestView);
|
||||
when(mView.findViewById(ID_DISCLAIMER_ITEM_DESCRIPTION)).thenReturn(mDescView);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_haveItem_shouldSetText() {
|
||||
final DisclaimerItemListAdapter.DisclaimerItemViewHolder viewHolder =
|
||||
new DisclaimerItemListAdapter.DisclaimerItemViewHolder(mView);
|
||||
|
||||
mDisclaimerItemListAdapter = new DisclaimerItemListAdapter(mDisclaimerItemList);
|
||||
mDisclaimerItemListAdapter.onCreateViewHolder(mViewGroup, 0 /* viewType */);
|
||||
mDisclaimerItemListAdapter.onBindViewHolder(viewHolder, ITEM_POSITION);
|
||||
|
||||
// Check the text is set when the DisclaimerItem exists.
|
||||
verify(viewHolder.titleView).setText(DISCLAIMER_TITLE_STRING_ID);
|
||||
verify(viewHolder.descriptionView).setText(DISCLAIMER_MESSAGE_STRING_ID);
|
||||
}
|
||||
|
||||
private class MockDisclaimerItem extends DisclaimerItem {
|
||||
MockDisclaimerItem(Context context, int subId) {
|
||||
super(context, subId);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getTitleId() {
|
||||
return DISCLAIMER_TITLE_STRING_ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getMessageId() {
|
||||
return DISCLAIMER_MESSAGE_STRING_ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getName() {
|
||||
return "MockDisclaimerItem";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPrefKey() {
|
||||
return "mock_pref_key";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,180 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.wifi.calling;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyBoolean;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Matchers.anyObject;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.shadow.ShadowDisclaimerItemFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowDisclaimerItemFactory.class)
|
||||
public class WifiCallingDisclaimerFragmentTest {
|
||||
|
||||
@Mock
|
||||
private Activity mActivity;
|
||||
@Mock
|
||||
private DisclaimerItem mDisclaimerItem;
|
||||
@Mock
|
||||
private LayoutInflater mLayoutInflater;
|
||||
@Mock
|
||||
private View mView;
|
||||
@Mock
|
||||
private ViewGroup mViewGroup;
|
||||
@Mock
|
||||
private Button mAgreeButton;
|
||||
@Mock
|
||||
private Button mDisagreeButton;
|
||||
@Mock
|
||||
private RecyclerView mRecyclerView;
|
||||
|
||||
@Captor
|
||||
ArgumentCaptor<OnClickListener> mOnClickListenerCaptor;
|
||||
@Captor
|
||||
ArgumentCaptor<OnScrollListener> mOnScrollListenerCaptor;
|
||||
|
||||
private WifiCallingDisclaimerFragment mFragment;
|
||||
private List<DisclaimerItem> mDisclaimerItemList = new ArrayList<>();
|
||||
private List<DisclaimerItem> mEmptyDisclaimerItemList = new ArrayList<>();
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mActivity = Robolectric.setupActivity(Activity.class);
|
||||
mFragment = spy(new WifiCallingDisclaimerFragment());
|
||||
|
||||
doReturn(mActivity).when(mFragment).getActivity();
|
||||
|
||||
when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView);
|
||||
when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton);
|
||||
when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton);
|
||||
when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView);
|
||||
when(mView.getId()).thenReturn(R.id.agree_button);
|
||||
|
||||
mOnScrollListenerCaptor = ArgumentCaptor.forClass(OnScrollListener.class);
|
||||
doNothing().when(mRecyclerView).addOnScrollListener(mOnScrollListenerCaptor.capture());
|
||||
mOnClickListenerCaptor = ArgumentCaptor.forClass(OnClickListener.class);
|
||||
doNothing().when(mAgreeButton).setOnClickListener(mOnClickListenerCaptor.capture());
|
||||
|
||||
mDisclaimerItemList.add(mDisclaimerItem);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCreate_notHaveItem_shouldFinishFragment() {
|
||||
ShadowDisclaimerItemFactory.setDisclaimerItemList(mEmptyDisclaimerItemList);
|
||||
|
||||
mFragment.onCreate(null /* savedInstanceState */);
|
||||
|
||||
// Check the fragment is finished when the DisclaimerItemList is empty.
|
||||
verify(mFragment).finish(Activity.RESULT_OK);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCreate_haveItem_shouldNotFinishFragment() {
|
||||
ShadowDisclaimerItemFactory.setDisclaimerItemList(mDisclaimerItemList);
|
||||
|
||||
mFragment.onCreate(null /* savedInstanceState */);
|
||||
|
||||
// Check the fragment is not finished when the DisclaimerItemList is not empty.
|
||||
verify(mFragment, never()).finish(Activity.RESULT_OK);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onScrolled_canNotScroll_shouldEnableAgreeButton() {
|
||||
ShadowDisclaimerItemFactory.setDisclaimerItemList(mDisclaimerItemList);
|
||||
|
||||
when(mRecyclerView.canScrollVertically(1)).thenReturn(false);
|
||||
|
||||
mFragment.onCreate(null /* savedInstanceState */);
|
||||
mFragment.onCreateView(mLayoutInflater, mViewGroup, null /* savedInstanceState */);
|
||||
|
||||
mOnScrollListenerCaptor.getValue().onScrolled(mRecyclerView, 0, 0);
|
||||
|
||||
// Check the agreeButton is enabled when the view is scrolled to the bottom end.
|
||||
verify(mAgreeButton).setEnabled(true);
|
||||
// Check the OnScrollListener is removed when the view is scrolled to the bottom end.
|
||||
verify(mRecyclerView).removeOnScrollListener(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onScrolled_canScroll_shouldNotEnableAgreeButton() {
|
||||
ShadowDisclaimerItemFactory.setDisclaimerItemList(mDisclaimerItemList);
|
||||
|
||||
when(mRecyclerView.canScrollVertically(1)).thenReturn(true);
|
||||
|
||||
mFragment.onCreate(null /* savedInstanceState */);
|
||||
mFragment.onCreateView(mLayoutInflater, mViewGroup, null /* savedInstanceState */);
|
||||
|
||||
mOnScrollListenerCaptor.getValue().onScrolled(mRecyclerView, 0, 0);
|
||||
|
||||
// Check the agreeButton is not enabled when the view is not scrolled to the bottom end.
|
||||
verify(mAgreeButton, never()).setEnabled(anyBoolean());
|
||||
// Check the OnScrollListener is not removed when the view is not scrolled to
|
||||
// the bottom end.
|
||||
verify(mRecyclerView, never()).removeOnScrollListener(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onClick_agreeButton_shouldFinishFragment() {
|
||||
ShadowDisclaimerItemFactory.setDisclaimerItemList(mDisclaimerItemList);
|
||||
|
||||
mFragment.onCreate(null /* savedInstanceState */);
|
||||
mFragment.onCreateView(mLayoutInflater, mViewGroup, null /* savedInstanceState */);
|
||||
|
||||
mOnClickListenerCaptor.getValue().onClick(mAgreeButton);
|
||||
|
||||
// Check the onAgreed callback is called when "CONTINUE" button is clicked.
|
||||
verify(mDisclaimerItem).onAgreed();
|
||||
// Check the WFC disclaimer fragment is finished when "CONTINUE" button is clicked.
|
||||
verify(mFragment).finish(Activity.RESULT_OK);
|
||||
}
|
||||
}
|
||||
@@ -16,11 +16,14 @@
|
||||
|
||||
package com.android.settings.wifi.calling;
|
||||
|
||||
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static junit.framework.Assert.assertEquals;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyBoolean;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.eq;
|
||||
@@ -31,6 +34,8 @@ import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@@ -41,18 +46,22 @@ import android.telephony.ims.ProvisioningManager;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.ims.ImsConfig;
|
||||
import com.android.ims.ImsManager;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import com.android.settings.widget.SwitchBar;
|
||||
import com.android.settings.widget.ToggleSwitch;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
@@ -63,6 +72,8 @@ import org.robolectric.util.ReflectionHelpers;
|
||||
public class WifiCallingSettingsForSubTest {
|
||||
private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
|
||||
private static final String BUTTON_WFC_ROAMING_MODE = "wifi_calling_roaming_mode";
|
||||
private static final String TEST_EMERGENCY_ADDRESS_CARRIER_APP =
|
||||
"com.android.settings/.wifi.calling.TestEmergencyAddressCarrierApp";
|
||||
|
||||
private TestFragment mFragment;
|
||||
private Context mContext;
|
||||
@@ -70,6 +81,7 @@ public class WifiCallingSettingsForSubTest {
|
||||
private final PersistableBundle mBundle = new PersistableBundle();
|
||||
|
||||
@Mock private static CarrierConfigManager sCarrierConfigManager;
|
||||
@Mock private CarrierConfigManager mMockConfigManager;
|
||||
@Mock private ImsManager mImsManager;
|
||||
@Mock private TelephonyManager mTelephonyManager;
|
||||
@Mock private PreferenceScreen mPreferenceScreen;
|
||||
@@ -80,6 +92,7 @@ public class WifiCallingSettingsForSubTest {
|
||||
@Mock private ImsConfig mImsConfig;
|
||||
@Mock private ListWithEntrySummaryPreference mButtonWfcMode;
|
||||
@Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
|
||||
@Mock private Preference mUpdateAddress;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
@@ -121,6 +134,11 @@ public class WifiCallingSettingsForSubTest {
|
||||
doReturn(mBundle).when(sCarrierConfigManager).getConfigForSubId(anyInt());
|
||||
setDefaultCarrierConfigValues();
|
||||
|
||||
doReturn(sCarrierConfigManager).when(mActivity).getSystemService(
|
||||
CarrierConfigManager.class);
|
||||
doReturn(mContext.getResources()).when(mFragment).getResourcesForSubId();
|
||||
doNothing().when(mFragment).startActivityForResult(any(Intent.class), anyInt());
|
||||
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onCreate(null);
|
||||
mFragment.onActivityCreated(null);
|
||||
@@ -131,6 +149,9 @@ public class WifiCallingSettingsForSubTest {
|
||||
CarrierConfigManager.KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);
|
||||
mBundle.putBoolean(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL, true);
|
||||
mBundle.putBoolean(CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, true);
|
||||
mBundle.putString(
|
||||
CarrierConfigManager.KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING,
|
||||
TEST_EMERGENCY_ADDRESS_CARRIER_APP);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -259,6 +280,61 @@ public class WifiCallingSettingsForSubTest {
|
||||
eq(true));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSwitchChanged_enableSetting_shouldLaunchWfcDisclaimerFragment() {
|
||||
ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
mFragment.onSwitchChanged(null, true);
|
||||
|
||||
// Check the WFC disclaimer fragment is launched.
|
||||
verify(mFragment).startActivityForResult(intentCaptor.capture(),
|
||||
eq(WifiCallingSettingsForSub.REQUEST_CHECK_WFC_DISCLAIMER));
|
||||
Intent intent = intentCaptor.getValue();
|
||||
assertThat(intent.getStringExtra(EXTRA_SHOW_FRAGMENT))
|
||||
.isEqualTo(WifiCallingDisclaimerFragment.class.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onActivityResult_finishWfcDisclaimerFragment_shouldLaunchCarrierActivity() {
|
||||
ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
// Emulate the WfcDisclaimerActivity finish.
|
||||
mFragment.onActivityResult(WifiCallingSettingsForSub.REQUEST_CHECK_WFC_DISCLAIMER,
|
||||
Activity.RESULT_OK, null);
|
||||
|
||||
// Check the WFC emergency address activity is launched.
|
||||
verify(mFragment).startActivityForResult(intentCaptor.capture(),
|
||||
eq(WifiCallingSettingsForSub.REQUEST_CHECK_WFC_EMERGENCY_ADDRESS));
|
||||
Intent intent = intentCaptor.getValue();
|
||||
assertEquals(intent.getComponent(), ComponentName.unflattenFromString(
|
||||
TEST_EMERGENCY_ADDRESS_CARRIER_APP));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onActivityResult_finishCarrierActivity_shouldShowWfcPreference() {
|
||||
ReflectionHelpers.setField(mFragment, "mButtonWfcMode", mButtonWfcMode);
|
||||
ReflectionHelpers.setField(mFragment, "mButtonWfcRoamingMode", mButtonWfcRoamingMode);
|
||||
ReflectionHelpers.setField(mFragment, "mUpdateAddress", mUpdateAddress);
|
||||
|
||||
mFragment.onActivityResult(WifiCallingSettingsForSub.REQUEST_CHECK_WFC_EMERGENCY_ADDRESS,
|
||||
Activity.RESULT_OK, null);
|
||||
|
||||
// Check the WFC preferences is added.
|
||||
verify(mPreferenceScreen).addPreference(mButtonWfcMode);
|
||||
verify(mPreferenceScreen).addPreference(mButtonWfcRoamingMode);
|
||||
verify(mPreferenceScreen).addPreference(mUpdateAddress);
|
||||
// Check the WFC enable request.
|
||||
verify(mImsManager).setWfcSetting(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSwitchChanged_disableSetting_shouldNotLaunchWfcDisclaimerFragment() {
|
||||
mFragment.onSwitchChanged(null, false);
|
||||
|
||||
// Check the WFC disclaimer fragment is not launched.
|
||||
verify(mFragment, never()).startActivityForResult(any(Intent.class), anyInt());
|
||||
}
|
||||
|
||||
protected class TestFragment extends WifiCallingSettingsForSub {
|
||||
@Override
|
||||
protected Object getSystemService(final String name) {
|
||||
|
||||
Reference in New Issue
Block a user