Merge pull request #1770 from DataDog/xgouchet/RUM-1520/update_obsole…

…te_logs_tests RUM-1520 Remove obsolete integration tests
DataDog · Dec 18, 2023 · e609161 · e609161
2 parents d29c752 + b679636
commit e609161
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 551 deletions.
diff --git a/...gration/src/androidTest/kotlin/com/datadog/android/sdk/integration/core/StrictModeTest.kt b/...gration/src/androidTest/kotlin/com/datadog/android/sdk/integration/core/StrictModeTest.kt
@@ -12,6 +12,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import com.datadog.android.core.allowThreadDiskReads
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.File
@@ -20,6 +21,18 @@ import java.io.File
 @MediumTest
 @RunWith(AndroidJUnit4::class)
 class StrictModeTest {
+
+    @After
+    fun tearDown() {
+        // Restore default StrictMode policy
+        StrictMode.setThreadPolicy(
+            ThreadPolicy.Builder()
+                .permitAll()
+                .penaltyLog()
+                .build()
+        )
+    }
+
     @Test
     fun M_disable_disk_read_checks_W_allowThreadDiskReads() {
         // Given

diff --git a/...ation/src/androidTest/kotlin/com/datadog/android/sdk/integration/log/CPUProfileForLogs.kt b/...ation/src/androidTest/kotlin/com/datadog/android/sdk/integration/log/CPUProfileForLogs.kt
diff --git a/.../src/androidTest/kotlin/com/datadog/android/sdk/integration/log/ConsentGrantedLogsTest.kt b/.../src/androidTest/kotlin/com/datadog/android/sdk/integration/log/ConsentGrantedLogsTest.kt
diff --git a/...droidTest/kotlin/com/datadog/android/sdk/integration/log/ConsentPendingGrantedLogsTest.kt b/...droidTest/kotlin/com/datadog/android/sdk/integration/log/ConsentPendingGrantedLogsTest.kt
diff --git a/...idTest/kotlin/com/datadog/android/sdk/integration/log/ConsentPendingNotGrantedLogsTest.kt b/...idTest/kotlin/com/datadog/android/sdk/integration/log/ConsentPendingNotGrantedLogsTest.kt
diff --git a/...ed/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/log/LogsTest.kt b/...ed/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/log/LogsTest.kt