Skip to content

Commit a649100

Browse files
mdvaccafacebook-github-bot
authored andcommitted
Use ReactNativeFeatureFlagsForTests in uimanager tests (facebook#50594)
Summary: Pull Request resolved: facebook#50594 Some tests are failing due to unsatisfied error when looking for C++ classes of feature flags, we fix this by calling ReactNativeFeatureFlagsForTests.setup() changelog: [internal] internal Reviewed By: yungsters, sbuggay Differential Revision: D72721786 fbshipit-source-id: c41c05428b1f99db9b03bb67cd9ddc47ebec84b5
1 parent 06ad33b commit a649100

11 files changed

Lines changed: 48 additions & 0 deletions

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
package com.facebook.react.uimanager
99

1010
import android.content.Context
11+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1112
import com.facebook.react.uimanager.style.BorderRadiusProp
1213
import com.facebook.react.uimanager.style.BorderRadiusStyle
1314
import com.facebook.react.uimanager.style.ComputedBorderRadiusProp
1415
import com.facebook.react.uimanager.style.CornerRadii
1516
import org.assertj.core.api.Assertions.*
17+
import org.junit.Before
1618
import org.junit.Test
1719
import org.junit.runner.RunWith
1820
import org.robolectric.RobolectricTestRunner
@@ -67,6 +69,11 @@ class BorderRadiusStyleTest {
6769
}
6870
}
6971

