Unify action buttons to a common widget (part 1)
- Create a preference type to host action button preferences. - Convert app battery usage page to use the new preference - Convert wifi detail page to use the new preference Change-Id: I60bc473986ab46f2897e2537eb0e013fa813a4fc Fix: 63991885 Test: robotests
This commit is contained in:
Fan Zhang
@@ -17,11 +17,8 @@ package com.android.settings.deviceinfo.storage;
|
||||
|
||||
|
||||
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
@@ -44,7 +41,6 @@ import android.widget.LinearLayout;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.SubSettings;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.applications.ManageApplications;
|
||||
@@ -52,6 +48,7 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settings.deviceinfo.PrivateVolumeSettings;
|
||||
import com.android.settings.deviceinfo.StorageItemPreference;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import com.android.settingslib.applications.StorageStatsSource;
|
||||
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.android.settings.fuelgauge;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
@@ -40,13 +39,14 @@ import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.UserManager;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.enterprise.DevicePolicyManagerWrapper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.widget.ActionButtonPreference;
|
||||
import com.android.settings.widget.ActionButtonPreferenceTest;
|
||||
import com.android.settingslib.applications.AppUtils;
|
||||
import com.android.settingslib.applications.ApplicationsState;
|
||||
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
|
||||
@@ -98,10 +98,8 @@ public class AppButtonsPreferenceControllerTest {
|
||||
private Application mApplication;
|
||||
@Mock
|
||||
private PackageInfo mPackageInfo;
|
||||
@Mock
|
||||
private Button mUninstallButton;
|
||||
@Mock
|
||||
private Button mForceStopButton;
|
||||
|
||||
private ActionButtonPreference mButtonPrefs;
|
||||
|
||||
private Intent mUninstallIntent;
|
||||
private AppButtonsPreferenceController mController;
|
||||
@@ -129,8 +127,8 @@ public class AppButtonsPreferenceControllerTest {
|
||||
mPackageInfo.packageName = PACKAGE_NAME;
|
||||
mPackageInfo.applicationInfo = mAppInfo;
|
||||
|
||||
mController.mUninstallButton = mUninstallButton;
|
||||
mController.mForceStopButton = mForceStopButton;
|
||||
mButtonPrefs = ActionButtonPreferenceTest.createMock();
|
||||
mController.mButtonsPref = mButtonPrefs;
|
||||
mController.mPackageInfo = mPackageInfo;
|
||||
|
||||
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
|
||||
@@ -155,7 +153,6 @@ public class AppButtonsPreferenceControllerTest {
|
||||
assertThat(mController.mPackageInfo).isNotNull();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testRetrieveAppEntry_noAppEntry_null() throws PackageManager.NameNotFoundException {
|
||||
doReturn(null).when(mState).getEntry(eq(PACKAGE_NAME), anyInt());
|
||||
@@ -182,13 +179,13 @@ public class AppButtonsPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void testUpdateUninstallButton_isSystemApp_handleAsDisableableButton() {
|
||||
doReturn(false).when(mController).handleDisableable(any());
|
||||
doReturn(false).when(mController).handleDisableable();
|
||||
mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
|
||||
|
||||
mController.updateUninstallButton();
|
||||
|
||||
verify(mController).handleDisableable(any());
|
||||
verify(mUninstallButton).setEnabled(false);
|
||||
verify(mController).handleDisableable();
|
||||
verify(mButtonPrefs).setButton1Enabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -219,14 +216,14 @@ public class AppButtonsPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void testUpdateUninstallButton_isDeviceAdminApp_setButtonDisable() {
|
||||
doReturn(true).when(mController).handleDisableable(any());
|
||||
doReturn(true).when(mController).handleDisableable();
|
||||
mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
|
||||
doReturn(true).when(mDpm).packageHasActiveAdmins(anyString());
|
||||
|
||||
mController.updateUninstallButton();
|
||||
|
||||
verify(mController).handleDisableable(any());
|
||||
verify(mUninstallButton).setEnabled(false);
|
||||
verify(mController).handleDisableable();
|
||||
verify(mButtonPrefs).setButton1Enabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -235,7 +232,7 @@ public class AppButtonsPreferenceControllerTest {
|
||||
|
||||
mController.updateUninstallButton();
|
||||
|
||||
verify(mUninstallButton).setEnabled(false);
|
||||
verify(mButtonPrefs).setButton1Enabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -245,7 +242,7 @@ public class AppButtonsPreferenceControllerTest {
|
||||
|
||||
mController.updateUninstallButton();
|
||||
|
||||
verify(mUninstallButton).setEnabled(false);
|
||||
verify(mButtonPrefs).setButton1Enabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -254,7 +251,7 @@ public class AppButtonsPreferenceControllerTest {
|
||||
|
||||
mController.updateUninstallButton();
|
||||
|
||||
verify(mUninstallButton).setEnabled(false);
|
||||
verify(mButtonPrefs).setButton1Enabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -264,7 +261,7 @@ public class AppButtonsPreferenceControllerTest {
|
||||
|
||||
mController.updateUninstallButton();
|
||||
|
||||
verify(mUninstallButton).setEnabled(false);
|
||||
verify(mButtonPrefs).setButton1Enabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -312,11 +309,10 @@ public class AppButtonsPreferenceControllerTest {
|
||||
public void testHandleDisableable_isHomeApp_notControllable() {
|
||||
mController.mHomePackages.add(PACKAGE_NAME);
|
||||
|
||||
final boolean controllable = mController.handleDisableable(mUninstallButton);
|
||||
final boolean controllable = mController.handleDisableable();
|
||||
|
||||
verify(mUninstallButton).setText(R.string.disable_text);
|
||||
verify(mButtonPrefs).setButton1Text(R.string.disable_text);
|
||||
assertThat(controllable).isFalse();
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -325,9 +321,9 @@ public class AppButtonsPreferenceControllerTest {
|
||||
mAppEntry.info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
|
||||
doReturn(false).when(mController).isSystemPackage(any(), any(), any());
|
||||
|
||||
final boolean controllable = mController.handleDisableable(mUninstallButton);
|
||||
final boolean controllable = mController.handleDisableable();
|
||||
|
||||
verify(mUninstallButton).setText(R.string.disable_text);
|
||||
verify(mButtonPrefs).setButton1Text(R.string.disable_text);
|
||||
assertThat(controllable).isTrue();
|
||||
|
||||
}
|
||||
@@ -338,9 +334,9 @@ public class AppButtonsPreferenceControllerTest {
|
||||
mAppEntry.info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
|
||||
doReturn(false).when(mController).isSystemPackage(any(), any(), any());
|
||||
|
||||
final boolean controllable = mController.handleDisableable(mUninstallButton);
|
||||
final boolean controllable = mController.handleDisableable();
|
||||
|
||||
verify(mUninstallButton).setText(R.string.enable_text);
|
||||
verify(mButtonPrefs).setButton1Text(R.string.enable_text);
|
||||
assertThat(controllable).isTrue();
|
||||
}
|
||||
|
||||
@@ -356,7 +352,7 @@ public class AppButtonsPreferenceControllerTest {
|
||||
* The test fragment which implements
|
||||
* {@link ButtonActionDialogFragment.AppButtonsDialogListener}
|
||||
*/
|
||||
private static class TestFragment extends Fragment implements
|
||||
public static class TestFragment extends Fragment implements
|
||||
ButtonActionDialogFragment.AppButtonsDialogListener {
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.widget;
|
||||
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyBoolean;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.PreferenceViewHolder;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class ActionButtonPreferenceTest {
|
||||
|
||||
private Context mContext;
|
||||
private View mRootView;
|
||||
private ActionButtonPreference mPref;
|
||||
private PreferenceViewHolder mHolder;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mRootView = View.inflate(mContext, R.layout.two_action_buttons, null /* parent */);
|
||||
mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
|
||||
mPref = new ActionButtonPreference(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setVisibility_shouldUpdateButtonVisibility() {
|
||||
mPref.setButton1Visible(false).setButton2Visible(false);
|
||||
mPref.onBindViewHolder(mHolder);
|
||||
|
||||
assertThat(mRootView.findViewById(R.id.button1_positive).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button1_negative).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
|
||||
assertThat(mRootView.findViewById(R.id.button2_positive).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button2_negative).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
|
||||
mPref.setButton1Visible(true).setButton2Visible(true);
|
||||
mPref.onBindViewHolder(mHolder);
|
||||
|
||||
assertThat(mRootView.findViewById(R.id.button1_positive).getVisibility())
|
||||
.isEqualTo(View.VISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button1_negative).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button2_positive).getVisibility())
|
||||
.isEqualTo(View.VISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button2_negative).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setPositiveNegative_shouldHideOppositeButton() {
|
||||
mPref.setButton1Positive(true).setButton2Positive(false);
|
||||
mPref.onBindViewHolder(mHolder);
|
||||
|
||||
assertThat(mRootView.findViewById(R.id.button1_positive).getVisibility())
|
||||
.isEqualTo(View.VISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button1_negative).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button2_positive).getVisibility())
|
||||
.isEqualTo(View.INVISIBLE);
|
||||
assertThat(mRootView.findViewById(R.id.button2_negative).getVisibility())
|
||||
.isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setEnabled_shouldEnableButton() {
|
||||
mPref.setButton1Enabled(true).setButton2Enabled(false);
|
||||
mPref.onBindViewHolder(mHolder);
|
||||
|
||||
assertThat(mRootView.findViewById(R.id.button1_positive).isEnabled()).isTrue();
|
||||
assertThat(mRootView.findViewById(R.id.button1_negative).isEnabled()).isTrue();
|
||||
assertThat(mRootView.findViewById(R.id.button2_positive).isEnabled()).isFalse();
|
||||
assertThat(mRootView.findViewById(R.id.button2_negative).isEnabled()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setText() {
|
||||
mPref.setButton1Text(R.string.settings_label);
|
||||
mPref.onBindViewHolder(mHolder);
|
||||
|
||||
assertThat(((Button) mRootView.findViewById(R.id.button1_positive)).getText())
|
||||
.isEqualTo(mContext.getText(R.string.settings_label));
|
||||
assertThat(((Button) mRootView.findViewById(R.id.button1_negative)).getText())
|
||||
.isEqualTo(mContext.getText(R.string.settings_label));
|
||||
}
|
||||
|
||||
public static ActionButtonPreference createMock() {
|
||||
final ActionButtonPreference pref = mock(ActionButtonPreference.class);
|
||||
when(pref.setButton1Text(anyInt())).thenReturn(pref);
|
||||
when(pref.setButton1Positive(anyBoolean())).thenReturn(pref);
|
||||
when(pref.setButton1Enabled(anyBoolean())).thenReturn(pref);
|
||||
when(pref.setButton1Visible(anyBoolean())).thenReturn(pref);
|
||||
when(pref.setButton1OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
|
||||
|
||||
when(pref.setButton2Text(anyInt())).thenReturn(pref);
|
||||
when(pref.setButton2Positive(anyBoolean())).thenReturn(pref);
|
||||
when(pref.setButton2Enabled(anyBoolean())).thenReturn(pref);
|
||||
when(pref.setButton2Visible(anyBoolean())).thenReturn(pref);
|
||||
when(pref.setButton2OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
|
||||
return pref;
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,6 @@
|
||||
package com.android.settings.wifi.details;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Matchers.any;
|
||||
@@ -52,7 +51,6 @@ import android.support.v7.preference.PreferenceCategory;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
@@ -63,6 +61,8 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
|
||||
import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
|
||||
import com.android.settings.widget.ActionButtonPreference;
|
||||
import com.android.settings.widget.ActionButtonPreferenceTest;
|
||||
import com.android.settings.widget.EntityHeaderController;
|
||||
import com.android.settings.wifi.WifiDetailPreference;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
@@ -119,8 +119,7 @@ public class WifiDetailPreferenceControllerTest {
|
||||
private LayoutPreference mockHeaderLayoutPreference;
|
||||
@Mock private ImageView mockHeaderIcon;
|
||||
|
||||
@Mock private LayoutPreference mockButtonsPref;
|
||||
@Mock private Button mockSignInButton;
|
||||
@Mock private ActionButtonPreference mockButtonsPref;
|
||||
@Mock private WifiDetailPreference mockSignalStrengthPref;
|
||||
@Mock private WifiDetailPreference mockLinkSpeedPref;
|
||||
@Mock private WifiDetailPreference mockFrequencyPref;
|
||||
@@ -130,7 +129,6 @@ public class WifiDetailPreferenceControllerTest {
|
||||
@Mock private WifiDetailPreference mockGatewayPref;
|
||||
@Mock private WifiDetailPreference mockSubnetPref;
|
||||
@Mock private WifiDetailPreference mockDnsPref;
|
||||
@Mock private Button mockForgetButton;
|
||||
@Mock private PreferenceCategory mockIpv6Category;
|
||||
@Mock private WifiDetailPreference mockIpv6AddressesPref;
|
||||
|
||||
@@ -211,7 +209,9 @@ public class WifiDetailPreferenceControllerTest {
|
||||
.thenReturn(mockNetworkInfo);
|
||||
doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
|
||||
nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
|
||||
doNothing().when(mockForgetButton).setOnClickListener(mForgetClickListener.capture());
|
||||
mockButtonsPref = ActionButtonPreferenceTest.createMock();
|
||||
when(mockButtonsPref.setButton1OnClickListener(mForgetClickListener.capture()))
|
||||
.thenReturn(mockButtonsPref);
|
||||
|
||||
when(mockWifiInfo.getLinkSpeed()).thenReturn(LINK_SPEED);
|
||||
when(mockWifiInfo.getRssi()).thenReturn(RSSI);
|
||||
@@ -256,10 +256,6 @@ public class WifiDetailPreferenceControllerTest {
|
||||
|
||||
when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
|
||||
.thenReturn(mockButtonsPref);
|
||||
when(mockButtonsPref.findViewById(R.id.forget_button))
|
||||
.thenReturn(mockForgetButton);
|
||||
when(mockButtonsPref.findViewById(R.id.signin_button))
|
||||
.thenReturn(mockSignInButton);
|
||||
when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
|
||||
.thenReturn(mockSignalStrengthPref);
|
||||
when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_LINK_SPEED))
|
||||
@@ -596,7 +592,7 @@ public class WifiDetailPreferenceControllerTest {
|
||||
mController = newWifiDetailPreferenceController();
|
||||
displayAndResume();
|
||||
|
||||
verify(mockForgetButton).setVisibility(View.INVISIBLE);
|
||||
verify(mockButtonsPref).setButton1Visible(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -606,14 +602,14 @@ public class WifiDetailPreferenceControllerTest {
|
||||
|
||||
displayAndResume();
|
||||
|
||||
verify(mockForgetButton).setVisibility(View.VISIBLE);
|
||||
verify(mockButtonsPref).setButton1Visible(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void canForgetNetwork_saved() {
|
||||
displayAndResume();
|
||||
|
||||
verify(mockForgetButton).setVisibility(View.VISIBLE);
|
||||
verify(mockButtonsPref).setButton1Visible(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -716,23 +712,23 @@ public class WifiDetailPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void captivePortal_shouldShowSignInButton() {
|
||||
InOrder inOrder = inOrder(mockSignInButton);
|
||||
InOrder inOrder = inOrder(mockButtonsPref);
|
||||
|
||||
displayAndResume();
|
||||
|
||||
inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
|
||||
inOrder.verify(mockButtonsPref).setButton2Visible(false);
|
||||
|
||||
NetworkCapabilities nc = makeNetworkCapabilities();
|
||||
updateNetworkCapabilities(nc);
|
||||
inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
|
||||
inOrder.verify(mockButtonsPref).setButton2Visible(false);
|
||||
|
||||
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
|
||||
updateNetworkCapabilities(nc);
|
||||
inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE);
|
||||
inOrder.verify(mockButtonsPref).setButton2Visible(true);
|
||||
|
||||
nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
|
||||
updateNetworkCapabilities(nc);
|
||||
inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
|
||||
inOrder.verify(mockButtonsPref).setButton2Visible(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -740,40 +736,10 @@ public class WifiDetailPreferenceControllerTest {
|
||||
displayAndResume();
|
||||
|
||||
ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
|
||||
verify(mockSignInButton).setOnClickListener(captor.capture());
|
||||
captor.getValue().onClick(mockSignInButton);
|
||||
verify(mockButtonsPref).setButton2OnClickListener(captor.capture());
|
||||
captor.getValue().onClick(null);
|
||||
verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
|
||||
verify(mockMetricsFeatureProvider)
|
||||
.action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void signInButtonVisible_buttonPanelShouldBeVisible() {
|
||||
when(mockSignInButton.getVisibility()).thenReturn(View.VISIBLE);
|
||||
when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
|
||||
|
||||
displayAndResume();
|
||||
|
||||
verify(mockButtonsPref).setVisible(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void forgetButtonVisible_buttonPanelShouldBeVisible() {
|
||||
when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
|
||||
when(mockForgetButton.getVisibility()).thenReturn(View.VISIBLE);
|
||||
|
||||
displayAndResume();
|
||||
|
||||
verify(mockButtonsPref).setVisible(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void neitherButtonVisible_buttonPanelShouldBeInvisible() {
|
||||
when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
|
||||
when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
|
||||
|
||||
displayAndResume();
|
||||
|
||||
verify(mockButtonsPref).setVisible(false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user