Merge "[Thread] fix Thread unit test failures" into main
This commit is contained in:
@@ -22,7 +22,7 @@ import java.util.concurrent.Executor
|
||||
|
||||
/** 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
|
||||
|
||||
@@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.threadnetwork
|
||||
|
||||
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 @@ class ThreadNetworkToggleControllerTest {
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user