diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt index 89fc9e65cb..cd21f92fd2 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AnrV2IntegrationTest.kt @@ -12,7 +12,6 @@ import java.io.File import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull -import org.junit.After import org.junit.runner.RunWith import org.mockito.kotlin.any import org.mockito.kotlin.anyOrNull @@ -163,11 +162,6 @@ class AnrV2IntegrationTest : ApplicationExitIntegrationTestBase() { assertEquals("/apex/com.android.runtime/lib64/bionic/libc.so", image.codeFile) } - @After - fun cleanup() { - fixture.options.cacheDirPath?.let { File(it).deleteRecursively() } - } - @Test fun `when latest ANR has foreground importance, sets abnormal mechanism to anr_foreground`() { val integration = diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ApplicationExitInfoCrossIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ApplicationExitInfoCrossIntegrationTest.kt index f362fed252..8aceb6784e 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ApplicationExitInfoCrossIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ApplicationExitInfoCrossIntegrationTest.kt @@ -14,7 +14,6 @@ import io.sentry.protocol.SentryId import io.sentry.test.ImmediateExecutorService import java.io.File import java.util.zip.GZIPInputStream -import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test import org.junit.Rule @@ -63,6 +62,9 @@ class ApplicationExitInfoCrossIntegrationTest { setLogger(logger) isDebug = true cacheDirPath = dir.absolutePath + // Nothing ever releases these latches here, so every wait would run to its timeout. + flushTimeoutMillis = 0L + sessionFlushTimeoutMillis = 0L executorService = ImmediateExecutorService() setEnvelopeDiskCache(EnvelopeCache.create(this)) addInAppInclude("io.sentry.samples") @@ -151,11 +153,6 @@ class ApplicationExitInfoCrossIntegrationTest { fixture.init(ApplicationProvider.getApplicationContext()) } - @AfterTest - fun `tear down`() { - tmpDir.root.deleteRecursively() - } - @Test fun `memory limiter and anr integrations each capture only their own exits from shared history`() { val memoryLimiterTimestamp = System.currentTimeMillis() - 1_000 diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt index 0b72fb6e89..ed3bc431d8 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt @@ -18,7 +18,6 @@ import io.sentry.test.ImmediateExecutorService import io.sentry.transport.CurrentDateProvider import io.sentry.util.HintUtils import java.io.File -import kotlin.test.AfterTest import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals @@ -78,6 +77,9 @@ class MemoryLimiterIntegrationTest { setLogger(this@Fixture.logger) isDebug = true cacheDirPath = dir?.newFolder()?.absolutePath + // Nothing ever releases these latches here, so every wait would run to its timeout. + flushTimeoutMillis = 0L + sessionFlushTimeoutMillis = 0L executorService = if (useImmediateExecutorService) ImmediateExecutorService() else mock() isMemoryLimiterEnabled = memoryLimiterEnabled isReportHistoricalMemoryLimiterExits = reportHistoricalMemoryLimiterExits @@ -134,11 +136,6 @@ class MemoryLimiterIntegrationTest { fixture.init(context) } - @AfterTest - fun `tear down`() { - fixture.options.cacheDirPath?.let { File(it).deleteRecursively() } - } - @Test fun `does not process MemoryLimiter exits when integration is disabled`() { val integration =