Skip to content

Commit 0686ad5

Browse files
authored
Upgrade JUnit to 6.x (#725)
1 parent c637507 commit 0686ad5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Built with modern Android development tools and libraries, prioritizing, project
100100
- **[Lottie](http://airbnb.io/lottie)** - Vector animations
101101

102102
**Testing:**
103-
- **[JUnit 5](https://junit.org/junit5/)** - Modern testing framework
103+
- **[JUnit 6](https://junit.org/)** - Modern testing framework
104104
- **[Mockk](https://mockk.io/)** - Kotlin-first mocking library
105105
- **[Kluent](https://github.com/MarkusAmshove/Kluent)** - Fluent assertion library
106106
- **[Espresso](https://developer.android.com/training/testing/espresso)** - UI testing (WIP)
@@ -320,7 +320,7 @@ Each module uses convention a plugin, so common dependencies are shared without
320320
- **[`Feature Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/FeatureConventionPlugin.kt)** - Feature module configuration combining library and Kotlin conventions
321321
- **[`Library Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/LibraryConventionPlugin.kt)** - Android library module setup with common Android configuration
322322
- **[`Lotlin Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/KotlinConventionPlugin.kt)** - Kotlin compilation settings, toolchain, and compiler options
323-
- **[`Test Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/TestConventionPlugin.kt)** - Testing framework setup (JUnit 5, test logging, and test configurations)
323+
- **[`Test Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/TestConventionPlugin.kt)** - Testing framework setup (JUnit, test logging, and test configurations)
324324
- **[`Test Library Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/TestConventionLibraryPlugin.kt)** - Testing setup specifically for library modules
325325
- **[`Detekt Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/DetektConventionPlugin.kt)** - Static code analysis configuration with Detekt
326326
- **[`Spotless Convention`](./buildLogic/src/main/kotlin/com/igorwojda/showcase/buildlogic/SpotlessConventionPlugin.kt)** - Code formatting and style enforcement with Spotless

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ nlopez-compose-rules = "0.4.27"
4545
twitter-compose-rules = "0.0.26"
4646

4747
# Test
48-
junit-jupiter = "5.14.0"
48+
junit-jupiter = "6.0.0"
4949
android-junit5 = "1.13.4.0"
5050
kluent = "1.73"
5151
test-runner = "1.7.0"

library/testUtils/src/main/kotlin/com/igorwojda/showcase/library/testutils/CoroutinesTestDispatcherExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import org.junit.jupiter.api.extension.ExtensionContext
2121
class CoroutinesTestDispatcherExtension :
2222
BeforeEachCallback,
2323
AfterEachCallback {
24-
override fun beforeEach(context: ExtensionContext?) {
24+
override fun beforeEach(context: ExtensionContext) {
2525
Dispatchers.setMain(StandardTestDispatcher())
2626
}
2727

28-
override fun afterEach(context: ExtensionContext?) {
28+
override fun afterEach(context: ExtensionContext) {
2929
Dispatchers.resetMain()
3030
}
3131
}

library/testUtils/src/main/kotlin/com/igorwojda/showcase/library/testutils/InstantTaskExecutorExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InstantTaskExecutorExtension :
3333
)
3434
}
3535

36-
override fun afterEach(context: ExtensionContext?) {
36+
override fun afterEach(context: ExtensionContext) {
3737
ArchTaskExecutor.getInstance().setDelegate(null)
3838
}
3939
}

0 commit comments

Comments
 (0)