From aaf321e2d1571832aa67acc748f458bc08c26245 Mon Sep 17 00:00:00 2001 From: "Antony M. Kithinzi" Date: Wed, 31 Jul 2024 19:06:00 +0300 Subject: [PATCH 1/4] chore: migrate GenerateCodegenArtifactsTaskTest to assertj --- .../tasks/GenerateCodegenArtifactsTaskTest.kt | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt index 447c58aaa4cb..305c618b920d 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt @@ -11,8 +11,7 @@ import com.facebook.react.tests.* import com.facebook.react.tests.createProject import com.facebook.react.tests.createTestTask import java.io.File -import org.junit.Assert.assertEquals -import org.junit.Assert.assertTrue +import org.assertj.Assert.assertThat import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -29,7 +28,7 @@ class GenerateCodegenArtifactsTaskTest { val task = createTestTask { it.generatedSrcDir.set(outputDir) } - assertEquals(File(outputDir, "schema.json"), task.generatedSchemaFile.get().asFile) + assertThat(File(outputDir, "schema.json")).isEqualTo(task.generatedSchemaFile.get().asFile) } @Test @@ -38,8 +37,8 @@ class GenerateCodegenArtifactsTaskTest { val task = createTestTask { it.generatedSrcDir.set(outputDir) } - assertEquals(File(outputDir, "java"), task.generatedJavaFiles.get().asFile) - assertEquals(File(outputDir, "jni"), task.generatedJniFiles.get().asFile) + assertThat(File(outputDir, "java")).isEqualTo(task.generatedJavaFiles.get().asFile) + assertThat(File(outputDir, "jni")).isEqualTo(task.generatedJniFiles.get().asFile) } @Test @@ -54,12 +53,12 @@ class GenerateCodegenArtifactsTaskTest { it.packageJsonFile.set(packageJsonFile) } - assertEquals(listOf("npm", "help"), task.nodeExecutableAndArgs.get()) - assertEquals("com.example.test", task.codegenJavaPackageName.get()) - assertEquals("example-test", task.libraryName.get()) - assertTrue(task.inputs.properties.containsKey("nodeExecutableAndArgs")) - assertTrue(task.inputs.properties.containsKey("codegenJavaPackageName")) - assertTrue(task.inputs.properties.containsKey("libraryName")) + assertThat(listOf("npm", "help")).isEqualTo(task.nodeExecutableAndArgs.get()) + assertThat("com.example.test").isEqualTo(task.codegenJavaPackageName.get()) + assertThat("example-test").isEqualTo(task.libraryName.get()) + assertThat(task.inputs.properties.containsKey("nodeExecutableAndArgs")).exists() + assertThat(task.inputs.properties.containsKey("codegenJavaPackageName")).exists() + assertThat(task.inputs.properties.containsKey("libraryName")).exists() } @Test @@ -77,7 +76,7 @@ class GenerateCodegenArtifactsTaskTest { task.setupCommandLine("example-test", "com.example.test") - assertEquals( + assertThat( listOf( "--verbose", File(reactNativeDir, "scripts/generate-specs-cli.js").toString(), @@ -91,7 +90,7 @@ class GenerateCodegenArtifactsTaskTest { "example-test", "--javaPackageName", "com.example.test", - ), + )).isEqualTo( task.commandLine.toMutableList()) } @@ -111,7 +110,7 @@ class GenerateCodegenArtifactsTaskTest { task.setupCommandLine("example-test", "com.example.test") - assertEquals( + assertThat( listOf( "cmd", "/c", @@ -129,7 +128,7 @@ class GenerateCodegenArtifactsTaskTest { "example-test", "--javaPackageName", "com.example.test", - ), + )).isEqualTo( task.commandLine.toMutableList()) } @@ -162,8 +161,8 @@ class GenerateCodegenArtifactsTaskTest { val (libraryName, javaPackageName) = task.resolveTaskParameters() - assertEquals("an-awesome-library", libraryName) - assertEquals("com.awesome.package", javaPackageName) + assertThat("an-awesome-library").isEqualTo(libraryName) + assertThat("com.awesome.package").isEqualTo(javaPackageName) } @Test @@ -191,8 +190,8 @@ class GenerateCodegenArtifactsTaskTest { val (libraryName, javaPackageName) = task.resolveTaskParameters() - assertEquals("a-library-name-from-gradle", libraryName) - assertEquals("com.example.test", javaPackageName) + assertThat("a-library-name-from-gradle").isEqualTo(libraryName) + assertThat("com.example.test").isEqualTo(javaPackageName) } @Test @@ -206,7 +205,7 @@ class GenerateCodegenArtifactsTaskTest { val (libraryName, javaPackageName) = task.resolveTaskParameters() - assertEquals("a-library-name-from-gradle", libraryName) - assertEquals("com.example.test", javaPackageName) + assertThat("a-library-name-from-gradle").isEqualTo(libraryName) + assertThat("com.example.test").isEqualTo(javaPackageName) } } From 7736485f35ea2a7f3a9a0f28c7f73f8338ec08db Mon Sep 17 00:00:00 2001 From: "Antony M. Kithinzi" Date: Thu, 1 Aug 2024 16:54:28 +0300 Subject: [PATCH 2/4] inverting... --- .../tasks/GenerateCodegenArtifactsTaskTest.kt | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt index 305c618b920d..fa25c707d5b4 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt @@ -28,7 +28,7 @@ class GenerateCodegenArtifactsTaskTest { val task = createTestTask { it.generatedSrcDir.set(outputDir) } - assertThat(File(outputDir, "schema.json")).isEqualTo(task.generatedSchemaFile.get().asFile) + assertThat(task.generatedSchemaFile.get().asFile).isEqualTo(File(outputDir, "schema.json")) } @Test @@ -37,8 +37,8 @@ class GenerateCodegenArtifactsTaskTest { val task = createTestTask { it.generatedSrcDir.set(outputDir) } - assertThat(File(outputDir, "java")).isEqualTo(task.generatedJavaFiles.get().asFile) - assertThat(File(outputDir, "jni")).isEqualTo(task.generatedJniFiles.get().asFile) + assertThat(task.generatedJavaFiles.get().asFile).isEqualTo(File(outputDir, "java")) + assertThat(task.generatedJniFiles.get().asFile).isEqualTo(File(outputDir, "jni")) } @Test @@ -53,9 +53,9 @@ class GenerateCodegenArtifactsTaskTest { it.packageJsonFile.set(packageJsonFile) } - assertThat(listOf("npm", "help")).isEqualTo(task.nodeExecutableAndArgs.get()) - assertThat("com.example.test").isEqualTo(task.codegenJavaPackageName.get()) - assertThat("example-test").isEqualTo(task.libraryName.get()) + assertThat(task.nodeExecutableAndArgs.get()).isEqualTo(listOf("npm", "help")) + assertThat(task.codegenJavaPackageName.get()).isEqualTo("com.example.test") + assertThat(task.libraryName.get()).isEqualTo("example-test") assertThat(task.inputs.properties.containsKey("nodeExecutableAndArgs")).exists() assertThat(task.inputs.properties.containsKey("codegenJavaPackageName")).exists() assertThat(task.inputs.properties.containsKey("libraryName")).exists() @@ -76,8 +76,7 @@ class GenerateCodegenArtifactsTaskTest { task.setupCommandLine("example-test", "com.example.test") - assertThat( - listOf( + assertThat(task.CommandLine).containsExactly( "--verbose", File(reactNativeDir, "scripts/generate-specs-cli.js").toString(), "--platform", @@ -90,8 +89,7 @@ class GenerateCodegenArtifactsTaskTest { "example-test", "--javaPackageName", "com.example.test", - )).isEqualTo( - task.commandLine.toMutableList()) + ) } @Test @@ -110,8 +108,7 @@ class GenerateCodegenArtifactsTaskTest { task.setupCommandLine("example-test", "com.example.test") - assertThat( - listOf( + assertThat(task.CommandLine).containsExactly( "cmd", "/c", "--verbose", @@ -128,8 +125,7 @@ class GenerateCodegenArtifactsTaskTest { "example-test", "--javaPackageName", "com.example.test", - )).isEqualTo( - task.commandLine.toMutableList()) + ) } @Test @@ -161,8 +157,8 @@ class GenerateCodegenArtifactsTaskTest { val (libraryName, javaPackageName) = task.resolveTaskParameters() - assertThat("an-awesome-library").isEqualTo(libraryName) - assertThat("com.awesome.package").isEqualTo(javaPackageName) + assertThat(libraryName).isEqualTo("an-awesome-library") + assertThat(javaPackageName).isEqualTo("com.awesome.package") } @Test @@ -190,8 +186,8 @@ class GenerateCodegenArtifactsTaskTest { val (libraryName, javaPackageName) = task.resolveTaskParameters() - assertThat("a-library-name-from-gradle").isEqualTo(libraryName) - assertThat("com.example.test").isEqualTo(javaPackageName) + assertThat(libraryName).isEqualTo("a-library-name-from-gradle") + assertThat(javaPackageName).isEqualTo("com.example.test") } @Test @@ -205,7 +201,7 @@ class GenerateCodegenArtifactsTaskTest { val (libraryName, javaPackageName) = task.resolveTaskParameters() - assertThat("a-library-name-from-gradle").isEqualTo(libraryName) - assertThat("com.example.test").isEqualTo(javaPackageName) + assertThat(libraryName).isEqualTo("a-library-name-from-gradle") + assertThat(javaPackageName).isEqualTo("com.example.test") } } From 56c15ae741d9055cc036a44d6ab7f1b2686aeb0b Mon Sep 17 00:00:00 2001 From: "Antony M. Kithinzi" Date: Thu, 1 Aug 2024 16:55:03 +0300 Subject: [PATCH 3/4] commiting suggestion Co-authored-by: Nicola Corti --- .../react/tasks/GenerateCodegenArtifactsTaskTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt index fa25c707d5b4..20118f86848a 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt @@ -56,9 +56,9 @@ class GenerateCodegenArtifactsTaskTest { assertThat(task.nodeExecutableAndArgs.get()).isEqualTo(listOf("npm", "help")) assertThat(task.codegenJavaPackageName.get()).isEqualTo("com.example.test") assertThat(task.libraryName.get()).isEqualTo("example-test") - assertThat(task.inputs.properties.containsKey("nodeExecutableAndArgs")).exists() - assertThat(task.inputs.properties.containsKey("codegenJavaPackageName")).exists() - assertThat(task.inputs.properties.containsKey("libraryName")).exists() +assertThat(task.inputs.properties).containsKeys( + "nodeExecutableAndArgs", "codegenJavaPackageName", "libraryName" + ) } @Test From 16cb291a234f53f923d7c43814be8e85ac05748d Mon Sep 17 00:00:00 2001 From: "Antony M. Kithinzi" Date: Thu, 1 Aug 2024 16:56:50 +0300 Subject: [PATCH 4/4] typos --- .../react/tasks/GenerateCodegenArtifactsTaskTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt index 20118f86848a..2199050c48e4 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt @@ -56,7 +56,7 @@ class GenerateCodegenArtifactsTaskTest { assertThat(task.nodeExecutableAndArgs.get()).isEqualTo(listOf("npm", "help")) assertThat(task.codegenJavaPackageName.get()).isEqualTo("com.example.test") assertThat(task.libraryName.get()).isEqualTo("example-test") -assertThat(task.inputs.properties).containsKeys( + assertThat(task.inputs.properties).containsKeys( "nodeExecutableAndArgs", "codegenJavaPackageName", "libraryName" ) } @@ -76,7 +76,7 @@ assertThat(task.inputs.properties).containsKeys( task.setupCommandLine("example-test", "com.example.test") - assertThat(task.CommandLine).containsExactly( + assertThat(task.commandLine).containsExactly( "--verbose", File(reactNativeDir, "scripts/generate-specs-cli.js").toString(), "--platform", @@ -108,7 +108,7 @@ assertThat(task.inputs.properties).containsKeys( task.setupCommandLine("example-test", "com.example.test") - assertThat(task.CommandLine).containsExactly( + assertThat(task.commandLine).containsExactly( "cmd", "/c", "--verbose",