From 38089753efdfa5736e119ef206ed4e8ccf37f730 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnykov <omelnykov@fb.com>
Date: Fri, 30 Aug 2019 09:39:04 -0700
Subject: [PATCH] Fix tests for JS codegen by renaming conflicting props

Summary:
** Summary of failures encountered during the build **
Rule //fbandroid/java/com/facebook/catalyst/launcher:app_prod_debug FAILED because Command failed with exit code 1.
stderr: /java/InterfaceOnlyNativeComponentViewManagerDelegate.java:18: error: reference to setAccessibilityHint is ambiguous
        mViewManager.setAccessibilityHint(view, value == null ? "" : (String) value);
                    ^
  both method setAccessibilityHint(T,java.lang.String) in com.facebook.react.uimanager.BaseViewManagerInterface and method setAccessibilityHint(T,java.lang.String) in com.facebook.react.viewmanagers.InterfaceOnlyNativeComponentViewManagerInterface match
/java/StringPropNativeComponentViewManagerDelegate.java:18: error: reference to setAccessibilityHint is ambiguous
        mViewManager.setAccessibilityHint(view, value == null ? "" : (String) value);
                    ^
  both method setAccessibilityHint(T,java.lang.String) in com.facebook.react.uimanager.BaseViewManagerInterface and method setAccessibilityHint(T,java.lang.String) in com.facebook.react.viewmanagers.StringPropNativeComponentViewManagerInterface match
/java/StringPropNativeComponentViewManagerDelegate.java:21: error: reference to setAccessibilityRole is ambiguous
        mViewManager.setAccessibilityRole(view, value == null ? null : (String) value);
                    ^
  both method setAccessibilityRole(T,java.lang.String) in com.facebook.react.uimanager.BaseViewManagerInterface and method setAccessibilityRole(T,java.lang.String) in com.facebook.react.viewmanagers.StringPropNativeComponentViewManagerInterface match
Errors: 3. Warnings: 0.

    When running <javac_jar>.
    When building rule //xplat/js/react-native-github/packages/react-native-codegen:generated_components_java-codegen_testsAndroid.
```

Reviewed By: mdvacca

Differential Revision: D17107929

fbshipit-source-id: 32bc553d450628c530e22cb13f305e3a3e0f45cd
---
 .../java/InterfaceOnlyNativeComponentViewManager.java         | 2 +-
 .../buck_tests/java/StringPropNativeComponentViewManager.java | 4 ++--
 .../components/InterfaceOnlyNativeComponent.js                | 2 +-
 .../__test_fixtures__/components/StringPropNativeComponent.js | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-native-codegen/buck_tests/java/InterfaceOnlyNativeComponentViewManager.java b/packages/react-native-codegen/buck_tests/java/InterfaceOnlyNativeComponentViewManager.java
index afd9e9c4b23..6a5da721165 100644
--- a/packages/react-native-codegen/buck_tests/java/InterfaceOnlyNativeComponentViewManager.java
+++ b/packages/react-native-codegen/buck_tests/java/InterfaceOnlyNativeComponentViewManager.java
@@ -26,5 +26,5 @@ public class InterfaceOnlyNativeComponentViewManager extends SimpleViewManager<V
   }
 
   @Override
-  public void setAccessibilityHint(ViewGroup view, String value) {}
+  public void setTitle(ViewGroup view, String value) {}
 }
diff --git a/packages/react-native-codegen/buck_tests/java/StringPropNativeComponentViewManager.java b/packages/react-native-codegen/buck_tests/java/StringPropNativeComponentViewManager.java
index 3a0ebb41a27..f47d7f0f7c3 100644
--- a/packages/react-native-codegen/buck_tests/java/StringPropNativeComponentViewManager.java
+++ b/packages/react-native-codegen/buck_tests/java/StringPropNativeComponentViewManager.java
@@ -25,8 +25,8 @@ public class StringPropNativeComponentViewManager extends SimpleViewManager<View
   }
 
   @Override
-  public void setAccessibilityHint(ViewGroup view, String value) {}
+  public void setPlaceholder(ViewGroup view, String value) {}
 
   @Override
-  public void setAccessibilityRole(ViewGroup view, String value) {}
+  public void setDefaultValue(ViewGroup view, String value) {}
 }
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js
index 7d662ffd6c5..0e8756f2875 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js
@@ -22,7 +22,7 @@ type NativeProps = $ReadOnly<{|
   ...ViewProps,
 
   // Props
-  accessibilityHint?: WithDefault<string, ''>,
+  title?: WithDefault<string, ''>,
 
   // Events
   onChange?: ?BubblingEventHandler<$ReadOnly<{|value: boolean|}>>,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js
index b23d385a948..24710cbb2ee 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js
@@ -19,8 +19,8 @@ type NativeProps = $ReadOnly<{|
   ...ViewProps,
 
   // Props
-  accessibilityHint?: WithDefault<string, ''>,
-  accessibilityRole?: string,
+  placeholder?: WithDefault<string, ''>,
+  defaultValue?: string,
 |}>;
 
 export default (codegenNativeComponent<NativeProps>(