| commit | bb5bb304aa357314ded5dba71ad4c9b2c623fa74 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 10 10:18:40 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri May 10 10:18:40 2024 +0000 |
| tree | 7a4bcee7b24399c74506a75ea1cfd1120ee3a264 | |
| parent | 51fe6894f95b02000c398902a714d0869b32cd48 [diff] | |
| parent | 257e1645622710a911243bc6872deacf350a9ca4 [diff] |
Merge "[Thread] fix Thread unit test failures" into main
diff --git a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/FakeThreadNetworkController.kt b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/FakeThreadNetworkController.kt index 8cb717d..e30226e 100644 --- a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/FakeThreadNetworkController.kt +++ b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/FakeThreadNetworkController.kt
@@ -22,7 +22,7 @@ /** A fake implementation of [BaseThreadNetworkController] for unit tests. */ class FakeThreadNetworkController : BaseThreadNetworkController { - var isEnabled = true + var isEnabled = false private set var registeredStateCallback: ThreadNetworkController.StateCallback? = null private set
diff --git a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt index 329e741..04ebc92 100644 --- a/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt +++ b/tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt
@@ -17,7 +17,6 @@ import android.content.Context import android.platform.test.flag.junit.SetFlagsRule -import androidx.core.content.ContextCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.preference.PreferenceManager @@ -51,7 +50,7 @@ fun setUp() { mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED) context = spy(ApplicationProvider.getApplicationContext<Context>()) - executor = ContextCompat.getMainExecutor(context) + executor = Executor { runnable: Runnable -> runnable.run() } fakeThreadNetworkController = FakeThreadNetworkController() controller = newControllerWithThreadFeatureSupported(true) val preferenceManager = PreferenceManager(context)