ref(android): Extracts Android native initialization to standalone structures

CHANGELOG.md

@@ -26,6 +26,10 @@
   - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8480)
   - [diff](https://github.com/getsentry/sentry-javascript/compare/8.47.0...8.48.0)
 
+### Internal
+
+- Extract Android native initialization to standalone structures ([#4445](https://github.com/getsentry/sentry-react-native/pull/4445))
+
 ## 6.5.0
 
 ### Features

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt

@@ -3,20 +3,13 @@ package io.sentry.react
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.JavaOnlyMap
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.common.JavascriptException
-import io.sentry.Breadcrumb
 import io.sentry.ILogger
 import io.sentry.SentryLevel
-import io.sentry.android.core.SentryAndroidOptions
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -103,163 +96,4 @@ class RNSentryModuleImplTest {
         val capturedMap = writableMapCaptor.value
         assertEquals(false, capturedMap.getBoolean("has_fetched"))
     }
-
-    @Test
-    fun `when the spotlight option is enabled, the spotlight SentryAndroidOption is set to true and the default url is used`() {
-        val options =
-            JavaOnlyMap.of(
-                "spotlight",
-                true,
-                "defaultSidecarUrl",
-                "http://localhost:8969/teststream",
-            )
-        val actualOptions = SentryAndroidOptions()
-        module.getSentryAndroidOptions(actualOptions, options, logger)
-        assert(actualOptions.isEnableSpotlight)
-        assertEquals("http://localhost:8969/teststream", actualOptions.spotlightConnectionUrl)
-    }
-
-    @Test
-    fun `when the spotlight url is passed, the spotlight is enabled for the given url`() {
-        val options = JavaOnlyMap.of("spotlight", "http://localhost:8969/teststream")
-        val actualOptions = SentryAndroidOptions()
-        module.getSentryAndroidOptions(actualOptions, options, logger)
-        assert(actualOptions.isEnableSpotlight)
-        assertEquals("http://localhost:8969/teststream", actualOptions.spotlightConnectionUrl)
-    }
-
-    @Test
-    fun `when the spotlight option is disabled, the spotlight SentryAndroidOption is set to false`() {
-        val options = JavaOnlyMap.of("spotlight", false)
-        val actualOptions = SentryAndroidOptions()
-        module.getSentryAndroidOptions(actualOptions, options, logger)
-        assertFalse(actualOptions.isEnableSpotlight)
-    }
-
-    @Test
-    fun `the JavascriptException is added to the ignoredExceptionsForType list on initialisation`() {
-        val actualOptions = SentryAndroidOptions()
-        module.getSentryAndroidOptions(actualOptions, JavaOnlyMap.of(), logger)
-        assertTrue(actualOptions.ignoredExceptionsForType.contains(JavascriptException::class.java))
-    }
-
-    @Test
-    fun `beforeBreadcrumb callback filters out Sentry DSN requests breadcrumbs`() {
-        val options = SentryAndroidOptions()
-        val rnOptions =
-            JavaOnlyMap.of(
-                "dsn",
-                "https://[email protected]/1234567",
-                "devServerUrl",
-                "http://localhost:8081",
-            )
-        module.getSentryAndroidOptions(options, rnOptions, logger)
-
-        val breadcrumb =
-            Breadcrumb().apply {
-                type = "http"
-                setData("url", "https://def.ingest.sentry.io/1234567")
-            }
-
-        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
-
-        assertNull("Breadcrumb should be filtered out", result)
-    }
-
-    @Test
-    fun `beforeBreadcrumb callback filters out dev server breadcrumbs`() {
-        val mockDevServerUrl = "http://localhost:8081"
-        val options = SentryAndroidOptions()
-        val rnOptions =
-            JavaOnlyMap.of(
-                "dsn",
-                "https://[email protected]/1234567",
-                "devServerUrl",
-                mockDevServerUrl,
-            )
-        module.getSentryAndroidOptions(options, rnOptions, logger)
-
-        val breadcrumb =
-            Breadcrumb().apply {
-                type = "http"
-                setData("url", mockDevServerUrl)
-            }
-
-        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
-
-        assertNull("Breadcrumb should be filtered out", result)
-    }
-
-    @Test
-    fun `beforeBreadcrumb callback does not filter out non dev server or dsn breadcrumbs`() {
-        val options = SentryAndroidOptions()
-        val rnOptions =
-            JavaOnlyMap.of(
-                "dsn",
-                "https://[email protected]/1234567",
-                "devServerUrl",
-                "http://localhost:8081",
-            )
-        module.getSentryAndroidOptions(options, rnOptions, logger)
-
-        val breadcrumb =
-            Breadcrumb().apply {
-                type = "http"
-                setData("url", "http://testurl.com/service")
-            }
-
-        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
-
-        assertEquals(breadcrumb, result)
-    }
-
-    @Test
-    fun `the breadcrumb is not filtered out when the dev server url and dsn are not passed`() {
-        val options = SentryAndroidOptions()
-        module.getSentryAndroidOptions(options, JavaOnlyMap(), logger)
-
-        val breadcrumb =
-            Breadcrumb().apply {
-                type = "http"
-                setData("url", "http://testurl.com/service")
-            }
-
-        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
-
-        assertEquals(breadcrumb, result)
-    }
-
-    @Test
-    fun `the breadcrumb is not filtered out when the dev server url is not passed and the dsn does not match`() {
-        val options = SentryAndroidOptions()
-        val rnOptions = JavaOnlyMap.of("dsn", "https://[email protected]/1234567")
-        module.getSentryAndroidOptions(options, rnOptions, logger)
-
-        val breadcrumb =
-            Breadcrumb().apply {
-                type = "http"
-                setData("url", "http://testurl.com/service")
-            }
-
-        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
-
-        assertEquals(breadcrumb, result)
-    }
-
-    @Test
-    fun `the breadcrumb is not filtered out when the dev server url does not match and the dsn is not passed`() {
-        val options = SentryAndroidOptions()
-        val rnOptions = JavaOnlyMap.of("devServerUrl", "http://localhost:8081")
-        module.getSentryAndroidOptions(options, rnOptions, logger)
-
-        val breadcrumb =
-            Breadcrumb().apply {
-                type = "http"
-                setData("url", "http://testurl.com/service")
-            }
-
-        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
-
-        assertEquals(breadcrumb, result)
-    }
 }

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryStartTest.kt

@@ -0,0 +1,193 @@
+package io.sentry.react
+
+import android.app.Activity
+import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.common.JavascriptException
+import io.sentry.Breadcrumb
+import io.sentry.ILogger
+import io.sentry.android.core.SentryAndroidOptions
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.mockito.Mockito.mock
+import org.mockito.MockitoAnnotations
+
+@RunWith(JUnit4::class)
+class RNSentryStartTest {
+    private lateinit var module: RNSentryStart
+    private lateinit var logger: ILogger
+
+    private lateinit var activity: Activity
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.openMocks(this)
+        logger = mock(ILogger::class.java)
+        activity = mock(Activity::class.java)
+        module = RNSentryStart()
+    }
+
+    @Test
+    fun `when the spotlight option is enabled, the spotlight SentryAndroidOption is set to true and the default url is used`() {
+        val options =
+            JavaOnlyMap.of(
+                "spotlight",
+                true,
+                "defaultSidecarUrl",
+                "http://localhost:8969/teststream",
+            )
+        val actualOptions = SentryAndroidOptions()
+        module.getSentryAndroidOptions(actualOptions, options, activity, logger)
+        assert(actualOptions.isEnableSpotlight)
+        assertEquals("http://localhost:8969/teststream", actualOptions.spotlightConnectionUrl)
+    }
+
+    @Test
+    fun `when the spotlight url is passed, the spotlight is enabled for the given url`() {
+        val options = JavaOnlyMap.of("spotlight", "http://localhost:8969/teststream")
+        val actualOptions = SentryAndroidOptions()
+        module.getSentryAndroidOptions(actualOptions, options, activity, logger)
+        assert(actualOptions.isEnableSpotlight)
+        assertEquals("http://localhost:8969/teststream", actualOptions.spotlightConnectionUrl)
+    }
+
+    @Test
+    fun `when the spotlight option is disabled, the spotlight SentryAndroidOption is set to false`() {
+        val options = JavaOnlyMap.of("spotlight", false)
+        val actualOptions = SentryAndroidOptions()
+        module.getSentryAndroidOptions(actualOptions, options, activity, logger)
+        assertFalse(actualOptions.isEnableSpotlight)
+    }
+
+    @Test
+    fun `the JavascriptException is added to the ignoredExceptionsForType list on initialisation`() {
+        val actualOptions = SentryAndroidOptions()
+        module.getSentryAndroidOptions(actualOptions, JavaOnlyMap.of(), activity, logger)
+        assertTrue(actualOptions.ignoredExceptionsForType.contains(JavascriptException::class.java))
+    }
+
+    @Test
+    fun `beforeBreadcrumb callback filters out Sentry DSN requests breadcrumbs`() {
+        val options = SentryAndroidOptions()
+        val rnOptions =
+            JavaOnlyMap.of(
+                "dsn",
+                "https://[email protected]/1234567",
+                "devServerUrl",
+                "http://localhost:8081",
+            )
+        module.getSentryAndroidOptions(options, rnOptions, activity, logger)
+
+        val breadcrumb =
+            Breadcrumb().apply {
+                type = "http"
+                setData("url", "https://def.ingest.sentry.io/1234567")
+            }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertNull("Breadcrumb should be filtered out", result)
+    }
+
+    @Test
+    fun `beforeBreadcrumb callback filters out dev server breadcrumbs`() {
+        val mockDevServerUrl = "http://localhost:8081"
+        val options = SentryAndroidOptions()
+        val rnOptions =
+            JavaOnlyMap.of(
+                "dsn",
+                "https://[email protected]/1234567",
+                "devServerUrl",
+                mockDevServerUrl,
+            )
+        module.getSentryAndroidOptions(options, rnOptions, activity, logger)
+
+        val breadcrumb =
+            Breadcrumb().apply {
+                type = "http"
+                setData("url", mockDevServerUrl)
+            }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertNull("Breadcrumb should be filtered out", result)
+    }
+
+    @Test
+    fun `beforeBreadcrumb callback does not filter out non dev server or dsn breadcrumbs`() {
+        val options = SentryAndroidOptions()
+        val rnOptions =
+            JavaOnlyMap.of(
+                "dsn",
+                "https://[email protected]/1234567",
+                "devServerUrl",
+                "http://localhost:8081",
+            )
+        module.getSentryAndroidOptions(options, rnOptions, activity, logger)
+
+        val breadcrumb =
+            Breadcrumb().apply {
+                type = "http"
+                setData("url", "http://testurl.com/service")
+            }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
+
+    @Test
+    fun `the breadcrumb is not filtered out when the dev server url and dsn are not passed`() {
+        val options = SentryAndroidOptions()
+        module.getSentryAndroidOptions(options, JavaOnlyMap(), activity, logger)
+
+        val breadcrumb =
+            Breadcrumb().apply {
+                type = "http"
+                setData("url", "http://testurl.com/service")
+            }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
+
+    @Test
+    fun `the breadcrumb is not filtered out when the dev server url is not passed and the dsn does not match`() {
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of("dsn", "https://[email protected]/1234567")
+        module.getSentryAndroidOptions(options, rnOptions, activity, logger)
+
+        val breadcrumb =
+            Breadcrumb().apply {
+                type = "http"
+                setData("url", "http://testurl.com/service")
+            }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
+
+    @Test
+    fun `the breadcrumb is not filtered out when the dev server url does not match and the dsn is not passed`() {
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of("devServerUrl", "http://localhost:8081")
+        module.getSentryAndroidOptions(options, rnOptions, activity, logger)
+
+        val breadcrumb =
+            Breadcrumb().apply {
+                type = "http"
+                setData("url", "http://testurl.com/service")
+            }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
+}