Merge branch 'feat/unhandled-sessions-cache' into feat/unhandled-sessions-internal-api

Author: buenaflor

sentry/src/test/java/io/sentry/SessionTest.kt

@@ -1,10 +1,7 @@
 package io.sentry
 
 import com.google.common.truth.Truth.assertThat
-import java.io.StringReader
-import java.io.StringWriter
 import kotlin.test.Test
-import org.mockito.kotlin.mock
 
 class SessionTest {
 
@@ -113,33 +110,4 @@ class SessionTest {
 
     assertThat(clone.hasNonTerminatingUnhandledError()).isTrue()
   }
-
-  @Test
-  fun `serialization round-trips a non-terminating unhandled error and Unhandled status`() {
-    val logger = mock<ILogger>()
-    val session = okSession()
-    session.recordNonTerminatingUnhandledError()
-    session.end()
-    assertThat(session.status).isEqualTo(Session.State.Unhandled)
-
-    val writer = StringWriter()
-    session.serialize(JsonObjectWriter(writer, 100), logger)
-
-    val deserialized =
-      Session.Deserializer().deserialize(JsonObjectReader(StringReader(writer.toString())), logger)
-
-    assertThat(deserialized.status).isEqualTo(Session.State.Unhandled)
-    assertThat(deserialized.hasNonTerminatingUnhandledError()).isTrue()
-  }
-
-  @Test
-  fun `a non-terminating unhandled error defaults to false and is not serialized when unset`() {
-    val logger = mock<ILogger>()
-    val session = okSession()
-
-    val writer = StringWriter()
-    session.serialize(JsonObjectWriter(writer, 100), logger)
-
-    assertThat(writer.toString()).doesNotContain("non_terminating_unhandled_error")
-  }
 }

sentry/src/test/java/io/sentry/protocol/SessionSerializationTest.kt

@@ -10,6 +10,7 @@ import io.sentry.Session
 import java.io.StringReader
 import java.io.StringWriter
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import org.junit.Test
 import org.mockito.kotlin.mock
 
@@ -66,6 +67,13 @@ class SessionSerializationTest {
     assertEquals(true, deserialized.hasNonTerminatingUnhandledError())
   }
 
+  @Test
+  fun `non-terminating flag is omitted when unset`() {
+    val session = Session(null, null, "environment", "release")
+
+    assertFalse(serialize(session).contains("non_terminating_unhandled_error"))
+  }
+
   // Helper
 
   private fun sanitizedFile(path: String): String =