Skip to content

Commit b7ff4b7

Browse files
committed
new testhelpers module to share test extensions
De-duplicated ContainedRobolectricRunner.kt and RobolectricExtension.kt by moving them into their own module. Before landing on this implementation I attempted to use the gradle feature testFixtures, however this doesn't work with the android gradle plugin.
1 parent 52dad80 commit b7ff4b7

File tree

30 files changed

+72
-529
lines changed

30 files changed

+72
-529
lines changed

OneSignalSDK/onesignal/core/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ dependencies {
7878
}
7979
}
8080

81+
testImplementation(project(':OneSignal:testhelpers'))
8182
testImplementation("junit:junit:$junitVersion")
8283
testImplementation("io.kotest:kotest-runner-junit4:$kotestVersion")
8384
testImplementation("io.kotest:kotest-runner-junit4-jvm:$kotestVersion")

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/application/ApplicationServiceTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.onesignal.common.threading.suspendifyOnThread
88
import com.onesignal.core.internal.application.impl.ApplicationService
99
import com.onesignal.debug.LogLevel
1010
import com.onesignal.debug.internal.logging.Logging
11-
import com.onesignal.extensions.RobolectricTest
11+
import com.onesignal.testhelpers.extensions.RobolectricTest
1212
import io.kotest.core.spec.style.FunSpec
1313
import io.kotest.matchers.shouldBe
1414
import io.kotest.runner.junit4.KotestTestRunner

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/database/OSDatabaseTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import com.onesignal.core.internal.database.impl.OSDatabase
66
import com.onesignal.core.internal.database.impl.OneSignalDbContract
77
import com.onesignal.debug.LogLevel
88
import com.onesignal.debug.internal.logging.Logging
9-
import com.onesignal.extensions.RobolectricTest
109
import com.onesignal.session.internal.outcomes.impl.OutcomeTableProvider
10+
import com.onesignal.testhelpers.extensions.RobolectricTest
1111
import io.kotest.core.spec.style.FunSpec
1212
import io.kotest.matchers.shouldBe
1313
import io.kotest.runner.junit4.KotestTestRunner

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/preferences/PreferencesServiceTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import androidx.test.core.app.ApplicationProvider
55
import com.onesignal.core.internal.preferences.impl.PreferencesService
66
import com.onesignal.debug.LogLevel
77
import com.onesignal.debug.internal.logging.Logging
8-
import com.onesignal.extensions.RobolectricTest
98
import com.onesignal.mocks.AndroidMockHelper
109
import com.onesignal.mocks.MockHelper
10+
import com.onesignal.testhelpers.extensions.RobolectricTest
1111
import io.kotest.assertions.throwables.shouldThrowUnit
1212
import io.kotest.core.spec.style.FunSpec
1313
import io.kotest.matchers.shouldBe

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsRepositoryTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.onesignal.session.internal.outcomes
22

33
import com.onesignal.debug.LogLevel
44
import com.onesignal.debug.internal.logging.Logging
5-
import com.onesignal.extensions.RobolectricTest
65
import com.onesignal.mocks.DatabaseMockHelper
76
import com.onesignal.session.internal.influence.Influence
87
import com.onesignal.session.internal.influence.InfluenceChannel
@@ -13,6 +12,7 @@ import com.onesignal.session.internal.outcomes.impl.OutcomeEventsRepository
1312
import com.onesignal.session.internal.outcomes.impl.OutcomeEventsTable
1413
import com.onesignal.session.internal.outcomes.impl.OutcomeSource
1514
import com.onesignal.session.internal.outcomes.impl.OutcomeSourceBody
15+
import com.onesignal.testhelpers.extensions.RobolectricTest
1616
import io.kotest.core.spec.style.FunSpec
1717
import io.kotest.matchers.shouldBe
1818
import io.kotest.matchers.shouldNotBe

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.onesignal.core.internal.http.HttpResponse
55
import com.onesignal.core.internal.http.IHttpClient
66
import com.onesignal.debug.LogLevel
77
import com.onesignal.debug.internal.logging.Logging
8-
import com.onesignal.extensions.RobolectricTest
8+
import com.onesignal.testhelpers.extensions.RobolectricTest
99
import com.onesignal.user.internal.backend.impl.SubscriptionBackendService
1010
import com.onesignal.user.internal.subscriptions.SubscriptionStatus
1111
import io.kotest.assertions.throwables.shouldThrowUnit

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.onesignal.common.exceptions.BackendException
44
import com.onesignal.core.internal.operations.ExecutionResponse
55
import com.onesignal.core.internal.operations.ExecutionResult
66
import com.onesignal.core.internal.operations.Operation
7-
import com.onesignal.extensions.RobolectricTest
87
import com.onesignal.mocks.AndroidMockHelper
98
import com.onesignal.mocks.MockHelper
9+
import com.onesignal.testhelpers.extensions.RobolectricTest
1010
import com.onesignal.user.internal.backend.CreateUserResponse
1111
import com.onesignal.user.internal.backend.IUserBackendService
1212
import com.onesignal.user.internal.backend.IdentityConstants

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.onesignal.user.internal.operations
33
import com.onesignal.common.exceptions.BackendException
44
import com.onesignal.core.internal.operations.ExecutionResult
55
import com.onesignal.core.internal.operations.Operation
6-
import com.onesignal.extensions.RobolectricTest
76
import com.onesignal.mocks.AndroidMockHelper
87
import com.onesignal.mocks.MockHelper
8+
import com.onesignal.testhelpers.extensions.RobolectricTest
99
import com.onesignal.user.internal.backend.ISubscriptionBackendService
1010
import com.onesignal.user.internal.backend.IdentityConstants
1111
import com.onesignal.user.internal.backend.SubscriptionObjectType

OneSignalSDK/onesignal/in-app-messages/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ dependencies {
7878
}
7979
}
8080

81+
testImplementation(project(':OneSignal:testhelpers'))
8182
testImplementation("junit:junit:$junitVersion")
8283
testImplementation("io.kotest:kotest-runner-junit4:$kotestVersion")
8384
testImplementation("io.kotest:kotest-runner-junit4-jvm:$kotestVersion")

OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/extensions/ContainedRobolectricRunner.kt

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)