kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-05 22:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert D5556439: [react-native][PR] Native Animated - Restore default values when removing props on Android

Browse Source 
Differential Revision: D5556439

fbshipit-source-id: dc0e4c1db25ec7f3631e6f684f9497962f2adc7b
This commit is contained in:
Omer Strulovich
2017-08-04 15:49:02 -07:00
committed by Facebook Github Bot
parent aa9a40f68f
commit 259eac8c30
10 changed files with 73 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
View File

@@ -19,7 +19,6 @@ rn_robolectric_test(
react_native_target("java/com/facebook/react/animated:animated"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/modules/core:core"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_tests_target("java/com/facebook/react/bridge:testhelpers"),
],

123
ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedModuleTest.java
View File

@@ -1,123 +0,0 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
package com.facebook.react.animated;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.modules.core.ReactChoreographer;
import com.facebook.react.uimanager.NativeViewHierarchyManager;
import com.facebook.react.uimanager.UIBlock;
import com.facebook.react.uimanager.UIManagerModule;
import com.facebook.react.uimanager.events.EventDispatcher;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareEverythingForTest;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@PrepareEverythingForTest
@RunWith(RobolectricTestRunner.class)
@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*"})
public class NativeAnimatedModuleTest {
private NativeAnimatedModule mNativeAnimatedModule;
private NativeAnimatedNodesManager mNodeManager;
private UIManagerModule mUIManager;
private List<UIBlock> mUIBlocks;
private void flushUIBlocks() {
mNativeAnimatedModule.willDispatchViewUpdates(mUIManager);
for (UIBlock block : mUIBlocks) {
block.execute(mock(NativeViewHierarchyManager.class));
}
mUIBlocks.clear();
}
@Before
public void setUp() {
ReactApplicationContext context = mock(ReactApplicationContext.class);
mUIManager = mock(UIManagerModule.class);
PowerMockito.doReturn(mock(EventDispatcher.class)).when(mUIManager).getEventDispatcher();
PowerMockito.doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
mUIBlocks.add(invocation.getArgumentAt(0, UIBlock.class));
return null;
}
}).when(mUIManager).addUIBlock(any(UIBlock.class));
PowerMockito.doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
mUIBlocks.add(0, invocation.getArgumentAt(0, UIBlock.class));
return null;
}
}).when(mUIManager).prependUIBlock(any(UIBlock.class));
PowerMockito.doReturn(mUIManager).when(context).getNativeModule(UIManagerModule.class);
ReactChoreographer.initialize();
mNativeAnimatedModule = new NativeAnimatedModule(context);
mNativeAnimatedModule.initialize();
mNodeManager = mock(NativeAnimatedNodesManager.class);
mNativeAnimatedModule.setNodesManager(mNodeManager);
mUIBlocks = new ArrayList<>();
}
@Test
public void testNodeManagerSchedulingWaitsForFlush() {
// Make sure operations are not executed until UIManager has flushed it's queue.
mNativeAnimatedModule.connectAnimatedNodeToView(1, 1000);
verify(mNodeManager, never()).connectAnimatedNodeToView(anyInt(), anyInt());
flushUIBlocks();
verify(mNodeManager, times(1)).connectAnimatedNodeToView(anyInt(), anyInt());
}
@Test
public void testNodeManagerSchedulingOperation() {
UIBlock otherBlock = mock(UIBlock.class);
mUIManager.addUIBlock(otherBlock);
mNativeAnimatedModule.connectAnimatedNodeToView(1, 1000);
flushUIBlocks();
// Connect should be called after other UI operations.
InOrder inOrder = inOrder(mNodeManager, otherBlock);
inOrder.verify(otherBlock, times(1)).execute(any(NativeViewHierarchyManager.class));
inOrder.verify(mNodeManager, times(1)).connectAnimatedNodeToView(1, 1000);
}
@Test
public void testNodeManagerSchedulingPreOperation() {
UIBlock otherBlock = mock(UIBlock.class);
mUIManager.addUIBlock(otherBlock);
mNativeAnimatedModule.disconnectAnimatedNodeFromView(1, 1000);
flushUIBlocks();
// Disconnect should be called before other UI operations.
InOrder inOrder = inOrder(mNodeManager, otherBlock);
inOrder.verify(mNodeManager, times(1)).restoreDefaultValues(1, 1000);
inOrder.verify(otherBlock, times(1)).execute(any(NativeViewHierarchyManager.class));
inOrder.verify(mNodeManager, times(1)).disconnectAnimatedNodeFromView(1, 1000);
}
}

47
ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
View File

@@ -992,51 +992,4 @@ public class NativeAnimatedNodeTraversalTest {
verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(10);
}
@Test
public void testRestoreDefaultProps() {
int viewTag = 1000;
int propsNodeTag = 3;
mNativeAnimatedNodesManager.createAnimatedNode(
1,
JavaOnlyMap.of("type", "value", "value", 1d, "offset", 0d));
mNativeAnimatedNodesManager.createAnimatedNode(
2,
JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 1)));
mNativeAnimatedNodesManager.createAnimatedNode(
propsNodeTag,
JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 2)));
mNativeAnimatedNodesManager.connectAnimatedNodes(1, 2);
mNativeAnimatedNodesManager.connectAnimatedNodes(2, propsNodeTag);
mNativeAnimatedNodesManager.connectAnimatedNodeToView(propsNodeTag, viewTag);
JavaOnlyArray frames = JavaOnlyArray.of(0d, 0.5d, 1d);
Callback animationCallback = mock(Callback.class);
mNativeAnimatedNodesManager.startAnimatingNode(
1,
1,
JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 0d),
animationCallback);
ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
ArgumentCaptor.forClass(ReactStylesDiffMap.class);
reset(mUIImplementationMock);
mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(1);
for (int i = 0; i < frames.size(); i++) {
reset(mUIImplementationMock);
mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
}
verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
reset(mUIImplementationMock);
mNativeAnimatedNodesManager.restoreDefaultValues(propsNodeTag, viewTag);
verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
assertThat(stylesCaptor.getValue().isNull("opacity"));
}
}