[e2e-testing][Appium] Adding support for android:id #9942
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,55 @@ | ||
| package com.facebook.react.common; | ||
|
|
||
| import android.view.View; | ||
|
|
||
| import com.facebook.react.common.annotations.VisibleForTesting; | ||
|
|
||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| public class TestIdUtil { | ||
| private static final ConcurrentHashMap<String, Integer> mTestIds = new ConcurrentHashMap<>(); | ||
| // Integer values in R.class are typically large. To avoid colliding with R.class we | ||
| // use smaller values for ids when no resource id exists. | ||
| private static final int mStartingInternalId = 1; | ||
| private static final AtomicInteger mInternalId = new AtomicInteger(mStartingInternalId); | ||
|
|
||
| /** | ||
| * Looks for defined resource IDs in R.class by the name of testId and if a matching resource ID is | ||
| * found it is passed to the view's setId method. If the given testId cannot be found in R.class, | ||
| * an increment value is assigned instead. | ||
| */ | ||
| public static <T extends View> void setTestId(T view, String testId) { | ||
| int mappedTestId; | ||
| if (!mTestIds.containsKey(testId)) { | ||
| mappedTestId = view.getResources().getIdentifier(testId, "id", view.getContext().getPackageName()); | ||
|
There was a problem hiding this comment. Why do the resource lookup? If you remove this branch and just use the map, there's no need to define ids in the xml file, correct? There was a problem hiding this comment. Ids should be in the xml file so R.class is generated correctly; otherwise, uiautomatorviewer and appium can't associate it to the |
||
| final boolean idNotFoundInResources = mappedTestId <= 0; | ||
| if (idNotFoundInResources) { | ||
| mappedTestId = mInternalId.getAndIncrement(); | ||
| } | ||
| mTestIds.put(testId, mappedTestId); | ||
| } else { | ||
| mappedTestId = mTestIds.get(testId); | ||
| } | ||
|
|
||
| if (mappedTestId != 0 && view.getId() != mappedTestId) { | ||
| view.setId(mappedTestId); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Used for e2e tests that do not yet have testIDs stored in ids.xml. It is strongly | ||
| * advised that you reference ids that have been generated in R.class to avoid collisions and | ||
| * to properly support UIAutomatorViewer. | ||
| */ | ||
| @VisibleForTesting | ||
| public static int getTestId(String testId) { | ||
| return mTestIds.containsKey(testId) ? mTestIds.get(testId) : View.NO_ID; | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| public static void resetStateInTest() { | ||
| mTestIds.clear(); | ||
| mInternalId.set(mStartingInternalId); | ||
| } | ||
| } | ||
This file contains hidden or 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,16 @@ | ||
| package com.facebook.react.common; | ||
|
|
||
| import android.view.View; | ||
|
|
||
| public class ViewMethodsUtil { | ||
|
There was a problem hiding this comment. nit: There was a problem hiding this comment. Android has a |
||
|
|
||
| /** | ||
| * Returns the react tag for the view. If no react tag has been set then {@link View#NO_ID} is | ||
| * returned. | ||
| */ | ||
| public static int reactTagFor(View view) { | ||
| return view == null || view.getTag() == null ? | ||
| View.NO_ID : | ||
| (int) view.getTag(); | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Interesting approach!
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.
Thanks! I couldn't think of a better one. The resource ids need to be created at compile time in order for uiautomatorviewer to recognize them.