diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/AgpConfiguratorUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/AgpConfiguratorUtilsTest.kt index 1c9c07eb0b6..c468a54c893 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/AgpConfiguratorUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/AgpConfiguratorUtilsTest.kt @@ -8,7 +8,7 @@ package com.facebook.react.utils import java.io.File -import org.junit.Assert.* +import org.assertj.core.api.Assertions.assertThat import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -23,7 +23,7 @@ class AgpConfiguratorUtilsTest { val manifest = File(mainFolder, "AndroidManifest.xml").apply { writeText("") } val actual = getPackageNameFromManifest(manifest) - assertNull(actual) + assertThat(actual).isNull() } @Test @@ -41,7 +41,7 @@ class AgpConfiguratorUtilsTest { } val actual = getPackageNameFromManifest(manifest) - assertNull(actual) + assertThat(actual).isNull() } @Test @@ -59,7 +59,7 @@ class AgpConfiguratorUtilsTest { } val actual = getPackageNameFromManifest(manifest) - assertNotNull(actual) - assertEquals("com.facebook.react", actual) + assertThat(actual).isNotNull() + assertThat(actual).isEqualTo("com.facebook.react") } } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/FileUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/FileUtilsTest.kt index a47e6ed47b8..9f08ba41544 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/FileUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/FileUtilsTest.kt @@ -8,7 +8,7 @@ package com.facebook.react.utils import java.io.File -import org.junit.Assert.* +import org.assertj.core.api.Assertions.assertThat import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -25,8 +25,8 @@ class FileUtilsTest { fileToMove.moveTo(destFile) - assertEquals("42", destFile.readText()) - assertFalse(fileToMove.exists()) + assertThat(destFile).hasContent("42") + assertThat(fileToMove).doesNotExist() } @Test @@ -39,7 +39,7 @@ class FileUtilsTest { subFolder.recreateDir() - assertTrue(subFolder.exists()) - assertEquals(0, subFolder.listFiles()?.size) + assertThat(subFolder).exists() + assertThat(subFolder.listFiles()).hasSize(0) } } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt index bf2f27926ab..3b866b63d5e 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt @@ -8,8 +8,7 @@ package com.facebook.react.utils import com.facebook.react.utils.NdkConfiguratorUtils.getPackagingOptionsForVariant -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue +import org.assertj.core.api.Assertions.assertThat import org.junit.Test class NdkConfiguratorUtilsTest { @@ -18,29 +17,21 @@ class NdkConfiguratorUtilsTest { fun getPackagingOptionsForVariant_withHermesEnabled() { val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled = true) - assertTrue("**/libjsc.so" in excludes) - assertTrue("**/libjscexecutor.so" in excludes) - assertFalse("**/libjsc.so" in includes) - assertFalse("**/libjscexecutor.so" in includes) + assertThat(excludes).containsExactly("**/libjsc.so", "**/libjscexecutor.so") + assertThat(includes).doesNotContain("**/libjsc.so", "**/libjscexecutor.so") - assertTrue("**/libhermes.so" in includes) - assertTrue("**/libhermes_executor.so" in includes) - assertFalse("**/libhermes.so" in excludes) - assertFalse("**/libhermes_executor.so" in excludes) + assertThat(includes).containsExactly("**/libhermes.so", "**/libhermes_executor.so") + assertThat(excludes).doesNotContain("**/libhermes.so", "**/libhermes_executor.so") } @Test fun getPackagingOptionsForVariant_withHermesDisabled() { val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled = false) - assertTrue("**/libhermes.so" in excludes) - assertTrue("**/libhermes_executor.so" in excludes) - assertFalse("**/libhermes.so" in includes) - assertFalse("**/libhermes_executor.so" in includes) + assertThat(excludes).containsExactly("**/libhermes.so", "**/libhermes_executor.so") + assertThat(includes).doesNotContain("**/libhermes.so", "**/libhermes_executor.so") - assertTrue("**/libjsc.so" in includes) - assertTrue("**/libjscexecutor.so" in includes) - assertFalse("**/libjsc.so" in excludes) - assertFalse("**/libjscexecutor.so" in excludes) + assertThat(includes).containsExactly("**/libjsc.so", "**/libjscexecutor.so") + assertThat(excludes).doesNotContain("**/libjsc.so", "**/libjscexecutor.so") } }