kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-02 17:47:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert D4770368: [rn] Use tag ids for testID

Browse Source 
Differential Revision: D4770368

fbshipit-source-id: 4bf8131a2a2974c8db072f62e8fb26686faa100d
This commit is contained in:
Andrew Y. Chen
2017-04-04 14:58:47 -07:00
committed by Facebook Github Bot
parent c0b64ce519
commit eb300b60f3
6 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
View File

@@ -21,8 +21,6 @@ android_library(
react_native_dep("third-party/java/junit:junit"),
react_native_dep("third-party/java/mockito:mockito"),
react_native_dep("third-party/java/testing-support-lib:runner"),
react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
react_native_target("java/com/facebook/react:react"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
@@ -34,6 +32,7 @@ android_library(
react_native_target("java/com/facebook/react/modules/debug:interfaces"),
react_native_target("java/com/facebook/react/shell:shell"),
react_native_target("java/com/facebook/react/uimanager:uimanager"),
react_native_target("res:uimanager"),
react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
],
)

7
ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
View File

@@ -17,7 +17,6 @@ import android.view.View;
import android.view.ViewGroup;
import com.facebook.react.NativeModuleRegistryBuilder;
import com.facebook.react.R;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactInstanceManagerBuilder;
import com.facebook.react.bridge.CatalystInstance;
@@ -188,9 +187,7 @@ public class ReactTestHelper {
}
public static String getTestId(View view) {
return view.getTag(R.id.react_test_id) instanceof String
? (String) view.getTag(R.id.react_test_id)
: null;
return view.getTag() instanceof String ? (String) view.getTag() : null;
}
private static View findChild(View root, Predicate<View> predicate) {
@@ -214,7 +211,7 @@ public class ReactTestHelper {
return new Predicate<View>() {
@Override
public boolean apply(View view) {
Object tag = getTestId(view);
Object tag = view.getTag();
return tag != null && tag.equals(tagValue);
}
};