From 1fbf413837cc56fdb5e7d574f05c0285c58442c8 Mon Sep 17 00:00:00 2001 From: bidetofevil Date: Thu, 24 Jul 2025 07:18:57 -0700 Subject: [PATCH] Replace old Roboletric runner with the recommend AndroidJUnit4 one --- .../CurrentNetworkAttributesExtractorTest.java | 4 ++-- .../compose/click/ComposeClickActivityCallbackTest.kt | 4 ++-- .../compose/click/ComposeClickEventGeneratorTest.kt | 4 ++-- .../compose/click/ComposeInstrumentationTest.kt | 4 ++-- .../compose/click/ComposeTapTargetDetectorTest.kt | 4 ++-- .../network/NetworkChangeInstrumentationTest.kt | 4 ++-- .../instrumentation/slowrendering/SlowRenderListenerTest.java | 4 ++-- .../view/click/ViewClickInstrumentationTest.kt | 4 ++-- .../instrumentation/volley/TracingHurlStackExceptionTest.java | 4 ++-- .../android/instrumentation/volley/TracingHurlStackTest.java | 4 ++-- .../volley/VolleyHttpClientAttributesGetterTest.java | 4 ++-- .../opentelemetry/android/internal/services/ServicesTest.kt | 4 ++-- .../services/network/detector/NetworkDetectorTest.java | 4 ++-- .../network/detector/PostApi28NetworkDetectorTest.java | 4 ++-- .../services/network/detector/SimpleNetworkDetectorTest.java | 4 ++-- .../internal/services/periodicwork/PeriodicRunnableTest.kt | 4 ++-- .../internal/services/periodicwork/PeriodicWorkTest.kt | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/common/src/test/java/io/opentelemetry/android/common/internal/features/networkattributes/CurrentNetworkAttributesExtractorTest.java b/common/src/test/java/io/opentelemetry/android/common/internal/features/networkattributes/CurrentNetworkAttributesExtractorTest.java index a191f0041..97c63d315 100644 --- a/common/src/test/java/io/opentelemetry/android/common/internal/features/networkattributes/CurrentNetworkAttributesExtractorTest.java +++ b/common/src/test/java/io/opentelemetry/android/common/internal/features/networkattributes/CurrentNetworkAttributesExtractorTest.java @@ -14,16 +14,16 @@ import static org.assertj.core.api.Assertions.entry; import android.os.Build; +import androidx.test.ext.junit.runners.AndroidJUnit4; import io.opentelemetry.android.common.internal.features.networkattributes.data.Carrier; import io.opentelemetry.android.common.internal.features.networkattributes.data.CurrentNetwork; import io.opentelemetry.android.common.internal.features.networkattributes.data.NetworkState; import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class CurrentNetworkAttributesExtractorTest { final CurrentNetworkAttributesExtractor underTest = new CurrentNetworkAttributesExtractor(); diff --git a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickActivityCallbackTest.kt b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickActivityCallbackTest.kt index aed008430..27dc74bd4 100644 --- a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickActivityCallbackTest.kt +++ b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickActivityCallbackTest.kt @@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.compose.click import android.app.Activity import android.view.Window +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -14,9 +15,8 @@ import io.mockk.verify import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) internal class ComposeClickActivityCallbackTest { lateinit var composeClickActivityCallback: ComposeClickActivityCallback diff --git a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickEventGeneratorTest.kt b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickEventGeneratorTest.kt index a2beedbcc..7b4a1ab7c 100644 --- a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickEventGeneratorTest.kt +++ b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeClickEventGeneratorTest.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.semantics.SemanticsConfiguration import androidx.compose.ui.semantics.SemanticsModifier import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.semantics.getOrNull +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -41,9 +42,8 @@ import io.opentelemetry.semconv.incubating.AppIncubatingAttributes.APP_WIDGET_NA import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) internal class ComposeClickEventGeneratorTest { private lateinit var openTelemetryRule: OpenTelemetryRule diff --git a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeInstrumentationTest.kt b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeInstrumentationTest.kt index d65841946..3a68ddda0 100644 --- a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeInstrumentationTest.kt +++ b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeInstrumentationTest.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.semantics.SemanticsConfiguration import androidx.compose.ui.semantics.SemanticsModifier import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.semantics.getOrNull +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -51,9 +52,8 @@ import io.opentelemetry.semconv.incubating.AppIncubatingAttributes.APP_WIDGET_NA import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) internal class ComposeInstrumentationTest { private lateinit var openTelemetryRule: OpenTelemetryRule diff --git a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeTapTargetDetectorTest.kt b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeTapTargetDetectorTest.kt index 70af2af85..510d6083f 100644 --- a/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeTapTargetDetectorTest.kt +++ b/instrumentation/compose/click/src/test/kotlin/io/opentelemetry/instrumentation/compose/click/ComposeTapTargetDetectorTest.kt @@ -22,6 +22,7 @@ import androidx.compose.ui.semantics.SemanticsConfiguration import androidx.compose.ui.semantics.SemanticsModifier import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.semantics.getOrNull +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -30,9 +31,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) internal class ComposeTapTargetDetectorTest { lateinit var composeTapTargetDetector: ComposeTapTargetDetector diff --git a/instrumentation/network/src/test/java/io/opentelemetry/android/instrumentation/network/NetworkChangeInstrumentationTest.kt b/instrumentation/network/src/test/java/io/opentelemetry/android/instrumentation/network/NetworkChangeInstrumentationTest.kt index df68aab7d..e51f1df24 100644 --- a/instrumentation/network/src/test/java/io/opentelemetry/android/instrumentation/network/NetworkChangeInstrumentationTest.kt +++ b/instrumentation/network/src/test/java/io/opentelemetry/android/instrumentation/network/NetworkChangeInstrumentationTest.kt @@ -7,6 +7,7 @@ package io.opentelemetry.android.instrumentation.network import android.app.Application import android.os.Build +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -33,11 +34,10 @@ import org.junit.Before import org.junit.Test import org.junit.jupiter.api.extension.ExtendWith import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @Config(sdk = [Build.VERSION_CODES.P]) -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) @ExtendWith(MockKExtension::class) class NetworkChangeInstrumentationTest { private lateinit var otelTesting: OpenTelemetryRule diff --git a/instrumentation/slowrendering/src/test/java/io/opentelemetry/android/instrumentation/slowrendering/SlowRenderListenerTest.java b/instrumentation/slowrendering/src/test/java/io/opentelemetry/android/instrumentation/slowrendering/SlowRenderListenerTest.java index 2af93eb16..1084581f2 100644 --- a/instrumentation/slowrendering/src/test/java/io/opentelemetry/android/instrumentation/slowrendering/SlowRenderListenerTest.java +++ b/instrumentation/slowrendering/src/test/java/io/opentelemetry/android/instrumentation/slowrendering/SlowRenderListenerTest.java @@ -24,6 +24,7 @@ import android.os.Build; import android.os.Handler; import android.view.FrameMetrics; +import androidx.test.ext.junit.runners.AndroidJUnit4; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule; @@ -44,10 +45,9 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) @Config(sdk = Build.VERSION_CODES.N) public class SlowRenderListenerTest { diff --git a/instrumentation/view-click/src/test/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickInstrumentationTest.kt b/instrumentation/view-click/src/test/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickInstrumentationTest.kt index 0566a434e..71b7d1adc 100644 --- a/instrumentation/view-click/src/test/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickInstrumentationTest.kt +++ b/instrumentation/view-click/src/test/kotlin/io/opentelemetry/android/instrumentation/view/click/ViewClickInstrumentationTest.kt @@ -13,6 +13,7 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.Window.Callback +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -37,9 +38,8 @@ import org.junit.Before import org.junit.Test import org.junit.jupiter.api.extension.ExtendWith import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) @ExtendWith(MockKExtension::class) class ViewClickInstrumentationTest { private lateinit var openTelemetryRule: OpenTelemetryRule diff --git a/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackExceptionTest.java b/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackExceptionTest.java index 6b6e1081d..787f5e359 100644 --- a/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackExceptionTest.java +++ b/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackExceptionTest.java @@ -9,6 +9,7 @@ import static io.opentelemetry.semconv.ExceptionAttributes.*; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.volley.Request; import com.android.volley.toolbox.HurlStack; import com.android.volley.toolbox.RequestFuture; @@ -22,9 +23,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class TracingHurlStackExceptionTest { @Rule public OpenTelemetryRule otelTesting = OpenTelemetryRule.create(); diff --git a/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackTest.java b/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackTest.java index e75eae7f0..0be7a9f6b 100644 --- a/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackTest.java +++ b/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/TracingHurlStackTest.java @@ -9,6 +9,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Fail.fail; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.volley.DefaultRetryPolicy; import com.android.volley.Request; import com.android.volley.Response; @@ -44,9 +45,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class TracingHurlStackTest { @Rule public OpenTelemetryRule otelTesting = OpenTelemetryRule.create(); diff --git a/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/VolleyHttpClientAttributesGetterTest.java b/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/VolleyHttpClientAttributesGetterTest.java index ca6bb1b6e..b172a9de9 100644 --- a/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/VolleyHttpClientAttributesGetterTest.java +++ b/instrumentation/volley/library/src/test/java/io/opentelemetry/android/instrumentation/volley/VolleyHttpClientAttributesGetterTest.java @@ -10,6 +10,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.volley.Header; import com.android.volley.Request; import com.android.volley.toolbox.HttpResponse; @@ -19,9 +20,8 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class VolleyHttpClientAttributesGetterTest { @Test diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/ServicesTest.kt b/services/src/test/java/io/opentelemetry/android/internal/services/ServicesTest.kt index 970e71626..d22e84f82 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/ServicesTest.kt +++ b/services/src/test/java/io/opentelemetry/android/internal/services/ServicesTest.kt @@ -5,6 +5,7 @@ package io.opentelemetry.android.internal.services +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.Called import io.mockk.every import io.mockk.mockk @@ -17,9 +18,8 @@ import io.opentelemetry.android.internal.services.visiblescreen.VisibleScreenTra import org.assertj.core.api.Assertions.assertThat import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) class ServicesTest { @Test fun `Verify that services are created lazily`() { diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.java b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.java index 62aa6c6fe..184f3ec62 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.java +++ b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.java @@ -10,12 +10,12 @@ import android.content.Context; import android.os.Build; import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class NetworkDetectorTest { @Test diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/PostApi28NetworkDetectorTest.java b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/PostApi28NetworkDetectorTest.java index 4d3e1160e..d12d6854e 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/PostApi28NetworkDetectorTest.java +++ b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/PostApi28NetworkDetectorTest.java @@ -17,6 +17,7 @@ import android.net.NetworkCapabilities; import android.os.Build; import android.telephony.TelephonyManager; +import androidx.test.ext.junit.runners.AndroidJUnit4; import io.opentelemetry.android.common.internal.features.networkattributes.data.Carrier; import io.opentelemetry.android.common.internal.features.networkattributes.data.CurrentNetwork; import io.opentelemetry.android.common.internal.features.networkattributes.data.NetworkState; @@ -26,10 +27,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) @Config(sdk = Build.VERSION_CODES.P) public class PostApi28NetworkDetectorTest { diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/SimpleNetworkDetectorTest.java b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/SimpleNetworkDetectorTest.java index 2484dcb2f..7db15589d 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/SimpleNetworkDetectorTest.java +++ b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/SimpleNetworkDetectorTest.java @@ -13,17 +13,17 @@ import android.net.NetworkInfo; import android.os.Build; import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; import io.opentelemetry.android.common.internal.features.networkattributes.data.CurrentNetwork; import io.opentelemetry.android.common.internal.features.networkattributes.data.NetworkState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowNetworkInfo; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) @Config(sdk = Build.VERSION_CODES.P) public class SimpleNetworkDetectorTest { @Test diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicRunnableTest.kt b/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicRunnableTest.kt index fe78d2d33..74a6df8be 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicRunnableTest.kt +++ b/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicRunnableTest.kt @@ -5,6 +5,7 @@ package io.opentelemetry.android.internal.services.periodicwork +import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.Runs import io.mockk.every import io.mockk.just @@ -15,9 +16,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) class PeriodicRunnableTest { private lateinit var periodicWork: PeriodicWork private lateinit var testSystemTime: TestSystemTime diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicWorkTest.kt b/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicWorkTest.kt index 30b86983c..b8c2b63c3 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicWorkTest.kt +++ b/services/src/test/java/io/opentelemetry/android/internal/services/periodicwork/PeriodicWorkTest.kt @@ -5,16 +5,16 @@ package io.opentelemetry.android.internal.services.periodicwork +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.shadows.ShadowLooper import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -@RunWith(RobolectricTestRunner::class) +@RunWith(AndroidJUnit4::class) class PeriodicWorkTest { companion object { private const val DELAY_BETWEEN_EXECUTIONS_IN_SECONDS = 10L