Merge branch 'main' into fnewberg/use-upload-sdk-version-action

Author: fnewberg

embrace-gradle-plugin-integration-tests/fixtures/not-react-native-android/android/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id("com.android.application")
+    id("io.embrace.swazzler")
+    id("io.embrace.android.testplugin")
+}
+
+repositories {
+    google()
+    mavenCentral()
+    mavenLocal()
+}
+
+integrationTest.configureAndroidProject(project)
+
+embrace {
+    autoAddEmbraceDependencies.set(true)
+}

embrace-gradle-plugin-integration-tests/fixtures/not-react-native-android/android/proguard-rules.pro

@@ -0,0 +1,2 @@
+-keep class com.example.app.Foo { *; }
+-keep class io.embrace.android.embracesdk.internal.config.instrumented.* { *; }

embrace-gradle-plugin-integration-tests/fixtures/not-react-native-android/android/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />

embrace-gradle-plugin-integration-tests/fixtures/not-react-native-android/android/src/main/embrace-config.json

@@ -0,0 +1,5 @@
+{
+  "app_id": "abcde",
+  "api_token": "12345123451234512345123451234512",
+  "ndk_enabled": true
+}

embrace-gradle-plugin-integration-tests/fixtures/not-react-native-android/android/src/main/java/com/example/app/Bar.java

@@ -0,0 +1,7 @@
+package com.example.app;
+
+public class Bar {
+    public static String getBar() {
+        return "bar";
+    }
+}

embrace-gradle-plugin-integration-tests/fixtures/not-react-native-android/android/src/main/java/com/example/app/Foo.java

@@ -0,0 +1,7 @@
+package com.example.app;
+
+public class Foo {
+    public static String getFoo() {
+        return "foo";
+    }
+}

embrace-gradle-plugin-integration-tests/src/main/java/io/embrace/android/gradle/integration/framework/SetupInterface.kt

@@ -40,6 +40,11 @@ class SetupInterface(
         enqueueResponse(endpoint, response)
     }
 
+    fun SetupInterface.setupEmptyHandshakeResponse() {
+        val json = serializeRequestBody(NdkUploadHandshakeResponse(null))
+        enqueueResponse(EmbraceEndpoint.NDK_HANDSHAKE, MockResponse().setBody(json))
+    }
+
     fun SetupInterface.setupMapResponseWithEmptyValues(endpoint: EmbraceEndpoint) {
         val response = """
             {

embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidNdkTest.kt

@@ -100,9 +100,8 @@ class AndroidNdkTest {
         )
     }
 
-    // When a 3rd party dependency has native libraries, but the project has no externalNativeBuild block, we don't send symbols (yet).
     @Test
-    fun `don't send 3rd party native library symbols when the project has no native libraries`() {
+    fun `send 3rd party native library symbols even when the project has no native libraries`() {
         rule.runTest(
             fixture = "android-3rd-party-symbols",
             task = "build",
@@ -116,8 +115,8 @@ class AndroidNdkTest {
             },
             assertions = {
                 verifyBuildTelemetryRequestSent(defaultExpectedVariants)
-                verifyNoHandshakes()
-                verifyNoUploads()
+                verifyHandshakes(defaultExpectedLibs, defaultExpectedArchs, defaultExpectedVariants)
+                verifyUploads(defaultExpectedLibs, defaultExpectedArchs, defaultExpectedVariants)
             }
         )
     }

embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/ConfigInstrumentationTest.kt

@@ -56,6 +56,12 @@ class ConfigInstrumentationTest {
                 File(projectDir, "src/main/embrace-config.json").outputStream().buffered().use {
                     ResourceReader.readResource("config-overrides.json").buffered().copyTo(it)
                 }
+                // TODO: why is libembrace-native uploaded in this fixture, but not in the rest?
+                setupMockResponses(
+                    expectedLibs = listOf("libembrace-native.so"),
+                    expectedArchs = listOf("x86_64", "x86", "armeabi-v7a", "arm64-v8a"),
+                    expectedVariants = listOf("debug", "release")
+                )
             },
             assertions = { projectDir ->
                 verifyInstrumentedConfig(projectDir, "instrumented-config-overrides.json")

embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/ReactNativeAndroidTest.kt

@@ -48,11 +48,43 @@ class ReactNativeAndroidTest {
                 installNodeModules(projectDir)
                 setupMockResponses(handshakeLibs, handshakeArchs, defaultExpectedVariants)
             },
-            assertions = { projectDir ->
+            assertions = {
                 verifyBuildTelemetryRequestSent(defaultExpectedVariants)
                 verifyHandshakes(defaultExpectedLibs, defaultExpectedArchs, defaultExpectedVariants)
                 verifyUploads(handshakeLibs, handshakeArchs, defaultExpectedVariants)
-                verifyAsmInjection(projectDir)
+            }
+        )
+    }
+
+    @Test
+    fun `react native asm injection test`() {
+        rule.runTest(
+            fixture = "react-native-android",
+            androidProjectRoot = "android",
+            task = "assembleRelease",
+            setup = { projectDir ->
+                setupEmptyHandshakeResponse()
+                installNodeModules(projectDir)
+            },
+            assertions = { projectDir ->
+                verifyAsmInjection(File(projectDir, "app"), "765FB008173DC25D016D112F67250241")
+            }
+        )
+    }
+
+    @Test
+    fun `react native project without bundle or sourcemap`() {
+        rule.runTest(
+            fixture = "not-react-native-android",
+            androidProjectRoot = "android",
+            additionalArgs = listOf("-Pandroid.useAndroidX=true"),
+            task = "assembleRelease",
+            setup = {
+                setupEmptyHandshakeResponse()
+            },
+            assertions = { projectDir ->
+                verifyNoUploads()
+                verifyAsmInjection(projectDir, null)
             }
         )
     }
@@ -71,10 +103,10 @@ class ReactNativeAndroidTest {
         }
     }
 
-    private fun verifyAsmInjection(projectDir: File) {
+    private fun verifyAsmInjection(buildDir: File, expectedBundleId: String?) {
         // Read and parse the smali file containing the injected symbols
         val smaliFile = SmaliConfigReader().readSmaliFiles(
-            File(projectDir, "app"),
+            buildDir,
             listOf("/io/embrace/android/embracesdk/internal/config/instrumented/ProjectConfigImpl")
         ).first()
 
@@ -84,6 +116,6 @@ class ReactNativeAndroidTest {
             listOf(SmaliMethod("getReactNativeBundleId()Ljava/lang/String;"))
         ).methods.first()
 
-        assertEquals("765FB008173DC25D016D112F67250241", method.returnValue)
+        assertEquals(expectedBundleId, method.returnValue)
     }
 }