Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb5bb304 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[Thread] fix Thread unit test failures" into main

parents 51fe6894 257e1645

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -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)