diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e7c341c..19ca877 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -14,6 +14,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31") implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.31") implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") - implementation("org.jlleitschuh.gradle:ktlint-gradle:9.4.1") + implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0") implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0") } diff --git a/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts index 919ea4d..788afc3 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/junit-convention.gradle.kts @@ -5,7 +5,9 @@ plugins { } tasks.withType { - useJUnitPlatform() + useJUnitPlatform { + excludeTags("slow") + } } dependencies { diff --git a/persistence/test/DbHealthCheckImplTest.kt b/persistence/test/DbHealthCheckImplTest.kt index a590e4f..2782e1a 100644 --- a/persistence/test/DbHealthCheckImplTest.kt +++ b/persistence/test/DbHealthCheckImplTest.kt @@ -2,6 +2,7 @@ package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.junit.jupiter.api.parallel.ResourceLock @@ -15,6 +16,7 @@ class H2DbHealthCheckImplTest : DbTest() { } } +@Tag("slow") @ResourceLock("mariadb") class MariaDbHealthCheckImplTest : DbTest() { lateinit var mariaDB: KMariadbContainer diff --git a/persistence/test/notes/H2NoteRepositoryImplTests.kt b/persistence/test/notes/H2NoteRepositoryImplTests.kt index f371d2b..36b41bc 100644 --- a/persistence/test/notes/H2NoteRepositoryImplTests.kt +++ b/persistence/test/notes/H2NoteRepositoryImplTests.kt @@ -5,6 +5,7 @@ import be.simplenotes.persistence.KMariadbContainer import be.simplenotes.persistence.h2dataSourceConfig import be.simplenotes.persistence.mariadbDataSourceConfig import org.junit.jupiter.api.AfterAll +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.parallel.ResourceLock @ResourceLock("h2") @@ -12,6 +13,7 @@ internal class H2NoteRepositoryImplTests : BaseNoteRepositoryImplTest() { override fun dataSourceConfig() = h2dataSourceConfig() } +@Tag("slow") @ResourceLock("mariadb") internal class MariaDbNoteRepositoryImplTests : BaseNoteRepositoryImplTest() { lateinit var mariaDB: KMariadbContainer diff --git a/persistence/test/users/UserRepositoryImplTests.kt b/persistence/test/users/UserRepositoryImplTests.kt index 15cfca6..b9cb863 100644 --- a/persistence/test/users/UserRepositoryImplTests.kt +++ b/persistence/test/users/UserRepositoryImplTests.kt @@ -5,6 +5,7 @@ import be.simplenotes.persistence.KMariadbContainer import be.simplenotes.persistence.h2dataSourceConfig import be.simplenotes.persistence.mariadbDataSourceConfig import org.junit.jupiter.api.AfterAll +import org.junit.jupiter.api.Tag import org.junit.jupiter.api.parallel.ResourceLock @ResourceLock("h2") @@ -12,6 +13,7 @@ internal class UserRepositoryImplTest : BaseUserRepositoryImplTest() { override fun dataSourceConfig() = h2dataSourceConfig() } +@Tag("slow") @ResourceLock("mariadb") internal class MariaDbUserRepositoryImplTest : BaseUserRepositoryImplTest() { lateinit var mariaDB: KMariadbContainer