diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 60ec16af8..65bc76e67 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -39,7 +39,6 @@ object Versions { const val installreferrer = "1.0" const val junit = "5.5.2" - const val assertJ = "3.13.2" const val mockito = "2.24.5" const val mockk = "1.9.kotlin12" const val assertk = "0.19" @@ -207,6 +206,5 @@ object Deps { const val detektTest = "io.gitlab.arturbosch.detekt:detekt-test:${Versions.detekt}" const val junitApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junit}" const val junitParams = "org.junit.jupiter:junit-jupiter-params:${Versions.junit}" - const val assertJ = "org.assertj:assertj-core:${Versions.assertJ}" const val junitEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit}" } diff --git a/mozilla-detekt-rules/build.gradle b/mozilla-detekt-rules/build.gradle index 7ddd37cce..9b7bdf731 100644 --- a/mozilla-detekt-rules/build.gradle +++ b/mozilla-detekt-rules/build.gradle @@ -8,7 +8,6 @@ dependencies { implementation Deps.kotlin_stdlib testImplementation Deps.junitApi testImplementation Deps.junitParams - testImplementation Deps.assertJ testRuntimeOnly Deps.junitEngine } diff --git a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt index 0c12eaf1e..e9b6b7271 100644 --- a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt +++ b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt @@ -6,7 +6,8 @@ package org.mozilla.fenix.detektrules import io.gitlab.arturbosch.detekt.test.lint import io.gitlab.arturbosch.detekt.api.YamlConfig -import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest @@ -22,8 +23,8 @@ internal class MozillaBannedPropertyAccessTest { MozillaBannedPropertyAccess(YamlConfig.loadResource(this.javaClass.getResource("/config.yml"))).lint( NONCOMPLIANT_ACCESS.trimIndent() ) - assertThat(findings).hasSize(1) - assertThat(findings[0].issue.description).isEqualTo(DESCR) + assertEquals(1, findings.size) + assertEquals(DESCR, findings[0].issue.description) } @DisplayName("compliant ") @@ -34,7 +35,7 @@ internal class MozillaBannedPropertyAccessTest { MozillaBannedPropertyAccess(YamlConfig.loadResource(this.javaClass.getResource("/config.yml"))).lint( source ) - assertThat(findings).isEmpty() + assertTrue(findings.isEmpty()) } companion object { @@ -78,4 +79,4 @@ const val COMPLIANT_ACCESS = """ } } } - """ \ No newline at end of file + """