Skip to content

Commit 221a02e

Browse files
jkasten2jkasten2
authored
Merge pull request #2006 from OneSignal/tests/upgrade-to-junit5
[Tests] Upgrade to Junit5
2 parents caa994e + e0a22ec commit 221a02e

File tree

46 files changed

+33
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+33
-140
lines changed

‎OneSignalSDK/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ buildscript {
1414
huaweiHMSPushVersion = '6.3.0.304'
1515
huaweiHMSLocationVersion = '4.0.0.300'
1616
kotlinVersion = '1.7.10'
17-
kotestVersion = '5.5.0'
17+
kotestVersion = '5.8.0'
1818
ktlintPluginVersion = '11.6.1'
1919
ktlintVersion = '1.0.1'
20-
junitVersion = '4.13.2'
2120
// DO NOT upgrade for tests, using an old version so it matches AOSP
2221
tdunningJsonForTest = '1.0'
2322
}

‎OneSignalSDK/onesignal/core/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ android {
3232
unitTests {
3333
includeAndroidResources = true
3434
}
35+
unitTests.all {
36+
it.useJUnitPlatform()
37+
}
3538
}
3639
compileOptions {
3740
sourceCompatibility JavaVersion.VERSION_1_8
@@ -79,9 +82,9 @@ dependencies {
7982
}
8083

8184
testImplementation(project(':OneSignal:testhelpers'))
82-
testImplementation("junit:junit:$junitVersion")
83-
testImplementation("io.kotest:kotest-runner-junit4:$kotestVersion")
84-
testImplementation("io.kotest:kotest-runner-junit4-jvm:$kotestVersion")
85+
86+
testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion")
87+
testImplementation("io.kotest:kotest-runner-junit5-jvm:$kotestVersion")
8588
testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
8689
testImplementation("io.kotest:kotest-property:$kotestVersion")
8790
testImplementation("org.robolectric:robolectric:4.8.1")

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/common/JSONObjectExtensionsTest.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ package com.onesignal.common
22

33
import io.kotest.core.spec.style.DescribeSpec
44
import io.kotest.matchers.shouldBe
5-
import io.kotest.runner.junit4.KotestTestRunner
65
import io.mockk.mockkStatic
76
import io.mockk.verify
87
import org.json.JSONArray
98
import org.json.JSONObject
10-
import org.junit.runner.RunWith
119

12-
@RunWith(KotestTestRunner::class)
1310
class JSONObjectExtensionsTest : DescribeSpec({
1411
describe("toMap") {
1512
// Some org.json JVM libraries define their own toMap. We want to

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/common/ModelingTests.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import com.onesignal.user.internal.subscriptions.SubscriptionModel
1010
import com.onesignal.user.internal.subscriptions.SubscriptionModelStore
1111
import io.kotest.core.spec.style.FunSpec
1212
import io.kotest.matchers.shouldBe
13-
import io.kotest.runner.junit4.KotestTestRunner
14-
import junit.framework.TestCase
15-
import org.junit.runner.RunWith
1613

17-
@RunWith(KotestTestRunner::class)
1814
class ModelingTests : FunSpec({
1915

2016
test("Deadlock related to Model.setOptAnyProperty") {
@@ -55,7 +51,7 @@ class ModelingTests : FunSpec({
5551
t2.join(1000)
5652

5753
// verify if the thread has been successfully terminated
58-
TestCase.assertEquals(Thread.State.TERMINATED, t2.state)
54+
t2.state shouldBe Thread.State.TERMINATED
5955
}
6056

6157
test("Deadlock related to ModelSstore add() or remove()") {
@@ -113,7 +109,7 @@ class ModelingTests : FunSpec({
113109
t2.join(1000)
114110

115111
// verify if the thread has been successfully terminated
116-
TestCase.assertEquals(Thread.State.TERMINATED, t2.state)
112+
t2.state shouldBe Thread.State.TERMINATED
117113
}
118114

119115
test("Unsubscribing handler in change event may cause the concurrent modification exception") {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ import com.onesignal.debug.internal.logging.Logging
1111
import com.onesignal.testhelpers.extensions.RobolectricTest
1212
import io.kotest.core.spec.style.FunSpec
1313
import io.kotest.matchers.shouldBe
14-
import io.kotest.runner.junit4.KotestTestRunner
1514
import io.mockk.spyk
1615
import io.mockk.verify
1716
import kotlinx.coroutines.delay
18-
import org.junit.runner.RunWith
1917
import org.robolectric.Robolectric
2018

2119
@RobolectricTest
22-
@RunWith(KotestTestRunner::class)
2320
class ApplicationServiceTests : FunSpec({
2421

2522
beforeAny {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ import com.onesignal.session.internal.outcomes.impl.OutcomeTableProvider
1010
import com.onesignal.testhelpers.extensions.RobolectricTest
1111
import io.kotest.core.spec.style.FunSpec
1212
import io.kotest.matchers.shouldBe
13-
import io.kotest.runner.junit4.KotestTestRunner
1413
import io.mockk.mockk
15-
import org.junit.runner.RunWith
1614

1715
@RobolectricTest
18-
@RunWith(KotestTestRunner::class)
1916
class OSDatabaseTests : FunSpec({
2017

2118
beforeAny {

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ import io.kotest.matchers.should
1111
import io.kotest.matchers.shouldBe
1212
import io.kotest.matchers.shouldNotBe
1313
import io.kotest.matchers.types.beInstanceOf
14-
import io.kotest.runner.junit4.KotestTestRunner
1514
import kotlinx.coroutines.TimeoutCancellationException
1615
import org.json.JSONObject
17-
import org.junit.runner.RunWith
1816

19-
@RunWith(KotestTestRunner::class)
2017
class HttpClientTests : FunSpec({
2118

2219
beforeAny {

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.onesignal.debug.internal.logging.Logging
88
import com.onesignal.mocks.MockHelper
99
import io.kotest.core.spec.style.FunSpec
1010
import io.kotest.matchers.shouldBe
11-
import io.kotest.runner.junit4.KotestTestRunner
1211
import io.mockk.CapturingSlot
1312
import io.mockk.coEvery
1413
import io.mockk.coVerifyOrder
@@ -17,9 +16,7 @@ import io.mockk.just
1716
import io.mockk.mockk
1817
import io.mockk.runs
1918
import io.mockk.slot
20-
import org.junit.runner.RunWith
2119

22-
@RunWith(KotestTestRunner::class)
2320
class OperationRepoTests : FunSpec({
2421

2522
beforeAny {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ 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
14-
import io.kotest.runner.junit4.KotestTestRunner
1514
import kotlinx.coroutines.delay
16-
import org.junit.runner.RunWith
1715

1816
@RobolectricTest
19-
@RunWith(KotestTestRunner::class)
2017
class PreferencesServiceTests : FunSpec({
2118
val mockPrefStoreName = PreferenceStores.ONESIGNAL
2219
val mockBoolPrefStoreKey = "mock-bool"

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/startup/StartupServiceTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ import com.onesignal.debug.internal.logging.Logging
55
import io.kotest.assertions.throwables.shouldThrowUnit
66
import io.kotest.core.spec.style.FunSpec
77
import io.kotest.matchers.shouldBe
8-
import io.kotest.runner.junit4.KotestTestRunner
98
import io.mockk.every
109
import io.mockk.mockk
1110
import io.mockk.spyk
1211
import io.mockk.verify
13-
import org.junit.runner.RunWith
1412

15-
@RunWith(KotestTestRunner::class)
1613
class StartupServiceTests : FunSpec({
1714

1815
beforeAny {

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/internal/OneSignalImpTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ import com.onesignal.debug.internal.logging.Logging
55
import io.kotest.assertions.throwables.shouldThrowUnit
66
import io.kotest.core.spec.style.FunSpec
77
import io.kotest.matchers.shouldBe
8-
import io.kotest.runner.junit4.KotestTestRunner
9-
import org.junit.runner.RunWith
108

11-
@RunWith(KotestTestRunner::class)
129
class OneSignalImpTests : FunSpec({
1310
beforeAny {
1411
Logging.logLevel = LogLevel.NONE

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/selftest/JSONObjectEnvTest.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import com.onesignal.testhelpers.extensions.RobolectricTest
55
import io.kotest.core.spec.style.FunSpec
66
import io.kotest.core.spec.style.funSpec
77
import io.kotest.matchers.shouldBe
8-
import io.kotest.runner.junit4.KotestTestRunner
98
import org.json.JSONObject
10-
import org.junit.runner.RunWith
119

1210
/**
1311
* This purpose of this file is to ensure org.json classes being used in
@@ -29,7 +27,6 @@ val keyAOSPBehavior =
2927
}
3028

3129
@RobolectricTest
32-
@RunWith(KotestTestRunner::class)
3330
class JSONObjectRobolectricEnvTest : FunSpec({
3431
test("ensure our src JSON Kotlin extension methods work with @RobolectricTest") {
3532
val test = JSONObject()
@@ -41,7 +38,6 @@ class JSONObjectRobolectricEnvTest : FunSpec({
4138
include(keyAOSPBehavior)
4239
})
4340

44-
@RunWith(KotestTestRunner::class)
4541
class JSONObjectJVMEnvTest : FunSpec({
4642
include(keyAOSPBehavior)
4743
})

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/influence/InfluenceManagerTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ import com.onesignal.session.internal.session.ISessionService
99
import io.kotest.core.spec.style.FunSpec
1010
import io.kotest.matchers.shouldBe
1111
import io.kotest.matchers.shouldNotBe
12-
import io.kotest.runner.junit4.KotestTestRunner
1312
import io.mockk.Runs
1413
import io.mockk.every
1514
import io.mockk.just
1615
import io.mockk.mockk
17-
import org.junit.runner.RunWith
1816

19-
@RunWith(KotestTestRunner::class)
2017
class InfluenceManagerTests : FunSpec({
2118

2219
test("default are disabled influences") {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ import com.onesignal.session.internal.outcomes.impl.OutcomeEventsBackendService
1111
import io.kotest.assertions.throwables.shouldThrowUnit
1212
import io.kotest.core.spec.style.FunSpec
1313
import io.kotest.matchers.shouldBe
14-
import io.kotest.runner.junit4.KotestTestRunner
1514
import io.mockk.coEvery
1615
import io.mockk.coVerify
1716
import io.mockk.mockk
18-
import org.junit.runner.RunWith
1917

20-
@RunWith(KotestTestRunner::class)
2118
class OutcomeEventsBackendServiceTests : FunSpec({
2219
beforeAny {
2320
Logging.logLevel = LogLevel.NONE

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import com.onesignal.user.internal.subscriptions.SubscriptionModel
2323
import io.kotest.core.spec.style.FunSpec
2424
import io.kotest.matchers.shouldBe
2525
import io.kotest.matchers.shouldNotBe
26-
import io.kotest.runner.junit4.KotestTestRunner
2726
import io.mockk.Runs
2827
import io.mockk.coEvery
2928
import io.mockk.coVerify
@@ -35,9 +34,7 @@ import io.mockk.runs
3534
import io.mockk.spyk
3635
import kotlinx.coroutines.delay
3736
import org.json.JSONArray
38-
import org.junit.runner.RunWith
3937

40-
@RunWith(KotestTestRunner::class)
4138
class OutcomeEventsControllerTests : FunSpec({
4239
beforeAny {
4340
Logging.logLevel = LogLevel.NONE

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@ 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
19-
import io.kotest.runner.junit4.KotestTestRunner
2019
import io.mockk.verify
2120
import io.mockk.verifyAll
2221
import io.mockk.verifySequence
2322
import org.json.JSONArray
24-
import org.junit.runner.RunWith
2523

2624
@RobolectricTest
27-
@RunWith(KotestTestRunner::class)
2825
class OutcomeEventsRepositoryTests : FunSpec({
2926
beforeAny {
3027
Logging.logLevel = LogLevel.NONE

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/session/SessionServiceTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ import com.onesignal.mocks.MockHelper
44
import com.onesignal.session.internal.session.impl.SessionService
55
import io.kotest.core.spec.style.FunSpec
66
import io.kotest.matchers.shouldBe
7-
import io.kotest.runner.junit4.KotestTestRunner
87
import io.mockk.spyk
98
import io.mockk.verify
10-
import org.junit.runner.RunWith
119

12-
@RunWith(KotestTestRunner::class)
1310
class SessionServiceTests : FunSpec({
1411

1512
test("session created on focus when current session invalid") {

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ import com.onesignal.user.internal.subscriptions.SubscriptionList
77
import io.kotest.core.spec.style.FunSpec
88
import io.kotest.matchers.shouldBe
99
import io.kotest.matchers.shouldNotBe
10-
import io.kotest.runner.junit4.KotestTestRunner
1110
import io.mockk.every
1211
import io.mockk.just
1312
import io.mockk.mockk
1413
import io.mockk.runs
1514
import io.mockk.slot
1615
import io.mockk.verify
17-
import org.junit.runner.RunWith
1816

19-
@RunWith(KotestTestRunner::class)
2017
class UserManagerTests : FunSpec({
2118

2219
test("language is backed by the language context") {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ import com.onesignal.debug.internal.logging.Logging
77
import com.onesignal.user.internal.backend.impl.IdentityBackendService
88
import io.kotest.core.spec.style.FunSpec
99
import io.kotest.matchers.shouldBe
10-
import io.kotest.runner.junit4.KotestTestRunner
1110
import io.mockk.coEvery
1211
import io.mockk.coVerify
1312
import io.mockk.mockk
14-
import org.junit.runner.RunWith
1513

16-
@RunWith(KotestTestRunner::class)
1714
class IdentityBackendServiceTests : FunSpec({
1815
beforeAny {
1916
Logging.logLevel = LogLevel.NONE

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@ import com.onesignal.user.internal.subscriptions.SubscriptionStatus
1010
import io.kotest.assertions.throwables.shouldThrowUnit
1111
import io.kotest.core.spec.style.FunSpec
1212
import io.kotest.matchers.shouldBe
13-
import io.kotest.runner.junit4.KotestTestRunner
1413
import io.mockk.coEvery
1514
import io.mockk.coVerify
1615
import io.mockk.mockk
17-
import org.junit.runner.RunWith
1816

1917
// WARNING: Adding @RobolectricTest will cause JSONObject.map() to stop working
2018
// at runtime.
21-
@RunWith(KotestTestRunner::class)
2219
class SubscriptionBackendServiceTests : FunSpec({
2320
beforeAny {
2421
Logging.logLevel = LogLevel.NONE

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ import com.onesignal.user.internal.backend.impl.UserBackendService
99
import io.kotest.assertions.throwables.shouldThrowUnit
1010
import io.kotest.core.spec.style.FunSpec
1111
import io.kotest.matchers.shouldBe
12-
import io.kotest.runner.junit4.KotestTestRunner
1312
import io.mockk.coEvery
1413
import io.mockk.coVerify
1514
import io.mockk.mockk
16-
import org.junit.runner.RunWith
1715
import java.math.BigDecimal
1816

19-
@RunWith(KotestTestRunner::class)
2017
class UserBackendServiceTests : FunSpec({
2118
beforeAny {
2219
Logging.logLevel = LogLevel.NONE

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ import com.onesignal.user.internal.identity.IdentityModelStore
1313
import com.onesignal.user.internal.operations.impl.executors.IdentityOperationExecutor
1414
import io.kotest.core.spec.style.FunSpec
1515
import io.kotest.matchers.shouldBe
16-
import io.kotest.runner.junit4.KotestTestRunner
1716
import io.mockk.coEvery
1817
import io.mockk.coVerify
1918
import io.mockk.every
2019
import io.mockk.just
2120
import io.mockk.mockk
2221
import io.mockk.runs
2322
import io.mockk.verify
24-
import org.junit.runner.RunWith
2523

26-
@RunWith(KotestTestRunner::class)
2724
class IdentityOperationExecutorTests : FunSpec({
2825

2926
test("execution of set alias operation") {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@ import io.kotest.core.spec.style.FunSpec
2525
import io.kotest.matchers.collections.shouldBeOneOf
2626
import io.kotest.matchers.shouldBe
2727
import io.kotest.matchers.types.shouldBeInstanceOf
28-
import io.kotest.runner.junit4.KotestTestRunner
2928
import io.mockk.coEvery
3029
import io.mockk.coVerify
3130
import io.mockk.every
3231
import io.mockk.mockk
33-
import org.junit.runner.RunWith
3432

3533
@RobolectricTest
36-
@RunWith(KotestTestRunner::class)
3734
class LoginUserOperationExecutorTests : FunSpec({
3835
val appId = "appId"
3936
val localOneSignalId = "local-onesignalId"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ import com.onesignal.user.internal.subscriptions.SubscriptionModelStore
1919
import com.onesignal.user.internal.subscriptions.SubscriptionType
2020
import io.kotest.core.spec.style.FunSpec
2121
import io.kotest.matchers.shouldBe
22-
import io.kotest.runner.junit4.KotestTestRunner
2322
import io.mockk.coEvery
2423
import io.mockk.coVerify
2524
import io.mockk.every
2625
import io.mockk.just
2726
import io.mockk.mockk
2827
import io.mockk.runs
29-
import org.junit.runner.RunWith
3028

31-
@RunWith(KotestTestRunner::class)
3229
class RefreshUserOperationExecutorTests : FunSpec({
3330
val appId = "appId"
3431
val existingSubscriptionId1 = "existing-subscriptionId1"

0 commit comments

Comments
 (0)