From 56f396d8e50acecd1488823681e8f95e4f0b7a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Daipr=C3=A9?= Date: Wed, 24 Jul 2024 13:48:04 -0300 Subject: [PATCH 1/2] feat: migrate BuildCodegenCLITaskTest to AssertJ --- .../facebook/react/tasks/internal/BuildCodegenCLITaskTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/BuildCodegenCLITaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/BuildCodegenCLITaskTest.kt index 7e2ebaf7b8b3..e6ecc7df2eb9 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/BuildCodegenCLITaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/BuildCodegenCLITaskTest.kt @@ -8,7 +8,7 @@ package com.facebook.react.tasks.internal import com.facebook.react.tests.createTestTask -import org.junit.Assert.assertEquals +import org.assertj.core.api.Assertions.assertThat import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -22,6 +22,6 @@ class BuildCodegenCLITaskTest { val bashPath = tempFolder.newFile("bash").absolutePath val task = createTestTask { it.bashWindowsHome.set(bashPath) } - assertEquals(bashPath, task.bashWindowsHome.get()) + assertThat(task.bashWindowsHome.get()).isEqualTo(bashPath) } } From a2af999f4101843831490c345970e677cb668ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Daipr=C3=A9?= Date: Wed, 24 Jul 2024 13:52:01 -0300 Subject: [PATCH 2/2] feat: migrate PrepareGlogTaskTest to AssertJ --- .../react/tasks/internal/PrepareGlogTaskTest.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt index e767577aa4a0..dce1146807b1 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt @@ -10,7 +10,7 @@ package com.facebook.react.tasks.internal import com.facebook.react.tests.createProject import com.facebook.react.tests.createTestTask import java.io.* -import org.junit.Assert.* +import org.assertj.core.api.Assertions.assertThat import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -43,7 +43,7 @@ class PrepareGlogTaskTest { } task.taskAction() - assertTrue(output.listFiles()!!.any { it.name == "CMakeLists.txt" }) + assertThat(output.listFiles()!!.any { it.name == "CMakeLists.txt" }).isTrue() } @Test @@ -63,7 +63,7 @@ class PrepareGlogTaskTest { } task.taskAction() - assertTrue(output.listFiles()!!.any { it.name == "config.h" }) + assertThat(output.listFiles()!!.any { it.name == "config.h" }).isTrue() } @Test @@ -83,7 +83,7 @@ class PrepareGlogTaskTest { task.taskAction() - assertTrue(File(output, "glog-1.0.0/src/glog.cpp").exists()) + assertThat(File(output, "glog-1.0.0/src/glog.cpp").exists()).isTrue() } @Test @@ -104,8 +104,8 @@ class PrepareGlogTaskTest { task.taskAction() val expectedFile = File(output, "glog.h") - assertTrue(expectedFile.exists()) - assertEquals("ac_google_start_namespace", expectedFile.readText()) + assertThat(expectedFile.exists()).isTrue() + assertThat(expectedFile.readText()).isEqualTo("ac_google_start_namespace") } @Test @@ -125,6 +125,6 @@ class PrepareGlogTaskTest { task.taskAction() - assertTrue(File(output, "exported/glog/logging.h").exists()) + assertThat(File(output, "exported/glog/logging.h").exists()).isTrue() } }