fix Ok Session termination test

Author: supervacuus

sentry/src/main/java/io/sentry/PreviousSessionFinalizer.java

@@ -107,6 +107,9 @@ public void run() {
             @Nullable Date timestamp = getTimestampFromCrashMarkerFile(crashMarkerFile);
             session.update(Session.State.Crashed, null, true);
             session.end(timestamp);
+          } else if (session.getAbnormalMechanism() == null) {
+              // this means the session hasn't crashed or abnormally exited and there was no native crash marker, we only end it _now_.
+              session.end();
           }
 
           // Independent of whether the TombstoneIntegration is active or the Native SDK operates

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

@@ -113,16 +113,45 @@ class PreviousSessionFinalizerTest {
 
   @Test
   fun `if previous session exists, sends session update with current end time`() {
+    // we start the session 20 seconds before now, this should create enough distance to the current
+    // DateTime to detect an update
+    val sessionCreationCaptureInterval = 20000
+    val sessionCreationTimestamp =
+      DateUtils.getDateTime(DateUtils.getCurrentDateTime().time - sessionCreationCaptureInterval)
+
     val finalizer =
-      fixture.getSut(tmpDir, session = Session(null, null, null, "io.sentry.sample@1.0"))
+      fixture.getSut(
+        tmpDir,
+        session =
+          Session(
+            Session.State.Ok,
+            sessionCreationTimestamp,
+            sessionCreationTimestamp,
+            0,
+            null,
+            SentryUUID.generateSentryId(),
+            true,
+            null,
+            null,
+            null,
+            null,
+            null,
+            "io.sentry.sample@1.0",
+            null,
+          ),
+      )
     finalizer.run()
 
     verify(fixture.scopes)
       .captureEnvelope(
         argThat {
+          val captureEnvelopeTimestamp = DateUtils.getCurrentDateTime().time
           val session = fixture.sessionFromEnvelope(this)
           session.release == "io.sentry.sample@1.0" &&
-            session.timestamp!!.time - DateUtils.getCurrentDateTime().time < 1000
+            session.started!!.time == sessionCreationTimestamp.time &&
+            captureEnvelopeTimestamp - session.started!!.time > sessionCreationCaptureInterval &&
+            session.timestamp!!.time != sessionCreationTimestamp.time &&
+            captureEnvelopeTimestamp - session.timestamp!!.time < 1000
         }
       )
   }