Merge "Remove unused classes and tests."
This commit is contained in:
committed by
Android (Google) Code Review
commit
45520fce49
@@ -1,95 +0,0 @@
|
||||
/*
|
||||
* 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.connecteddevice.usb;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.widget.TextView;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.connecteddevice.usb.UsbModeChooserActivity;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class UsbModeChooserActivityTest {
|
||||
|
||||
@Mock
|
||||
private TextView mTextView;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSummary_chargeDevice_shouldNotSetSummary() {
|
||||
UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[0]);
|
||||
verify(mTextView, never()).setText(anyInt());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSummary_supplyPower_shouldSetSummary() {
|
||||
UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[1]);
|
||||
verify(mTextView).setText(R.string.usb_use_power_only_desc);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSummary_transferFiles_shouldNotSetSummary() {
|
||||
UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[2]);
|
||||
verify(mTextView, never()).setText(anyInt());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSummary_transferPhoto_shouldNotSetSummary() {
|
||||
UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[3]);
|
||||
verify(mTextView, never()).setText(anyInt());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateSummary_MIDI_shouldNotSetSummary() {
|
||||
UsbModeChooserActivity.updateSummary(mTextView, UsbModeChooserActivity.DEFAULT_MODES[4]);
|
||||
verify(mTextView, never()).setText(anyInt());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getTitle_shouldReturnCorrectTitle() {
|
||||
assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[0]))
|
||||
.isEqualTo(R.string.usb_use_charging_only);
|
||||
|
||||
assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[1]))
|
||||
.isEqualTo(R.string.usb_use_power_only);
|
||||
|
||||
assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[2]))
|
||||
.isEqualTo(R.string.usb_use_file_transfers);
|
||||
|
||||
assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[3]))
|
||||
.isEqualTo(R.string.usb_use_photo_transfers);
|
||||
|
||||
assertThat(UsbModeChooserActivity.getTitle(UsbModeChooserActivity.DEFAULT_MODES[4]))
|
||||
.isEqualTo(R.string.usb_use_MIDI);
|
||||
}
|
||||
|
||||
}
|
@@ -1,105 +0,0 @@
|
||||
package com.android.settings.connecteddevice.usb;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
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.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class UsbModePreferenceControllerTest {
|
||||
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private UsbBackend mUsbBackend;
|
||||
@Mock
|
||||
private UsbConnectionBroadcastReceiver mUsbConnectionBroadcastReceiver;
|
||||
|
||||
private Context mContext;
|
||||
private UsbModePreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ShadowApplication.getInstance().getApplicationContext();
|
||||
mController = new UsbModePreferenceController(mContext, mUsbBackend, null /* lifecycle */);
|
||||
mController.mUsbReceiver = mUsbConnectionBroadcastReceiver;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_chargeDevice() {
|
||||
assertThat(mController.getSummary(0))
|
||||
.isEqualTo(R.string.usb_summary_charging_only);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_supplyPower() {
|
||||
assertThat(mController.getSummary(UsbBackend.MODE_POWER_SOURCE))
|
||||
.isEqualTo(R.string.usb_summary_power_only);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_TransferFiles() {
|
||||
assertThat(mController.getSummary(UsbBackend.MODE_DATA_MTP))
|
||||
.isEqualTo(R.string.usb_summary_file_transfers);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_TransferPhoto() {
|
||||
assertThat(mController.getSummary(UsbBackend.MODE_DATA_PTP))
|
||||
.isEqualTo(R.string.usb_summary_photo_transfers);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_MIDI() {
|
||||
assertThat(mController.getSummary(UsbBackend.MODE_DATA_MIDI))
|
||||
.isEqualTo(R.string.usb_summary_MIDI);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSummary_Tethering() {
|
||||
assertThat(mController.getSummary(UsbBackend.MODE_DATA_TETHER))
|
||||
.isEqualTo(R.string.usb_summary_tether);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPreferenceSummary_usbDisconnected() {
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey("usb_mode");
|
||||
preference.setEnabled(true);
|
||||
when(mUsbBackend.getCurrentMode()).thenReturn(UsbBackend.MODE_POWER_SINK);
|
||||
when(mUsbConnectionBroadcastReceiver.isConnected()).thenReturn(false);
|
||||
mController.updateState(preference);
|
||||
|
||||
assertThat(preference.getKey()).isEqualTo("usb_mode");
|
||||
assertThat(preference.getSummary()).isEqualTo(
|
||||
mContext.getString(R.string.disconnected));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUsbBroadcastReceiver_usbConnected_shouldUpdateSummary() {
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey("usb_mode");
|
||||
preference.setEnabled(true);
|
||||
when(mUsbBackend.getCurrentMode()).thenReturn(UsbBackend.MODE_POWER_SINK);
|
||||
when(mUsbConnectionBroadcastReceiver.isConnected()).thenReturn(true);
|
||||
mController.updateState(preference);
|
||||
|
||||
assertThat(preference.getSummary()).isEqualTo(
|
||||
mContext.getString(R.string.usb_summary_charging_only));
|
||||
}
|
||||
|
||||
}
|
@@ -1,244 +0,0 @@
|
||||
/*
|
||||
* 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.development;
|
||||
|
||||
import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE;
|
||||
import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static junit.framework.Assert.assertFalse;
|
||||
import static junit.framework.Assert.assertTrue;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyBoolean;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
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.arch.lifecycle.LifecycleOwner;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.hardware.usb.UsbManager;
|
||||
import android.hardware.usb.UsbManagerExtras;
|
||||
import android.support.v7.preference.ListPreference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.wrapper.UsbManagerWrapper;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH,
|
||||
sdk = TestConfig.SDK_VERSION,
|
||||
shadows = {ShadowUtils.class})
|
||||
public class SelectUsbConfigPreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
private ListPreference mPreference;
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock
|
||||
private UsbManager mUsbManager;
|
||||
@Mock
|
||||
private PackageManager mPackageManager;
|
||||
@Mock
|
||||
private UsbManagerWrapper mUsbManagerWrapper;
|
||||
|
||||
private Context mContext;
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private SelectUsbConfigPreferenceController mController;
|
||||
|
||||
/**
|
||||
* Array Values Key
|
||||
*
|
||||
* 0: Charging
|
||||
* 1: MTP
|
||||
* 2: PTP
|
||||
* 3: RNDIS
|
||||
* 4: Audio Source
|
||||
* 5: MIDI
|
||||
*/
|
||||
private String[] mValues;
|
||||
private String[] mSummaries;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
doReturn(mUsbManager).when(mContext).getSystemService(Context.USB_SERVICE);
|
||||
doReturn(mPackageManager).when(mContext).getPackageManager();
|
||||
mValues = mContext.getResources().getStringArray(R.array.usb_configuration_values);
|
||||
mSummaries = mContext.getResources().getStringArray(R.array.usb_configuration_titles);
|
||||
mController = spy(new SelectUsbConfigPreferenceController(mContext, mLifecycle));
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
mController.displayPreference(mScreen);
|
||||
mController.mUsbManagerWrapper = mUsbManagerWrapper;
|
||||
|
||||
when(mUsbManagerWrapper.usbFunctionsFromString("mtp")).thenReturn(UsbManagerExtras.MTP);
|
||||
when(mUsbManagerWrapper.usbFunctionsFromString("rndis"))
|
||||
.thenReturn(UsbManagerExtras.RNDIS);
|
||||
when(mUsbManagerWrapper.usbFunctionsFromString("none"))
|
||||
.thenReturn(UsbManagerExtras.NONE);
|
||||
|
||||
}
|
||||
|
||||
@After
|
||||
public void teardown() {
|
||||
ShadowUtils.reset();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_setCharging_shouldEnableCharging() {
|
||||
when(mUsbManagerWrapper.getCurrentFunctions()).thenReturn(
|
||||
UsbManagerExtras.usbFunctionsFromString(mValues[0]));
|
||||
doNothing().when(mController).setCurrentFunctions(anyLong());
|
||||
mController.onPreferenceChange(mPreference, mValues[0]);
|
||||
|
||||
verify(mController).setCurrentFunctions(
|
||||
UsbManagerExtras.usbFunctionsFromString(mValues[0]));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onUsbAccessoryAndHostDisabled_shouldNotBeAvailable() {
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)).thenReturn(false);
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)).thenReturn(
|
||||
false);
|
||||
assertFalse(mController.isAvailable());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onUsbHostEnabled_shouldBeAvailable() {
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)).thenReturn(true);
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)).thenReturn(
|
||||
false);
|
||||
assertTrue(mController.isAvailable());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onUsbAccessoryEnabled_shouldBeAvailable() {
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)).thenReturn(false);
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)).thenReturn(
|
||||
true);
|
||||
assertTrue(mController.isAvailable());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_setMtp_shouldEnableMtp() {
|
||||
when(mUsbManagerWrapper.getCurrentFunctions())
|
||||
.thenReturn(UsbManagerExtras.usbFunctionsFromString(mValues[1]));
|
||||
doNothing().when(mController).setCurrentFunctions(anyLong());
|
||||
mController.onPreferenceChange(mPreference, mValues[1]);
|
||||
|
||||
verify(mController).setCurrentFunctions(
|
||||
UsbManagerExtras.usbFunctionsFromString(mValues[1]));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_monkeyUser_shouldReturnFalse() {
|
||||
when(mUsbManagerWrapper.getCurrentFunctions())
|
||||
.thenReturn(UsbManagerExtras.usbFunctionsFromString(mValues[1]));
|
||||
ShadowUtils.setIsUserAMonkey(true);
|
||||
doNothing().when(mController).setCurrentFunctions(anyLong());
|
||||
|
||||
final boolean isHandled = mController.onPreferenceChange(mPreference, mValues[1]);
|
||||
|
||||
assertThat(isHandled).isFalse();
|
||||
verify(mController, never()).setCurrentFunctions(anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_chargingEnabled_shouldSetPreferenceToCharging() {
|
||||
when(mUsbManagerWrapper.getCurrentFunctions())
|
||||
.thenReturn(UsbManagerExtras.usbFunctionsFromString(mValues[0]));
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
verify(mPreference).setValue(mValues[0]);
|
||||
verify(mPreference).setSummary(mSummaries[0]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_RndisEnabled_shouldEnableRndis() {
|
||||
when(mUsbManagerWrapper.getCurrentFunctions())
|
||||
.thenReturn(UsbManagerExtras.usbFunctionsFromString(mValues[3]));
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
verify(mPreference).setValue(mValues[3]);
|
||||
verify(mPreference).setSummary(mSummaries[3]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_noValueSet_shouldEnableChargingAsDefault() {
|
||||
when(mUsbManagerWrapper.getCurrentFunctions()).thenReturn(UsbManagerExtras.NONE);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
verify(mPreference).setValue(mValues[0]);
|
||||
verify(mPreference).setSummary(mSummaries[0]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
|
||||
mController.onDeveloperOptionsSwitchDisabled();
|
||||
|
||||
verify(mPreference).setEnabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
|
||||
mController.onDeveloperOptionsSwitchEnabled();
|
||||
|
||||
verify(mPreference).setEnabled(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCreate_shouldRegisterReceiver() {
|
||||
mLifecycle.onCreate(null /* bundle */);
|
||||
mLifecycle.handleLifecycleEvent(ON_CREATE);
|
||||
|
||||
verify(mContext).registerReceiver(any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onDestroy_shouldUnregisterReceiver() {
|
||||
doNothing().when(mContext).unregisterReceiver(any());
|
||||
mLifecycle.handleLifecycleEvent(ON_CREATE);
|
||||
mLifecycle.handleLifecycleEvent(ON_DESTROY);
|
||||
|
||||
verify(mContext).unregisterReceiver(any());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user