72+
@Before
73+
fun setup() {
74+
ReactNativeFeatureFlagsForTests.setUp()
75+
}
76+
7077
@Test
7178
fun testCorrectPriorityRTL() {
7279
setContextLeftAndRightSwap(ctx, true)

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/JSPointerDispatcherTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import android.view.View
1515
import android.view.ViewGroup
1616
import android.widget.LinearLayout
1717
import android.widget.TextView
18+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1819
import com.facebook.react.uimanager.events.Event
1920
import com.facebook.react.uimanager.events.EventDispatcher
2021
import com.facebook.react.uimanager.events.PointerEventHelper
@@ -42,6 +43,7 @@ class JSPointerDispatcherTest {
4243

4344
@Before
4445
fun setupViewHierarchy() {
46+
ReactNativeFeatureFlagsForTests.setUp()
4547
val ctx: Context = RuntimeEnvironment.getApplication()
4648
root = LinearLayout(ctx)
4749
val childView = TextView(ctx)

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/MatrixMathHelperTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,22 @@
77

88
package com.facebook.react.uimanager
99

10+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1011
import com.facebook.react.uimanager.MatrixMathHelper.MatrixDecompositionContext
1112
import kotlin.math.cos
1213
import kotlin.math.sin
1314
import org.assertj.core.api.Assertions.assertThat
15+
import org.junit.Before
1416
import org.junit.Test
1517

1618
/** Test for [MatrixMathHelper] */
1719
class MatrixMathHelperTest {
1820

21+
@Before
22+
fun setup() {
23+
ReactNativeFeatureFlagsForTests.setUp()
24+
}
25+
1926
@Test
2027
fun testDecomposing4x4MatrixToProduceAccurateZaxisAngles() {
2128
val ctx = MatrixDecompositionContext()

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/OnLayoutEventTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package com.facebook.react.uimanager
99

1010
import com.facebook.react.common.SystemClock
11+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1112
import org.assertj.core.api.Assertions.assertThat
1213
import org.junit.After
1314
import org.junit.Before
@@ -23,6 +24,7 @@ class OnLayoutEventTest {
2324

2425
@Before
2526
fun setup() {
27+
ReactNativeFeatureFlagsForTests.setUp()
2628
val ts = SystemClock.uptimeMillis()
2729
systemClock = mockStatic(SystemClock::class.java)
2830
systemClock.`when`<Long> { SystemClock.uptimeMillis() }.thenReturn(ts)

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
package com.facebook.react.uimanager
99

1010
import android.view.View
11+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1112
import com.facebook.react.uimanager.annotations.ReactProp
1213
import com.facebook.react.uimanager.annotations.ReactPropGroup
1314
import java.util.Date
15+
import org.junit.Before
1416
import org.junit.Test
1517

1618
/** Test that verifies that spec of methods annotated with @ReactProp is correct */
@@ -31,6 +33,11 @@ class ReactPropAnnotationSetterSpecTest {
3133
override fun updateExtraData(root: View, extraData: Any) = Unit
3234
}
3335

36+
@Before
37+
fun setup() {
38+
ReactNativeFeatureFlagsForTests.setUp()
39+
}
40+
3441
@Test(expected = RuntimeException::class)
3542
fun testMethodWithWrongNumberOfParams() {
3643
object : BaseViewManager() {

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.facebook.react.bridge.JavaOnlyArray
1313
import com.facebook.react.bridge.JavaOnlyMap
1414
import com.facebook.react.bridge.ReadableArray
1515
import com.facebook.react.bridge.ReadableMap
16+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1617
import com.facebook.react.uimanager.annotations.ReactProp
1718
import com.facebook.react.uimanager.annotations.ReactPropGroup
1819
import org.junit.Before
@@ -172,6 +173,7 @@ class ReactPropAnnotationSetterTest {
172173

173174
@Before
174175
fun setup() {
176+
ReactNativeFeatureFlagsForTests.setUp()
175177
updatesReceiverMock = Mockito.mock(ViewManagerUpdatesReceiver::class.java)
176178
viewManager = ViewManagerUnderTest(updatesReceiverMock)
177179
targetView = View(RuntimeEnvironment.getApplication())

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ import android.view.View
1111
import com.facebook.react.bridge.BridgeReactContext
1212
import com.facebook.react.bridge.ReadableArray
1313
import com.facebook.react.bridge.ReadableMap
14+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1415
import com.facebook.react.uimanager.annotations.ReactProp
1516
import com.facebook.react.uimanager.annotations.ReactPropGroup
1617
import org.assertj.core.api.Assertions
18+
import org.junit.Before
1719
import org.junit.Test
1820
import org.junit.runner.RunWith
1921
import org.robolectric.RobolectricTestRunner
@@ -84,6 +86,11 @@ class ReactPropConstantsTest {
8486
fun customIntGroupProp(v: View?, index: Int, value: Int?) = Unit
8587
}
8688

89+
@Before
90+
fun setup() {
91+
ReactNativeFeatureFlagsForTests.setUp()
92+
}
93+
8794
@Test
8895
fun testNativePropsIncludeCorrectTypes() {
8996
val viewManagers = listOf<ViewManager<*, *>>(ViewManagerUnderTest())

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.facebook.react.bridge.BridgeReactContext
1111
import com.facebook.react.bridge.JavaOnlyMap
1212
import com.facebook.react.bridge.ReadableArray
1313
import com.facebook.react.bridge.ReadableMap
14+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1415
import com.facebook.react.uimanager.annotations.ReactProp
1516
import com.facebook.react.uimanager.annotations.ReactPropGroup
1617
import com.facebook.testutils.shadows.ShadowSoLoader
@@ -101,6 +102,7 @@ class ReactPropForShadowNodeSetterTest {
101102

102103
@Before
103104
fun setup() {
105+
ReactNativeFeatureFlagsForTests.setUp()
104106
yogaNodeFactory = mockStatic(YogaNodeFactory::class.java)
105107
yogaNodeFactory
106108
.`when`<YogaNode> { YogaNodeFactory.create(any()) }

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package com.facebook.react.uimanager
99

1010
import android.view.View
11+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
1112
import com.facebook.react.uimanager.annotations.ReactProp
1213
import com.facebook.react.uimanager.annotations.ReactPropGroup
1314
import com.facebook.testutils.shadows.ShadowSoLoader
@@ -39,6 +40,7 @@ class ReactPropForShadowNodeSpecTest {
3940

4041
@Before
4142
fun setup() {
43+
ReactNativeFeatureFlagsForTests.setUp()
4244
yogaNodeFactory = mockStatic(YogaNodeFactory::class.java)
4345
yogaNodeFactory
4446
.`when`<YogaNode> { YogaNodeFactory.create(any()) }

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.facebook.react.bridge.CatalystInstance
1717
import com.facebook.react.bridge.JavaOnlyMap
1818
import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
1919
import com.facebook.react.bridge.ReadableMap
20+
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
2021
import com.facebook.react.touch.JSResponderHandler
2122
import com.facebook.react.uimanager.annotations.ReactProp
2223
import org.assertj.core.api.Assertions
@@ -55,6 +56,7 @@ class SimpleViewPropertyTest {
5556

5657
@Before
5758
fun setup() {
59+
ReactNativeFeatureFlagsForTests.setUp()
5860
context = BridgeReactContext(RuntimeEnvironment.getApplication())
5961
catalystInstanceMock = createMockCatalystInstance()
6062
context.initializeWithInstance(catalystInstanceMock)

0 commit comments

Comments
 (0)