Skip to content

Improve perf of current network tests #1084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breedx-splk merged 1 commit into from
Jul 25, 2025
Merged

Improve perf of current network tests #1084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions ...est/java/io/opentelemetry/android/internal/services/network/CurrentNetworkProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
import android.net.NetworkRequest
import android.os.Build
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.mockk.every
import io.mockk.mockk
import io.mockk.slot
Expand All @@ -21,15 +22,11 @@ import io.opentelemetry.android.internal.services.network.detector.NetworkDetect
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import java.util.concurrent.atomic.AtomicInteger

@RunWith(RobolectricTestRunner::class)
@Config(
maxSdk = Build.VERSION_CODES.S,
)
@RunWith(AndroidJUnit4::class)
@Config(sdk = [Build.VERSION_CODES.N, Build.VERSION_CODES.P, Build.VERSION_CODES.Q, Build.VERSION_CODES.UPSIDE_DOWN_CAKE])
internal class CurrentNetworkProviderTest {
private val fakeNet: Network = mockk()
private val wifi = CurrentNetwork.builder(NetworkState.TRANSPORT_WIFI).build()
Expand All @@ -39,10 +36,15 @@ internal class CurrentNetworkProviderTest {
.subType("LTE")
.build()
private val noNetwork = CurrentNetwork.builder(NetworkState.NO_NETWORK_AVAILABLE).build()
private val mockConnectivityManager = mockk<ConnectivityManager>()

@fractalwrench fractalwrench Jul 24, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reasonably sure this mock is taking a long time to construct, but I'll investigate that in a separate changeset later this week.

private val errorNetworkDetector: NetworkDetector =
mockk<NetworkDetector>().apply {
every { detectCurrentNetwork() }.throws(SecurityException("bug"))
}

@Test
@Config(maxSdk = Build.VERSION_CODES.LOLLIPOP)
fun lollipop() {
@Config(sdk = [Build.VERSION_CODES.LOLLIPOP])
fun `verify current network provider on lollipop`() {
val networkRequest: NetworkRequest = mockk()
val networkDetector: NetworkDetector = mockk()
val connectivityManager: ConnectivityManager = mockk()
Expand Down Expand Up @@ -82,8 +84,7 @@ internal class CurrentNetworkProviderTest {
}

@Test
@Config(maxSdk = Build.VERSION_CODES.S, minSdk = Build.VERSION_CODES.O)
fun `modern SDKs`() {
fun `verify current network provider`() {
val networkRequest: NetworkRequest = mockk()
val networkDetector: NetworkDetector = mockk()
val connectivityManager: ConnectivityManager = mockk()
Expand Down Expand Up @@ -124,16 +125,11 @@ internal class CurrentNetworkProviderTest {

@Test
fun `network detector exception`() {
val networkDetector: NetworkDetector = mockk()
every { networkDetector.detectCurrentNetwork() }.throws(SecurityException("bug"))

val currentNetworkProvider =
CurrentNetworkProvider(networkDetector, Mockito.mock())
val currentNetworkProvider = CurrentNetworkProvider(errorNetworkDetector, mockConnectivityManager)
assertThat(currentNetworkProvider.refreshNetworkStatus()).isEqualTo(UNKNOWN_NETWORK)
}

@Test
@Config(maxSdk = Build.VERSION_CODES.S, minSdk = Build.VERSION_CODES.O)
fun `network detector exception on callback registration`() {
val networkDetector: NetworkDetector = mockk()
val connectivityManager: ConnectivityManager = mockk()
Expand All @@ -152,7 +148,7 @@ internal class CurrentNetworkProviderTest {
}

@Test
@Config(maxSdk = Build.VERSION_CODES.LOLLIPOP)
@Config(sdk = [Build.VERSION_CODES.LOLLIPOP])
fun `network detector exception on callback registration lollipop`() {
val networkDetector: NetworkDetector = mockk()
val connectivityManager: ConnectivityManager = mockk()
Expand All @@ -172,7 +168,7 @@ internal class CurrentNetworkProviderTest {
}

@Test
@Config(maxSdk = Build.VERSION_CODES.LOLLIPOP)
@Config(sdk = [Build.VERSION_CODES.LOLLIPOP])
fun `should not fail on immediate ConnectionManager call lollipop`() {
val networkDetector: NetworkDetector = mockk()
val connectivityManager: ConnectivityManager = mockk()
Expand All @@ -196,7 +192,6 @@ internal class CurrentNetworkProviderTest {
}

@Test
@Config(maxSdk = Build.VERSION_CODES.S, minSdk = Build.VERSION_CODES.O)
fun `should not fail on immediate ConnectionManager call`() {
val networkDetector: NetworkDetector = mockk()
val connectivityManager: ConnectivityManager = mockk()
Expand Down