Revert D4770368: [rn] Use tag ids for testID

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
@@ -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);
}
};