From a9f5b3cacced2f0483dfd654dcbb9142a9cf8f20 Mon Sep 17 00:00:00 2001 From: yakupozbaydar Date: Thu, 25 Jul 2024 02:25:49 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=E2=98=82=EF=B8=8F=20Migrate=20UIManag?= =?UTF-8?q?erModuleConstantsHelperTest.kt=20to=20AssertJ=20(#45648)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Issue: https://github.com/facebook/react-native/issues/45596 ## Changelog: [INTERNAL] [CHANGED] - Migrate UIManagerModuleConstantsHelperTest.kt to AssertJ testing library Pull Request resolved: https://github.com/facebook/react-native/pull/45648 Test Plan: Run ./gradlew -p packages/gradle-plugin test Reviewed By: christophpurrer Differential Revision: D60178766 Pulled By: cortinico fbshipit-source-id: 480e2d9d4bab2ca4e46b05cda0b107ab9e024136 --- .../UIManagerModuleConstantsHelperTest.kt | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelperTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelperTest.kt index 2f3e0af7fe3..1ad0ccc4776 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelperTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelperTest.kt @@ -8,10 +8,7 @@ package com.facebook.react.uimanager import com.facebook.react.common.MapBuilder -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertTrue +import org.assertj.core.api.Assertions.assertThat import org.junit.Test class UIManagerModuleConstantsHelperTest { @@ -24,7 +21,7 @@ class UIManagerModuleConstantsHelperTest { fun normalizeEventTypes_withEmptyMap_doesNothing() { val emptyMap: Map = MapBuilder.builder().build() UIManagerModuleConstantsHelper.normalizeEventTypes(emptyMap) - assertTrue(emptyMap.isEmpty()) + assertThat(emptyMap.isEmpty()).isTrue() } @Test @@ -32,8 +29,7 @@ class UIManagerModuleConstantsHelperTest { val onClickMap: Map = MapBuilder.builder().put("onClick", "¯\\_(ツ)_/¯").build() UIManagerModuleConstantsHelper.normalizeEventTypes(onClickMap) - assertTrue(onClickMap.containsKey("topClick")) - assertTrue(onClickMap.containsKey("onClick")) + assertThat(onClickMap).containsKeys("topClick", "onClick") } @Test @@ -41,8 +37,7 @@ class UIManagerModuleConstantsHelperTest { val onClickMap: Map = MapBuilder.builder().put("topOnClick", "¯\\_(ツ)_/¯").build() UIManagerModuleConstantsHelper.normalizeEventTypes(onClickMap) - assertTrue(onClickMap.containsKey("topOnClick")) - assertFalse(onClickMap.containsKey("onClick")) + assertThat(onClickMap).containsKey("topOnClick").doesNotContainKey("onClick") } @Suppress("UNCHECKED_CAST") @@ -58,21 +53,25 @@ class UIManagerModuleConstantsHelperTest { "bubbled", "onColorChanged", "captured", "onColorChangedCapture"))) .build() UIManagerModuleConstantsHelper.normalizeEventTypes(nestedObjects) - assertTrue(nestedObjects.containsKey("topColorChanged")) + assertThat(nestedObjects).containsKey("topColorChanged") var innerMap = nestedObjects["topColorChanged"] as? Map - assertNotNull(innerMap) - assertTrue(innerMap!!.containsKey("phasedRegistrationNames")) - var innerInnerMap = innerMap.get("phasedRegistrationNames") as? Map - assertNotNull(innerInnerMap) - assertEquals("onColorChanged", innerInnerMap!!.get("bubbled")) - assertEquals("onColorChangedCapture", innerInnerMap.get("captured")) - assertTrue(nestedObjects.containsKey("onColorChanged")) - innerMap = nestedObjects.get("topColorChanged") as? Map - assertNotNull(innerMap) - assertTrue(innerMap!!.containsKey("phasedRegistrationNames")) - innerInnerMap = innerMap.get("phasedRegistrationNames") as? Map - assertNotNull(innerInnerMap) - assertEquals("onColorChanged", innerInnerMap!!.get("bubbled")) - assertEquals("onColorChangedCapture", innerInnerMap.get("captured")) + assertThat(innerMap).isNotNull() + requireNotNull(innerMap) + assertThat(innerMap).containsKey("phasedRegistrationNames") + var innerInnerMap = innerMap["phasedRegistrationNames"] as? Map + assertThat(innerInnerMap).isNotNull() + requireNotNull(innerInnerMap) + assertThat("onColorChanged").isEqualTo(innerInnerMap["bubbled"]) + assertThat("onColorChangedCapture").isEqualTo(innerInnerMap["captured"]) + assertThat(nestedObjects).containsKey("onColorChanged") + innerMap = nestedObjects["topColorChanged"] as? Map + assertThat(innerMap).isNotNull() + requireNotNull(innerMap) + assertThat(innerMap).containsKey("phasedRegistrationNames") + innerInnerMap = innerMap["phasedRegistrationNames"] as? Map + assertThat(innerInnerMap).isNotNull() + requireNotNull(innerInnerMap) + assertThat("onColorChanged").isEqualTo(innerInnerMap["bubbled"]) + assertThat("onColorChangedCapture").isEqualTo(innerInnerMap["captured"]) } }