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

Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467

Change-Id: I615a740f9141e2c16a8e4a9c674a52e1e55b0e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-10 10:45:37 +00:00
committed by Automerger Merge Worker
parent 5998074b89 bb5bb304aa
commit fc2d8c650f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/src/com/android/settings/connecteddevice/threadnetwork/FakeThreadNetworkController.kt
View File

@@ -22,7 +22,7 @@ import java.util.concurrent.Executor
/** A fake implementation of [BaseThreadNetworkController] for unit tests. */ /** A fake implementation of [BaseThreadNetworkController] for unit tests. */
class FakeThreadNetworkController : BaseThreadNetworkController { class FakeThreadNetworkController : BaseThreadNetworkController {
var isEnabled = true var isEnabled = false
private set private set
var registeredStateCallback: ThreadNetworkController.StateCallback? = null var registeredStateCallback: ThreadNetworkController.StateCallback? = null
private set private set

3
tests/unit/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkToggleControllerTest.kt
View File

@@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.threadnetwork
import android.content.Context import android.content.Context
import android.platform.test.flag.junit.SetFlagsRule import android.platform.test.flag.junit.SetFlagsRule
import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
@@ -51,7 +50,7 @@ class ThreadNetworkToggleControllerTest {
fun setUp() { fun setUp() {
mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED) mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)
context = spy(ApplicationProvider.getApplicationContext<Context>()) context = spy(ApplicationProvider.getApplicationContext<Context>())
executor = ContextCompat.getMainExecutor(context) executor = Executor { runnable: Runnable -> runnable.run() }
fakeThreadNetworkController = FakeThreadNetworkController() fakeThreadNetworkController = FakeThreadNetworkController()
controller = newControllerWithThreadFeatureSupported(true) controller = newControllerWithThreadFeatureSupported(true)
val preferenceManager = PreferenceManager(context) val preferenceManager = PreferenceManager(context)