Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev

This commit is contained in:
TreeHugger Robot
2023-04-13 02:16:15 +00:00
committed by Android (Google) Code Review
3 changed files with 9 additions and 34 deletions

View File

@@ -25,7 +25,6 @@ import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import org.junit.Before;
@@ -42,7 +41,6 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
public final class IncompatibleChargerDetectorTest {
@Mock private BatteryInfo mBatteryInfo;
@Mock private UsbPort mUsbPort;
@Mock private UsbManager mUsbManager;
@Mock private UsbPortStatus mUsbPortStatus;
@@ -55,14 +53,11 @@ public final class IncompatibleChargerDetectorTest {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
mIncompatibleChargerDetector =
new IncompatibleChargerDetector(mContext, mBatteryInfo);
mIncompatibleChargerDetector = new IncompatibleChargerDetector(mContext);
}
@Test
public void detect_unplugDevice_shouldNotShowTip() {
mBatteryInfo.pluggedStatus = 0;
public void detect_withoutIncompatibleCharger_shouldNotShowTip() {
BatteryTip batteryTip = mIncompatibleChargerDetector.detect();
assertThat(batteryTip.isVisible()).isFalse();
@@ -70,18 +65,7 @@ public final class IncompatibleChargerDetectorTest {
}
@Test
public void detect_plugDeviceWithoutIncompatibleCharger_shouldNotShowTip() {
mBatteryInfo.pluggedStatus = 1;
BatteryTip batteryTip = mIncompatibleChargerDetector.detect();
assertThat(batteryTip.isVisible()).isFalse();
assertThat(batteryTip.getState()).isEqualTo(BatteryTip.StateType.INVISIBLE);
}
@Test
public void detect_plugDeviceWithIncompatibleCharger_showTip() {
mBatteryInfo.pluggedStatus = 1;
public void detect_withIncompatibleCharger_showTip() {
setupIncompatibleCharging();
BatteryTip batteryTip = mIncompatibleChargerDetector.detect();