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

Commit ab478e98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "caitlinshk-tablelogbuffer-unusedargs" into main 

* changes:
  Use Kosmos.fakeMobileConnectionsRepository in most tests.
  Add helpers for TableLogBuffer + TableLogBufferFactory for tests.
  Remove unused arguments from TableLogBuffer.
parents d83e7848 5beb97d8

packages/SystemUI/multivalentTests/src/com/android/systemui/authentication/data/repository/AuthenticationRepositoryTest.kt

+2 −7
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ import com.android.systemui.coroutines.collectLastValue 
import com.android.systemui.coroutines.collectValues

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.kosmos.testScope

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository

import com.android.systemui.testKosmos

import com.android.systemui.user.data.repository.FakeUserRepository

import com.android.systemui.util.mockito.whenever
@@ -58,14 +56,13 @@ class AuthenticationRepositoryTest : SysuiTestCase() { 


    @Mock private lateinit var lockPatternUtils: LockPatternUtils

    @Mock private lateinit var getSecurityMode: Function<Int, KeyguardSecurityModel.SecurityMode>

    @Mock private lateinit var tableLogger: TableLogBuffer

    @Mock private lateinit var devicePolicyManager: DevicePolicyManager



    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val clock = FakeSystemClock()

    private val userRepository = FakeUserRepository()

    private lateinit var mobileConnectionsRepository: FakeMobileConnectionsRepository

    private val mobileConnectionsRepository = kosmos.fakeMobileConnectionsRepository



    private lateinit var underTest: AuthenticationRepository
@@ -78,8 +75,6 @@ class AuthenticationRepositoryTest : SysuiTestCase() { 
        userRepository.setUserInfos(USER_INFOS)

        runBlocking { userRepository.setSelectedUserInfo(USER_INFOS[0]) }

        whenever(getSecurityMode.apply(anyInt())).thenAnswer { currentSecurityMode }

        mobileConnectionsRepository =

            FakeMobileConnectionsRepository(FakeMobileMappingsProxy(), tableLogger)



        underTest =

            AuthenticationRepositoryImpl(

packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

+3 −21
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.log.FaceAuthenticationLogger

import com.android.systemui.log.SessionTracker

import com.android.systemui.log.logcatLogBuffer

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.log.table.logcatTableLogBuffer

import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAsleepForTest

import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAwakeForTest

import com.android.systemui.power.domain.interactor.powerInteractor
@@ -90,7 +90,6 @@ import com.android.systemui.util.mockito.KotlinArgumentCaptor 
import com.android.systemui.util.mockito.captureMany

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.android.systemui.util.time.FakeSystemClock

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

import java.io.PrintWriter

import java.io.StringWriter
@@ -199,25 +198,8 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 
        fmOverride: FaceManager? = faceManager,

        bypassControllerOverride: KeyguardBypassController? = bypassController

    ): DeviceEntryFaceAuthRepositoryImpl {

        val systemClock = FakeSystemClock()

        val faceAuthBuffer =

            TableLogBuffer(

                10,

                "face auth",

                systemClock,

                mock(),

                testDispatcher,

                testScope.backgroundScope

            )

        val faceDetectBuffer =

            TableLogBuffer(

                10,

                "face detect",

                systemClock,

                mock(),

                testDispatcher,

                testScope.backgroundScope

            )

        val faceAuthBuffer = logcatTableLogBuffer(kosmos, "face auth")

        val faceDetectBuffer = logcatTableLogBuffer(kosmos, "face detect")



        return DeviceEntryFaceAuthRepositoryImpl(

            mContext,

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepositoryTest.kt

+5 −7
Original line number Diff line number Diff line
@@ -46,11 +46,10 @@ import com.android.systemui.keyguard.data.repository.BiometricType.REAR_FINGERPR 
import com.android.systemui.keyguard.data.repository.BiometricType.SIDE_FINGERPRINT

import com.android.systemui.keyguard.data.repository.BiometricType.UNDER_DISPLAY_FINGERPRINT

import com.android.systemui.keyguard.shared.model.DevicePosture

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.res.R

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository

import com.android.systemui.statusbar.policy.DevicePostureController

import com.android.systemui.testKosmos

import com.android.systemui.user.data.repository.FakeUserRepository

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.whenever
@@ -81,6 +80,8 @@ import org.mockito.MockitoAnnotations 
@TestableLooper.RunWithLooper(setAsMainLooper = true)

@RunWith(AndroidJUnit4::class)

class BiometricSettingsRepositoryTest : SysuiTestCase() {

    private val kosmos = testKosmos()



    private lateinit var underTest: BiometricSettingsRepository



    @Mock private lateinit var authController: AuthController
@@ -88,7 +89,6 @@ class BiometricSettingsRepositoryTest : SysuiTestCase() { 
    @Mock private lateinit var devicePolicyManager: DevicePolicyManager

    @Mock private lateinit var dumpManager: DumpManager

    @Mock private lateinit var biometricManager: BiometricManager

    @Mock private lateinit var tableLogger: TableLogBuffer

    @Captor

    private lateinit var strongAuthTracker: ArgumentCaptor<LockPatternUtils.StrongAuthTracker>

    @Captor private lateinit var authControllerCallback: ArgumentCaptor<AuthController.Callback>
@@ -99,7 +99,7 @@ class BiometricSettingsRepositoryTest : SysuiTestCase() { 
    private lateinit var devicePostureRepository: FakeDevicePostureRepository

    private lateinit var facePropertyRepository: FakeFacePropertyRepository

    private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository

    private lateinit var mobileConnectionsRepository: FakeMobileConnectionsRepository

    private val mobileConnectionsRepository = kosmos.fakeMobileConnectionsRepository



    private lateinit var testDispatcher: TestDispatcher

    private lateinit var testScope: TestScope
@@ -115,8 +115,6 @@ class BiometricSettingsRepositoryTest : SysuiTestCase() { 
        devicePostureRepository = FakeDevicePostureRepository()

        facePropertyRepository = FakeFacePropertyRepository()

        fingerprintPropertyRepository = FakeFingerprintPropertyRepository()

        mobileConnectionsRepository =

            FakeMobileConnectionsRepository(FakeMobileMappingsProxy(), tableLogger)

    }



    private suspend fun createBiometricSettingsRepository() {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/airplane/domain/interactor/AirplaneModeTileUserActionInteractorTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx.longClic 
import com.android.systemui.qs.tiles.impl.airplane.domain.model.AirplaneModeTileModel

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.testKosmos

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

import kotlinx.coroutines.test.runTest

import org.junit.Test
@@ -40,8 +41,9 @@ import org.junit.runner.RunWith 
@EnabledOnRavenwood

@RunWith(AndroidJUnit4::class)

class AirplaneModeTileUserActionInteractorTest : SysuiTestCase() {

    private val kosmos = testKosmos()



    private val mobileConnectionsRepository = FakeMobileConnectionsRepository()

    private val mobileConnectionsRepository = kosmos.fakeMobileConnectionsRepository

    private val connectivityRepository = FakeConnectivityRepository()

    private val airplaneModeRepository = FakeAirplaneModeRepository()

    private val inputHandler = FakeQSTileIntentUserInputHandler()

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/internet/domain/interactor/InternetTileDataInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.systemui.flags.FakeFeatureFlagsClassic 
import com.android.systemui.flags.Flags

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.testScope

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.log.table.logcatTableLogBuffer

import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger

import com.android.systemui.qs.tiles.impl.internet.domain.model.InternetTileModel

import com.android.systemui.res.R
@@ -86,7 +86,7 @@ class InternetTileDataInteractorTest : SysuiTestCase() { 
    private val wifiInteractor =

        WifiInteractorImpl(connectivityRepository, wifiRepository, testScope.backgroundScope)



    private val tableLogBuffer: TableLogBuffer = mock()

    private val tableLogBuffer = logcatTableLogBuffer(kosmos, "InternetTileDataInteractorTest")

    private val carrierConfigTracker: CarrierConfigTracker = mock()



    private val mobileConnectionsRepository =