-
Notifications
You must be signed in to change notification settings - Fork 24.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Dimensions not updating on Android #31973
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
168 changes: 168 additions & 0 deletions
168
ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| /* | ||
| * Copyright (c) Facebook, Inc. and its affiliates. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| package com.facebook.react.modules.deviceinfo; | ||
|
|
||
| import static org.fest.assertions.api.Assertions.assertThat; | ||
| import static org.mockito.ArgumentMatchers.eq; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.spy; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.verifyNoMoreInteractions; | ||
| import static org.mockito.Mockito.when; | ||
| import static org.powermock.api.mockito.PowerMockito.mockStatic; | ||
|
|
||
| import com.facebook.react.bridge.Arguments; | ||
| import com.facebook.react.bridge.CatalystInstance; | ||
| import com.facebook.react.bridge.JavaOnlyMap; | ||
| import com.facebook.react.bridge.ReactApplicationContext; | ||
| import com.facebook.react.bridge.ReactTestHelper; | ||
| import com.facebook.react.bridge.WritableMap; | ||
| import com.facebook.react.modules.core.DeviceEventManagerModule; | ||
| import com.facebook.react.uimanager.DisplayMetricsHolder; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import junit.framework.TestCase; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.ArgumentCaptor; | ||
| import org.mockito.invocation.InvocationOnMock; | ||
| import org.mockito.stubbing.Answer; | ||
| import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||
| import org.powermock.core.classloader.annotations.PrepareForTest; | ||
| import org.powermock.modules.junit4.rule.PowerMockRule; | ||
| import org.robolectric.RobolectricTestRunner; | ||
| import org.robolectric.RuntimeEnvironment; | ||
|
|
||
| @RunWith(RobolectricTestRunner.class) | ||
| @PrepareForTest({Arguments.class, DisplayMetricsHolder.class}) | ||
| @PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"}) | ||
| public class DeviceInfoModuleTest extends TestCase { | ||
|
|
||
| @Rule public PowerMockRule rule = new PowerMockRule(); | ||
|
|
||
| private DeviceInfoModule mDeviceInfoModule; | ||
| private DeviceEventManagerModule.RCTDeviceEventEmitter mRCTDeviceEventEmitterMock; | ||
|
|
||
| private WritableMap fakePortraitDisplayMetrics; | ||
| private WritableMap fakeLandscapeDisplayMetrics; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| initTestData(); | ||
|
|
||
| mockStatic(DisplayMetricsHolder.class); | ||
|
|
||
| mRCTDeviceEventEmitterMock = mock(DeviceEventManagerModule.RCTDeviceEventEmitter.class); | ||
|
|
||
| final ReactApplicationContext context = | ||
| spy(new ReactApplicationContext(RuntimeEnvironment.application)); | ||
| CatalystInstance catalystInstanceMock = ReactTestHelper.createMockCatalystInstance(); | ||
| context.initializeWithInstance(catalystInstanceMock); | ||
| when(context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)) | ||
| .thenReturn(mRCTDeviceEventEmitterMock); | ||
|
|
||
| mDeviceInfoModule = new DeviceInfoModule(context); | ||
| } | ||
|
|
||
| @After | ||
| public void teardown() { | ||
| DisplayMetricsHolder.setWindowDisplayMetrics(null); | ||
| DisplayMetricsHolder.setScreenDisplayMetrics(null); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_itDoesNotEmitAnEvent_whenDisplayMetricsNotChanged() { | ||
| givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics); | ||
|
|
||
| mDeviceInfoModule.getTypedExportedConstants(); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
|
|
||
| verifyNoMoreInteractions(mRCTDeviceEventEmitterMock); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_itEmitsOneEvent_whenDisplayMetricsChangedOnce() { | ||
| givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics); | ||
|
|
||
| mDeviceInfoModule.getTypedExportedConstants(); | ||
| givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
|
|
||
| verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_itEmitsJustOneEvent_whenUpdateRequestedMultipleTimes() { | ||
| givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics); | ||
| mDeviceInfoModule.getTypedExportedConstants(); | ||
| givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
|
|
||
| verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_itEmitsMultipleEvents_whenDisplayMetricsChangedBetweenUpdates() { | ||
| givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics); | ||
|
|
||
| mDeviceInfoModule.getTypedExportedConstants(); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
| givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
| givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
| givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics); | ||
| mDeviceInfoModule.emitUpdateDimensionsEvent(); | ||
|
|
||
| verifyUpdateDimensionsEventsEmitted( | ||
| mRCTDeviceEventEmitterMock, | ||
| fakeLandscapeDisplayMetrics, | ||
| fakePortraitDisplayMetrics, | ||
| fakeLandscapeDisplayMetrics); | ||
| } | ||
|
|
||
| private static void givenDisplayMetricsHolderContains(final WritableMap fakeDisplayMetrics) { | ||
| when(DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)).thenReturn(fakeDisplayMetrics); | ||
| } | ||
|
|
||
| private static void verifyUpdateDimensionsEventsEmitted( | ||
| DeviceEventManagerModule.RCTDeviceEventEmitter emitter, WritableMap... expectedEvents) { | ||
| List<WritableMap> expectedEventList = Arrays.asList(expectedEvents); | ||
| ArgumentCaptor<WritableMap> captor = ArgumentCaptor.forClass(WritableMap.class); | ||
| verify(emitter, times(expectedEventList.size())) | ||
| .emit(eq("didUpdateDimensions"), captor.capture()); | ||
|
|
||
| List<WritableMap> actualEvents = captor.getAllValues(); | ||
| assertThat(actualEvents).isEqualTo(expectedEventList); | ||
| } | ||
|
|
||
| private void initTestData() { | ||
| mockStatic(Arguments.class); | ||
| when(Arguments.createMap()) | ||
| .thenAnswer( | ||
| new Answer<Object>() { | ||
| @Override | ||
| public Object answer(InvocationOnMock invocation) throws Throwable { | ||
| return new JavaOnlyMap(); | ||
| } | ||
| }); | ||
|
|
||
| fakePortraitDisplayMetrics = Arguments.createMap(); | ||
| fakePortraitDisplayMetrics.putInt("width", 100); | ||
| fakePortraitDisplayMetrics.putInt("height", 200); | ||
|
|
||
| fakeLandscapeDisplayMetrics = Arguments.createMap(); | ||
| fakeLandscapeDisplayMetrics.putInt("width", 200); | ||
| fakeLandscapeDisplayMetrics.putInt("height", 100); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What was the logic behind
WritableNativeMapandWritableMap? Sorry I'm not familiar with the differenceThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WritableNativeMapis an implementation of theWritableMapinterface (and that is the implementation that is returned fromDisplayMetricsHolder). But in Java-only test code,WritableNativeMapis not supported and needs to be switched out forJavaOnlyMap. So in order to test this class, it needs to depend onWritableMapinstead.