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

Commit e8ba2c1b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar] Update wifi repository tests to use robolectric." into... 

Merge "[Status Bar] Update wifi repository tests to use robolectric." into udc-qpr-dev am: 7fa85ab7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24130948



Change-Id: I3fa05a84666c1c407ccd07db6e0e49502257141a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40f73885 7fa85ab7

packages/SystemUI/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -227,6 +227,17 @@ filegroup { 
    path: "tests/utils/src",

}



filegroup {

    name: "SystemUI-test-fakes",

    srcs: [

        /* Status bar fakes */

        "tests/src/com/android/systemui/statusbar/pipeline/airplane/data/repository/FakeAirplaneModeRepository.kt",

        "tests/src/com/android/systemui/statusbar/pipeline/shared/data/repository/FakeConnectivityRepository.kt",

        "tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/FakeWifiRepository.kt",

    ],

    path: "tests/src",

}



filegroup {

    name: "SystemUI-tests-robolectric-pilots",

    srcs: [
@@ -291,6 +302,11 @@ filegroup { 
        "tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt",

        "tests/src/com/android/systemui/biometrics/UdfpsShellTest.kt",

        "tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt",



        /* Status bar wifi converted tests */

        "tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcherTest.kt",

        "tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepositoryTest.kt",

        "tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt",

    ],

    path: "tests/src",

}
@@ -449,6 +465,7 @@ android_robolectric_test { 
        "tests/robolectric/src/**/*.kt",

        "tests/robolectric/src/**/*.java",

        ":SystemUI-tests-utils",

        ":SystemUI-test-fakes",

        ":SystemUI-tests-robolectric-pilots",

    ],

    static_libs: [

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcherTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository 


import android.net.ConnectivityManager

import android.net.wifi.WifiManager

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.demomode.DemoMode

import com.android.systemui.demomode.DemoModeController
@@ -43,6 +45,7 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher 
import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito

import org.mockito.MockitoAnnotations
@@ -50,6 +53,8 @@ import org.mockito.MockitoAnnotations 
@OptIn(ExperimentalCoroutinesApi::class)

@Suppress("EXPERIMENTAL_IS_NOT_ENABLED")

@SmallTest

@RoboPilotTest

@RunWith(AndroidJUnit4::class)

class WifiRepositorySwitcherTest : SysuiTestCase() {

    private lateinit var underTest: WifiRepositorySwitcher

    private lateinit var realImpl: WifiRepositoryImpl

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepositoryTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -16,15 +16,20 @@ 


package com.android.systemui.statusbar.pipeline.wifi.data.repository.prod



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel

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

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@SmallTest

@RoboPilotTest

@RunWith(AndroidJUnit4::class)

class DisabledWifiRepositoryTest : SysuiTestCase() {



    private lateinit var underTest: DisabledWifiRepository

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ import android.net.wifi.WifiManager 
import android.net.wifi.WifiManager.TrafficStateCallback

import android.net.wifi.WifiManager.UNKNOWN_SSID

import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

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

import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlots
@@ -57,6 +59,7 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher 
import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when` as whenever
@@ -65,6 +68,8 @@ import org.mockito.MockitoAnnotations 
@Suppress("EXPERIMENTAL_IS_NOT_ENABLED")

@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RoboPilotTest

@RunWith(AndroidJUnit4::class)

class WifiRepositoryImplTest : SysuiTestCase() {



    private lateinit var underTest: WifiRepositoryImpl