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

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

Merge "[Thread] fix flaky Thread settings tests" into main

parents e5508966 253be810

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

+2 −2
Original line number Diff line number Diff line
@@ -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.test.core.app.ApplicationProvider
@@ -27,6 +26,7 @@ import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILA 
import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE

import com.android.settings.flags.Flags

import com.google.common.truth.Truth.assertThat

import com.google.common.util.concurrent.MoreExecutors

import org.junit.Before

import org.junit.Rule

import org.junit.Test
@@ -49,7 +49,7 @@ class ThreadNetworkFragmentControllerTest { 
    fun setUp() {

        mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)

        context = spy(ApplicationProvider.getApplicationContext<Context>())

        executor = ContextCompat.getMainExecutor(context)

        executor = MoreExecutors.directExecutor()

        fakeThreadNetworkController = FakeThreadNetworkController()

        controller = newControllerWithThreadFeatureSupported(true)

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILA 
import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE

import com.android.settings.flags.Flags

import com.google.common.truth.Truth.assertThat

import com.google.common.util.concurrent.MoreExecutors

import org.junit.Before

import org.junit.Rule

import org.junit.Test
@@ -50,7 +51,7 @@ class ThreadNetworkToggleControllerTest { 
    fun setUp() {

        mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)

        context = spy(ApplicationProvider.getApplicationContext<Context>())

        executor =  Executor { runnable: Runnable -> runnable.run() }

        executor = MoreExecutors.directExecutor()

        fakeThreadNetworkController = FakeThreadNetworkController()

        controller = newControllerWithThreadFeatureSupported(true)

        val preferenceManager = PreferenceManager(context)