Fix tests

Author: markushi

sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoEventProcessor.java

@@ -730,15 +730,17 @@ private void setDefaultAnrFingerprint(
       // sentry does not yet have a capability to provide default server-side fingerprint rules,
       // so we're doing this on the SDK side to group background and foreground ANRs separately
       // even if they have similar stacktraces.
-      if (event.getFingerprints() == null) {
-        if (options.isEnableAnrProfiling() && hasOnlySystemFrames(event)) {
-          // If profiling did not identify any app frames, we want to statically group these events
-          // to avoid ANR noise due to {{ default }} stacktrace grouping
-          event.setFingerprints(
-              Arrays.asList(
-                  "system-frames-only-anr", isBackgroundAnr ? "background-anr" : "foreground-anr"));
-          return;
-        }
+      if (event.getFingerprints() != null) {
+        return;
+      }
+
+      if (options.isEnableAnrProfiling() && hasOnlySystemFrames(event)) {
+        // If profiling did not identify any app frames, we want to statically group these events
+        // to avoid ANR noise due to {{ default }} stacktrace grouping
+        event.setFingerprints(
+            Arrays.asList(
+                "system-frames-only-anr", isBackgroundAnr ? "background-anr" : "foreground-anr"));
+      } else {
         event.setFingerprints(
             Arrays.asList("{{ default }}", isBackgroundAnr ? "background-anr" : "foreground-anr"));
       }

sentry-android-core/src/test/java/io/sentry/android/core/anr/AnrStackTraceConverterTest.kt

@@ -6,50 +6,44 @@ import org.junit.Test
 class AnrStackTraceConverterTest {
   @Test
   fun testConvertSimpleStackTrace() {
-    // Create a simple stack trace
     val elements =
       arrayOf(
         StackTraceElement("com.example.MyClass", "method1", "MyClass.java", 42),
         StackTraceElement("com.example.AnotherClass", "method2", "AnotherClass.java", 100),
       )
 
     val anrStackTrace = AnrStackTrace(1000, elements)
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(anrStackTrace)
 
-    // Convert to profile
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    // Verify profile structure
     Assert.assertNotNull(profile)
-    Assert.assertEquals(1, profile.getSamples().size.toLong())
-    Assert.assertEquals(2, profile.getFrames().size.toLong())
-    Assert.assertEquals(1, profile.getStacks().size.toLong())
-
-    // Verify frames
-    val frame0 = profile.getFrames().get(0)
-    Assert.assertEquals("MyClass.java", frame0.getFilename())
-    Assert.assertEquals("method1", frame0.getFunction())
-    Assert.assertEquals("com.example.MyClass", frame0.getModule())
-    Assert.assertEquals(42, frame0.getLineno())
-
-    val frame1 = profile.getFrames().get(1)
-    Assert.assertEquals("AnotherClass.java", frame1.getFilename())
-    Assert.assertEquals("method2", frame1.getFunction())
-    Assert.assertEquals("com.example.AnotherClass", frame1.getModule())
-    Assert.assertEquals(100, frame1.getLineno())
-
-    // Verify stack
-    val stack = profile.getStacks().get(0)
-    Assert.assertEquals(2, stack.size.toLong())
-    Assert.assertEquals(0, (stack.get(0) as Int).toLong())
-    Assert.assertEquals(1, (stack.get(1) as Int).toLong())
-
-    // Verify sample
-    val sample = profile.getSamples().get(0)
-    Assert.assertEquals(0, sample.getStackId().toLong())
-    Assert.assertEquals("0", sample.getThreadId())
-    Assert.assertEquals(1.0, sample.getTimestamp(), 0.001) // 1000ms = 1s
+    Assert.assertEquals(1, profile.samples.size)
+    Assert.assertEquals(2, profile.frames.size)
+    Assert.assertEquals(1, profile.stacks.size)
+
+    val frame0 = profile.frames[0]
+    Assert.assertEquals("MyClass.java", frame0.filename)
+    Assert.assertEquals("method1", frame0.function)
+    Assert.assertEquals("com.example.MyClass", frame0.module)
+    Assert.assertEquals(42, frame0.lineno)
+
+    val frame1 = profile.frames[1]
+    Assert.assertEquals("AnotherClass.java", frame1.filename)
+    Assert.assertEquals("method2", frame1.function)
+    Assert.assertEquals("com.example.AnotherClass", frame1.module)
+    Assert.assertEquals(100, frame1.lineno)
+
+    val stack = profile.stacks[0]
+    Assert.assertEquals(2, stack.size)
+    Assert.assertEquals(0, (stack[0] as Int))
+    Assert.assertEquals(1, (stack[1] as Int))
+
+    val sample = profile.samples[0]
+    Assert.assertEquals(0, sample.stackId)
+    Assert.assertEquals("0", sample.threadId)
+    Assert.assertEquals(1.0, sample.timestamp, 0.001) // 1000ms = 1s
   }
 
   @Test
@@ -67,27 +61,27 @@ class AnrStackTraceConverterTest {
         StackTraceElement("com.example.ThirdClass", "method3", "ThirdClass.java", 200),
       )
 
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(AnrStackTrace(1000, elements1))
     anrStackTraces.add(AnrStackTrace(2000, elements2))
 
     // Convert to profile
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
     // Should have 3 frames total (dedup removes duplicate)
-    Assert.assertEquals(3, profile.getFrames().size.toLong())
+    Assert.assertEquals(3, profile.frames.size)
 
     // First sample uses stack [0, 1]
-    val stack1 = profile.getStacks().get(0)
-    Assert.assertEquals(2, stack1.size.toLong())
-    Assert.assertEquals(0, (stack1.get(0) as Int).toLong())
-    Assert.assertEquals(1, (stack1.get(1) as Int).toLong())
+    val stack1 = profile.stacks[0]
+    Assert.assertEquals(2, stack1.size)
+    Assert.assertEquals(0, (stack1[0] as Int))
+    Assert.assertEquals(1, (stack1[1] as Int))
 
     // Second sample uses stack [0, 2] (frame 0 reused)
-    val stack2 = profile.getStacks().get(1)
-    Assert.assertEquals(2, stack2.size.toLong())
-    Assert.assertEquals(0, (stack2.get(0) as Int).toLong())
-    Assert.assertEquals(2, (stack2.get(1) as Int).toLong())
+    val stack2 = profile.stacks[1]
+    Assert.assertEquals(2, stack2.size)
+    Assert.assertEquals(0, (stack2[0] as Int))
+    Assert.assertEquals(2, (stack2[1] as Int))
   }
 
   @Test
@@ -99,111 +93,105 @@ class AnrStackTraceConverterTest {
         StackTraceElement("com.example.AnotherClass", "method2", "AnotherClass.java", 100),
       )
 
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(AnrStackTrace(1000, elements))
     anrStackTraces.add(AnrStackTrace(2000, elements.clone()))
 
-    // Convert to profile
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
     // Should have 2 frames and 1 stack (dedup stack)
-    Assert.assertEquals(2, profile.getFrames().size.toLong())
-    Assert.assertEquals(1, profile.getStacks().size.toLong())
+    Assert.assertEquals(2, profile.frames.size)
+    Assert.assertEquals(1, profile.stacks.size)
 
     // Both samples should reference the same stack
-    Assert.assertEquals(0, profile.getSamples().get(0).getStackId().toLong())
-    Assert.assertEquals(0, profile.getSamples().get(1).getStackId().toLong())
+    Assert.assertEquals(0, profile.samples[0].stackId)
+    Assert.assertEquals(0, profile.samples[1].stackId)
   }
 
   @Test
   fun testTimestampConversion() {
     val elements = arrayOf(StackTraceElement("com.example.MyClass", "method1", "MyClass.java", 42))
 
-    // Test various timestamps
     val timestampsMs = longArrayOf(1000, 1500, 5000)
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
 
     for (ts in timestampsMs) {
       anrStackTraces.add(AnrStackTrace(ts, elements))
     }
 
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    // Verify timestamps are converted from ms to seconds
-    Assert.assertEquals(1.0, profile.getSamples().get(0).getTimestamp(), 0.001)
-    Assert.assertEquals(1.5, profile.getSamples().get(1).getTimestamp(), 0.001)
-    Assert.assertEquals(5.0, profile.getSamples().get(2).getTimestamp(), 0.001)
+    Assert.assertEquals(1.0, profile.samples[0].timestamp, 0.001)
+    Assert.assertEquals(1.5, profile.samples[1].timestamp, 0.001)
+    Assert.assertEquals(5.0, profile.samples[2].timestamp, 0.001)
   }
 
   @Test
   fun testNativeMethodHandling() {
-    // Create a native method stack trace
     val elements = arrayOf(StackTraceElement("java.lang.System", "doSomething", null, -2))
 
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(AnrStackTrace(1000, elements))
 
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    val frame = profile.getFrames().get(0)
+    val frame = profile.frames[0]
     Assert.assertTrue(frame.isNative()!!)
   }
 
   @Test
   fun testThreadMetadata() {
     val elements = arrayOf(StackTraceElement("com.example.MyClass", "method1", "MyClass.java", 42))
 
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(AnrStackTrace(1000, elements))
 
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    // Verify thread metadata
-    val threadMetadata = profile.getThreadMetadata().get("0")
+    val threadMetadata = profile.threadMetadata["0"]
     Assert.assertNotNull(threadMetadata)
-    Assert.assertEquals("main", threadMetadata!!.getName())
-    Assert.assertEquals(Thread.NORM_PRIORITY.toLong(), threadMetadata.getPriority().toLong())
+    Assert.assertEquals("main", threadMetadata!!.name)
+    Assert.assertEquals(Thread.NORM_PRIORITY, threadMetadata.priority)
   }
 
   @Test
   fun testEmptyStackTraceList() {
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
 
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    // Should return empty profile with thread metadata
     Assert.assertNotNull(profile)
-    Assert.assertEquals(0, profile.getSamples().size.toLong())
-    Assert.assertEquals(0, profile.getFrames().size.toLong())
-    Assert.assertEquals(0, profile.getStacks().size.toLong())
-    Assert.assertTrue(profile.getThreadMetadata().containsKey("0"))
+    Assert.assertEquals(0, profile.samples.size)
+    Assert.assertEquals(0, profile.frames.size)
+    Assert.assertEquals(0, profile.stacks.size)
+    Assert.assertTrue(profile.threadMetadata.containsKey("0"))
   }
 
   @Test
   fun testSampleProperties() {
     val elements = arrayOf(StackTraceElement("com.example.MyClass", "method1", "MyClass.java", 42))
 
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(AnrStackTrace(12345, elements))
 
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    val sample = profile.getSamples().get(0)
-    Assert.assertEquals("0", sample.getThreadId())
-    Assert.assertEquals(0, sample.getStackId().toLong())
-    Assert.assertEquals(12.345, sample.getTimestamp(), 0.001)
+    val sample = profile.samples[0]
+    Assert.assertEquals("0", sample.threadId)
+    Assert.assertEquals(0, sample.stackId)
+    Assert.assertEquals(12.345, sample.timestamp, 0.001)
   }
 
   @Test
   fun testInAppFrameFlag() {
     val elements = arrayOf(StackTraceElement("com.example.MyClass", "method1", "MyClass.java", 42))
 
-    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList<AnrStackTrace?>()
+    val anrStackTraces: MutableList<AnrStackTrace?> = ArrayList()
     anrStackTraces.add(AnrStackTrace(1000, elements))
 
     val profile = StackTraceConverter.convert(AnrProfile(anrStackTraces))
 
-    val frame = profile.getFrames().get(0)
-    Assert.assertTrue(frame.isInApp()!!)
+    val frame = profile.frames[0]
+    Assert.assertNull(frame.isInApp())
   }
 }