PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CD updater: add missing call in tests" into main

Browse Source
This commit is contained in:
Matthew DeVore
2025-02-27 06:51:54 -08:00
committed by Android (Google) Code Review
parent 878fdc6fcd 6a4ac9cdbf
commit b2252c9f74
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
View File

@@ -35,7 +35,6 @@ import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.hardware.input.InputManager; import android.hardware.input.InputManager;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule; import android.platform.test.flag.junit.SetFlagsRule;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
import android.view.InputDevice; import android.view.InputDevice;
@@ -54,7 +53,6 @@ import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater; import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.FakeFeatureFlagsImpl; import com.android.settings.flags.FakeFeatureFlagsImpl;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -213,6 +211,7 @@ public class ConnectedDeviceGroupControllerTest {
mConnectedDeviceGroupController.onStart(); mConnectedDeviceGroupController.onStart();
verify(mExternalDisplayUpdater).registerCallback(); verify(mExternalDisplayUpdater).registerCallback();
verify(mExternalDisplayUpdater).refreshPreference();
verify(mConnectedBluetoothDeviceUpdater).registerCallback(); verify(mConnectedBluetoothDeviceUpdater).registerCallback();
verify(mConnectedUsbDeviceUpdater).registerCallback(); verify(mConnectedUsbDeviceUpdater).registerCallback();
verify(mConnectedDockUpdater).registerCallback(); verify(mConnectedDockUpdater).registerCallback();

2
tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java
View File

@@ -63,6 +63,7 @@ public class ExternalDisplayUpdaterTest extends ExternalDisplayTestBase {
return null; return null;
}).when(mMockedCallback).onDeviceAdded(any()); }).when(mMockedCallback).onDeviceAdded(any());
mUpdater.initPreference(mContext, mMockedInjector); mUpdater.initPreference(mContext, mMockedInjector);
mUpdater.refreshPreference();
mUpdater.registerCallback(); mUpdater.registerCallback();
mHandler.flush(); mHandler.flush();
assertThat(mPreferenceAdded).isNotNull(); assertThat(mPreferenceAdded).isNotNull();
@@ -85,6 +86,7 @@ public class ExternalDisplayUpdaterTest extends ExternalDisplayTestBase {
return null; return null;
}).when(mMockedCallback).onDeviceRemoved(any()); }).when(mMockedCallback).onDeviceRemoved(any());
mUpdater.initPreference(mContext, mMockedInjector); mUpdater.initPreference(mContext, mMockedInjector);
mUpdater.refreshPreference();
mUpdater.registerCallback(); mUpdater.registerCallback();
mHandler.flush(); mHandler.flush();
assertThat(mPreferenceAdded).isNotNull(); assertThat(mPreferenceAdded).isNotNull();