Skip to content

Commit f473eba

Browse files
committed
Fix tests
1 parent 381825d commit f473eba

1 file changed

Lines changed: 25 additions & 11 deletions

File tree

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,25 +90,37 @@ class DisplayMetricsHolderTest {
9090
}
9191

9292
@Test
93-
fun initDisplayMetrics_setsMetrics() {
94-
DisplayMetricsHolder.initDisplayMetrics(context)
95-
assertThat(DisplayMetricsHolder.getWindowDisplayMetrics()).isNotNull()
93+
fun initScreenDisplayMetrics_setsMetrics() {
94+
DisplayMetricsHolder.initScreenDisplayMetrics(context)
9695
assertThat(DisplayMetricsHolder.getScreenDisplayMetrics()).isNotNull()
9796
}
9897

9998
@Test
100-
fun initDisplayMetricsIfNotInitialized_onlyInitializesOnce() {
101-
DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
102-
val firstWindow = DisplayMetricsHolder.getWindowDisplayMetrics()
99+
fun initWindowDisplayMetrics_setsMetrics() {
100+
DisplayMetricsHolder.initWindowDisplayMetrics(context)
101+
assertThat(DisplayMetricsHolder.getWindowDisplayMetrics()).isNotNull()
102+
}
103+
104+
@Test
105+
fun initScreenDisplayMetricsIfNotInitialized_onlyInitializesOnce() {
106+
DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(context)
103107
val firstScreen = DisplayMetricsHolder.getScreenDisplayMetrics()
104108
// Should not reinitialize
105-
DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
106-
val secondWindow = DisplayMetricsHolder.getWindowDisplayMetrics()
109+
DisplayMetricsHolder.initScreenDisplayMetricsIfNotInitialized(context)
107110
val secondScreen = DisplayMetricsHolder.getScreenDisplayMetrics()
108-
assertThat(secondWindow).isEqualTo(firstWindow)
109111
assertThat(secondScreen).isEqualTo(firstScreen)
110112
}
111113

114+
@Test
115+
fun initWindowDisplayMetricsIfNotInitialized_onlyInitializesOnce() {
116+
DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(context)
117+
val firstWindow = DisplayMetricsHolder.getWindowDisplayMetrics()
118+
// Should not reinitialize
119+
DisplayMetricsHolder.initWindowDisplayMetricsIfNotInitialized(context)
120+
val secondWindow = DisplayMetricsHolder.getWindowDisplayMetrics()
121+
assertThat(secondWindow).isEqualTo(firstWindow)
122+
}
123+
112124
@Test(expected = IllegalStateException::class)
113125
fun getDisplayMetricsWritableMap_failsIfNotInitialized() {
114126
DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)
@@ -117,7 +129,8 @@ class DisplayMetricsHolderTest {
117129
@Test
118130
fun getDisplayMetricsWritableMap_returnsCorrectMap() {
119131
// Use the official initialization method to ensure both metrics are set
120-
DisplayMetricsHolder.initDisplayMetrics(context)
132+
DisplayMetricsHolder.initScreenDisplayMetrics(context)
133+
DisplayMetricsHolder.initWindowDisplayMetrics(context)
121134
val map: WritableMap = DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)
122135
assertThat(map.hasKey("windowPhysicalPixels")).isTrue()
123136
assertThat(map.hasKey("screenPhysicalPixels")).isTrue()
@@ -135,7 +148,8 @@ class DisplayMetricsHolderTest {
135148
@Test
136149
@RequiresApi(30)
137150
fun getEncodedScreenSizeWithoutVerticalInsets_returnsEncodedValue() {
138-
DisplayMetricsHolder.initDisplayMetrics(context)
151+
DisplayMetricsHolder.initScreenDisplayMetrics(context)
152+
DisplayMetricsHolder.initWindowDisplayMetrics(context)
139153

140154
val activity: Activity = mock()
141155
val window: Window = mock()

0 commit comments

Comments
 (0)