Integration testing for the sentry-native new unwinder

sentry-samples/sentry-samples-android/.gitignore

@@ -1 +1,2 @@
 /build
+sentry-samples-android-keystore

sentry-samples/sentry-samples-android/appcenter

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Usage
+# ./appcenter androidBuildToolsVersion keyAlias keyPass appCenterApp appCenterDevice
+# Sample
+# ./appcenter 29.0.3 keyAlias keyPass denrase/Sentry-Android-Sample e669fa3b # Nexus 5 Andorid 11
+
+# Create Debug APK
+
+../../gradlew :sentry-samples:sentry-samples-android:clean
+../../gradlew :sentry-samples:sentry-samples-android:assembleDebug
+
+# Run Tests so Test APK is Built
+
+../../gradlew :sentry-samples:sentry-samples-android:connectedAndroidTest
+
+# Sign APK
+
+~/Library/Android/sdk/build-tools/$1/apksigner sign --ks sentry-samples-android-keystore --ks-pass pass:$2 --key-pass pass:$3 --in build/outputs/apk/debug/sentry-samples-android-debug.apk --out build/outputs/apk/debug/sentry-samples-android-debug.apk
+
+# Sign Test APK
+
+~/Library/Android/sdk/build-tools/$1/apksigner sign --ks sentry-samples-android-keystore --ks-pass pass:$2 --key-pass pass:$3 --in build/outputs/apk/androidTest/debug/sentry-samples-android-debug-androidTest.apk --out build/outputs/apk/androidTest/debug/sentry-samples-android-debug-androidTest.apk
+
+# Upload to AppCenter
+
+appcenter test run espresso --app "$4" --devices $5 --app-path build/outputs/apk/debug/sentry-samples-android-debug.apk --test-series "master" --locale "en_US" --build-dir build/outputs/apk/androidTest/debug

sentry-samples/sentry-samples-android/build.gradle.kts

