Skip to content

Commit df0aa1a

Browse files
authored
Merge pull request #3536 from DataDog/yl/move-fake-same-thread-executor-service
Move FakeSameThreadExecutorService into core textFixtures
2 parents 7fe6a67 + 535c2ae commit df0aa1a

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/AbstractStorageTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.datadog.android.api.storage.EventBatchWriter
1212
import com.datadog.android.api.storage.EventType
1313
import com.datadog.android.api.storage.FeatureStorageConfiguration
1414
import com.datadog.android.api.storage.RawBatchEvent
15+
import com.datadog.android.api.threads.FakeSameThreadExecutorService
1516
import com.datadog.android.core.internal.metrics.RemovalReason
1617
import com.datadog.android.core.internal.privacy.ConsentProvider
1718
import com.datadog.android.core.persistence.PersistenceStrategy

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/ConsentAwareStorageTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.datadog.android.api.InternalLogger
1010
import com.datadog.android.api.context.DatadogContext
1111
import com.datadog.android.api.storage.EventBatchWriter
1212
import com.datadog.android.api.storage.RawBatchEvent
13+
import com.datadog.android.api.threads.FakeSameThreadExecutorService
1314
import com.datadog.android.core.internal.data.upload.DataOkHttpUploader.Companion.HTTP_ACCEPTED
1415
import com.datadog.android.core.internal.metrics.BenchmarkUploads
1516
import com.datadog.android.core.internal.metrics.MetricsDispatcher

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/FakeSameThreadExecutorService.kt renamed to dd-sdk-android-core/src/testFixtures/kotlin/com/datadog/android/api/threads/FakeSameThreadExecutorService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* Copyright 2016-Present Datadog, Inc.
55
*/
66

7-
package com.datadog.android.core.internal.persistence
7+
package com.datadog.android.api.threads
88

99
import java.util.concurrent.AbstractExecutorService
1010
import java.util.concurrent.FutureTask
1111
import java.util.concurrent.TimeUnit
1212

13-
internal class FakeSameThreadExecutorService : AbstractExecutorService() {
13+
class FakeSameThreadExecutorService : AbstractExecutorService() {
1414

1515
private var isShutdown = false
1616

0 commit comments

Comments
 (0)