@@ -30,6 +30,8 @@ android {
         ndk {
             abiFilters.addAll(Config.Android.abiFilters)
         }
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildFeatures {
@@ -109,4 +111,13 @@ dependencies {
     implementation(Config.Libs.retrofit2Gson)
 
     debugImplementation(Config.Libs.leakCanary)
+
+    androidTestImplementation(Config.TestLibs.androidxRunner)
+    androidTestImplementation(Config.TestLibs.androidxJunit)
+
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
+    androidTestImplementation("com.android.support.test.uiautomator:uiautomator-v18:2.1.3")
+
+    androidTestImplementation("com.microsoft.appcenter:espresso-test-extension:1.4")
+
 }

sentry-samples/sentry-samples-android/src/androidTest/java/io/sentry/samples/android/MainActivityTest.kt

@@ -0,0 +1,86 @@
+package io.sentry.samples.android
+
+import android.support.test.uiautomator.UiDevice
+import android.support.test.uiautomator.UiSelector
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.platform.app.InstrumentationRegistry
+import com.microsoft.appcenter.espresso.Factory
+import com.microsoft.appcenter.espresso.ReportHelper
+import org.junit.Rule
+import org.junit.Test
+
+class MainActivityTest {
+
+    @get:Rule
+    var activityRule: ActivityScenarioRule<MainActivity>
+        = ActivityScenarioRule(MainActivity::class.java)
+
+    @get:Rule
+    val reportHelper: ReportHelper = Factory.getReportHelper()
+
+    // Tests are run in alphabetical order...
+
+    // We crash in a service to test if an envelope was created.
+    @Test
+    fun a_initSdkAndCrash() {
+        reportHelper.label("initSdkAndCrash")
+        onView(withId(R.id.native_crash)).perform(scrollTo(), click())
+        Thread.sleep(10000)
+
+        // Close either app or android dialog
+
+        val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        val okButton = mDevice.findObject(UiSelector().text("OK"))
+        val closeAppButton = mDevice.findObject(UiSelector().text("Close app"))
+        val allowButton = mDevice.findObject(UiSelector().text("OK"))
+        when {
+            okButton.exists() -> {
+                okButton.click()
+            }
+            closeAppButton.exists() -> {
+                closeAppButton.click()
+            }
+            allowButton.exists() -> {
+                allowButton.click()
+            }
+            else -> {
+                mDevice.pressBack()
+            }
+        }
+    }
+
+    // Check if envelope file is here.
+    @Test
+    fun b_checkIfFileExists() {
+
+        val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        val okButton = mDevice.findObject(UiSelector().text("OK"))
+        val closeAppButton = mDevice.findObject(UiSelector().text("Close app"))
+        val allowButton = mDevice.findObject(UiSelector().text("OK"))
+        when {
+            okButton.exists() -> {
+                okButton.click()
+            }
+            closeAppButton.exists() -> {
+                closeAppButton.click()
+            }
+            allowButton.exists() -> {
+                allowButton.click()
+            }
+        }
+
+        onView(withId(R.id.button_copy_file)).perform(click())
+        onView(withId(R.id.text_view_copy_file))
+            .check(matches(withText("SUCCESS")))
+
+        reportHelper.label("checkIfFileExists")
+    }
+
+
+}

sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml

@@ -22,7 +22,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"
         android:allowNativeHeapPointerTagging="false"
-        android:extractNativeLibs="true"
         tools:ignore="GoogleAppIndexingWarning, UnusedAttribute">
 
         <activity android:name=".MainActivity">
@@ -35,9 +34,10 @@
 
         <activity android:name=".SecondActivity" />
 
-        <!--    NOTE: Replace the test DSN below with YOUR OWN DSN to see the events from this app in your Sentry project/dashboard-->
+        <!-- NOTE: Replace the test DSN below with YOUR OWN DSN to see the events from this app in your Sentry project/dashboard-->
         <meta-data android:name="io.sentry.dsn" android:value="https://1053864c67cc410aa1ffc9701bd6f93d@o447951.ingest.sentry.io/5428559" />
 
+        <meta-data android:name="io.sentry.auto-init" android:value="false" />
         <!--    how to enable Sentry's debug mode-->
         <meta-data android:name="io.sentry.debug" android:value="${sentryDebug}" />
 
@@ -101,5 +101,10 @@
         <!--    how to disable the app components breadcrumbs integration-->
         <!--    <meta-data android:name="io.sentry.breadcrumbs.app-components" android:value="false" />-->
 
+      <service
+        android:name=".NativeCrashService"
+        android:process=":externalProcess">
+      </service>
+
     </application>
 </manifest>

sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java

@@ -1,23 +1,35 @@
 package io.sentry.samples.android;
 
+import android.content.Context;
 import android.content.Intent;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import io.sentry.Attachment;
 import io.sentry.ISpan;
 import io.sentry.Sentry;
 import io.sentry.SpanStatus;
 import io.sentry.UserFeedback;
+import io.sentry.android.core.SentryAndroid;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.User;
 import io.sentry.samples.android.databinding.ActivityMainBinding;
+
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Locale;
@@ -51,6 +63,11 @@ protected void onCreate(Bundle savedInstanceState) {
           scope.addAttachment(image);
         });
 
+    binding.buttonCopyFile.setOnClickListener( view -> {
+      boolean success = moveNativeCrashEnvelopeFile();
+      binding.textViewCopyFile.setText(success ? "SUCCESS" : "FAILED");
+    });
+
     binding.crashFromJava.setOnClickListener(
         view -> {
           throw new RuntimeException("Uncaught Exception from Java.");
@@ -129,7 +146,11 @@ protected void onCreate(Bundle savedInstanceState) {
           Sentry.setUser(user);
         });
 
-    binding.nativeCrash.setOnClickListener(view -> NativeSample.crash());
+    binding.nativeCrash.setOnClickListener(view -> {
+      Intent intent = new Intent(this, NativeCrashService.class);
+      intent.putExtra("FOOBAR", "FOO");
+      startService(intent);
+    });
 
     binding.nativeCapture.setOnClickListener(view -> NativeSample.message());
 
@@ -159,6 +180,44 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(binding.getRoot());
   }
 
+  boolean moveNativeCrashEnvelopeFile() {
+    File source = nativeCrashEnvelopeFileSource();
+    File target = nativeCrashEnvelopeFileTarget();
+    try {
+      copy(source, target);
+      return target.exists();
+    } catch (Exception exception) {
+      return false;
+    }
+  }
+
+  File nativeCrashEnvelopeFileTarget() {
+    return new File(this.getCacheDir(), "android-native-crash.envelope");
+  }
+
+  @Nullable
+  File nativeCrashEnvelopeFileSource() {
+    try {
+      File hiddenFolder = new File(this.getCacheDir(), "/sentry/.sentry-native");
+      return hiddenFolder.listFiles()[0];
+    } catch (Exception exception) {
+      return null;
+    }
+  }
+
+  private static void copy(File src, File dest) throws IOException {
+    try (InputStream is = new FileInputStream(src); OutputStream os = new FileOutputStream(dest)) {
+
+      // buffer size 1K
+      byte[] buf = new byte[1024];
+
+      int bytesRead;
+      while ((bytesRead = is.read(buf)) > 0) {
+        os.write(buf, 0, bytesRead);
+      }
+    }
+  }
+
   @Override
   protected void onResume() {
     super.onResume();

sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/NativeCrashService.kt

@@ -0,0 +1,41 @@
+package io.sentry.samples.android
+
+import android.app.Service
+import android.content.Intent
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.util.Log
+import io.sentry.android.core.SentryAndroid
+import java.io.File
+
+class NativeCrashService : Service() {
+
+    override fun onBind(p0: Intent?): IBinder? {
+        return null
+    }
+
+    override fun onStart(intent: Intent?, startId: Int) {
+        handleStart()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        handleStart()
+        return START_NOT_STICKY
+    }
+
+    private fun handleStart() {
+        SentryAndroid.init(this) {
+            //
+        }
+
+        // Dispatch async so method, and therefore START_NOT_STICKY, can return.
+        val handler = Handler()
+        val mainHandler = Handler(Looper.getMainLooper())
+        mainHandler.post {
+            handler.post {
+                NativeSample.crash()
+            }
+        }
+    }
+}