-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Semantic matching basics #4788 #4793
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
markdevocht
wants to merge
7
commits into
master
Choose a base branch
from
feat/semantic-matching-#4788
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
becee3f
Semantic matching basics #4788
markdevocht f85f86a
100% threshold pass with new tests
markdevocht d2a8dff
Semantic Types update
markdevocht 368b454
Detox changes:
markdevocht bb366fc
update of some changes
markdevocht df24ee9
Updated code with refactoring and new functionality
markdevocht e590858
Merge branch 'master' into feat/semantic-matching-#4788
markdevocht File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // Mock the semanticTypes module before importing anything that depends on it | ||
| jest.mock('../../utils/semanticTypes', () => ({ | ||
| getAvailableSemanticTypes: jest.fn(), | ||
| getClassNamesForSemanticType: jest.fn() | ||
| })); | ||
|
|
||
|
|
||
| const DetoxRuntimeError = require('../../errors/DetoxRuntimeError'); | ||
| const semanticTypes = require('../../utils/semanticTypes'); | ||
|
|
||
| const { TypeMatcher } = require('./native'); | ||
|
|
||
| describe('Native Matchers', () => { | ||
| describe('TypeMatcher', () => { | ||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('should throw error when semantic type has no class names', () => { | ||
| // Mock getAvailableSemanticTypes to include a test semantic type | ||
| semanticTypes.getAvailableSemanticTypes.mockReturnValue(['test-semantic-type']); | ||
|
|
||
| // Mock getClassNamesForSemanticType to return empty array | ||
| semanticTypes.getClassNamesForSemanticType.mockReturnValue([]); | ||
|
|
||
| expect(() => { | ||
| new TypeMatcher('test-semantic-type'); | ||
| }).toThrow(DetoxRuntimeError); | ||
|
|
||
| expect(() => { | ||
| new TypeMatcher('test-semantic-type'); | ||
| }).toThrow('No class names found for semantic type: test-semantic-type'); | ||
| }); | ||
|
|
||
| it('should handle regular class names when not a semantic type', () => { | ||
| // Mock getAvailableSemanticTypes to not include the test class | ||
| semanticTypes.getAvailableSemanticTypes.mockReturnValue([]); | ||
|
|
||
| // Should not throw and should work with regular class names | ||
| expect(() => { | ||
| new TypeMatcher('com.example.CustomView'); | ||
| }).not.toThrow(); | ||
| }); | ||
|
|
||
| it('should handle semantic types with valid class names', () => { | ||
| // Mock getAvailableSemanticTypes to include a test semantic type | ||
| semanticTypes.getAvailableSemanticTypes.mockReturnValue(['image']); | ||
|
|
||
| // Mock getClassNamesForSemanticType to return valid class names | ||
| semanticTypes.getClassNamesForSemanticType.mockReturnValue([ | ||
| 'android.widget.ImageView', | ||
| 'com.facebook.react.views.image.ReactImageView' | ||
| ]); | ||
|
|
||
| expect(() => { | ||
| new TypeMatcher('image'); | ||
| }).not.toThrow(); | ||
| }); | ||
| }); | ||
| }); |
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
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
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,99 @@ | ||
| /** | ||
| * Semantic type mappings for cross-platform component matching | ||
| */ | ||
|
|
||
| const SEMANTIC_TYPE_MAPPINGS = { | ||
| // Images | ||
| 'image': { | ||
| ios: ['RCTImageView', 'UIImageView'], | ||
| android: ['android.widget.ImageView', 'com.facebook.react.views.image.ReactImageView'] | ||
| }, | ||
|
|
||
| // Input fields | ||
| 'input-field': { | ||
| ios: ['RCTTextInput', 'RCTMultilineTextInput', 'UITextField', 'UITextView'], | ||
| android: ['android.widget.EditText', 'com.facebook.react.views.textinput.ReactEditText'] | ||
| }, | ||
|
|
||
| // Text elements | ||
| 'text': { | ||
| ios: ['RCTText', 'UILabel'], | ||
| android: ['android.widget.TextView', 'com.facebook.react.views.text.ReactTextView'] | ||
| }, | ||
|
|
||
| // Button elements | ||
| 'button': { | ||
| ios: ['RCTButton', 'UIButton'], | ||
| android: ['android.widget.Button', 'com.facebook.react.views.view.ReactViewGroup'] | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }, | ||
|
|
||
| // Scroll containers | ||
| 'scrollview': { | ||
| ios: ['RCTScrollView', 'UIScrollView'], | ||
| android: ['android.widget.ScrollView', 'androidx.core.widget.NestedScrollView', 'com.facebook.react.views.scroll.ReactScrollView'] | ||
| }, | ||
|
|
||
| // Lists | ||
| 'list': { | ||
| ios: ['RCTFlatList', 'UITableView', 'UICollectionView'], | ||
| android: ['android.widget.ListView', 'androidx.recyclerview.widget.RecyclerView', 'com.facebook.react.views.scroll.ReactScrollView'] | ||
| }, | ||
|
|
||
| // Switches/Toggles | ||
| 'switch': { | ||
| ios: ['RCTSwitch', 'UISwitch'], | ||
| android: ['android.widget.Switch', 'androidx.appcompat.widget.SwitchCompat', 'com.facebook.react.views.switchview.ReactSwitch'] | ||
| }, | ||
|
|
||
| // Sliders | ||
| 'slider': { | ||
| ios: ['RCTSlider', 'UISlider'], | ||
| android: ['android.widget.SeekBar', 'com.facebook.react.views.slider.ReactSlider'] | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }, | ||
|
|
||
| // Picker/Selector | ||
| 'picker': { | ||
| ios: ['RCTPicker', 'UIPickerView'], | ||
| android: ['android.widget.Spinner', 'com.facebook.react.views.picker.ReactPickerManager'] | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }, | ||
|
|
||
| // Activity indicators/Progress | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 'activity-indicator': { | ||
| ios: ['RCTActivityIndicatorView', 'UIActivityIndicatorView'], | ||
| android: ['android.widget.ProgressBar', 'com.facebook.react.views.progressbar.ReactProgressBarViewManager'] | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Get platform-specific class names for a semantic type | ||
| * @param {string} semanticType - The semantic type (e.g., 'image', 'input-field') | ||
| * @param {string} platform - The platform ('ios' or 'android') | ||
| * @returns {string[]} Array of class names for the platform | ||
| */ | ||
| function getClassNamesForSemanticType(semanticType, platform) { | ||
| const mapping = SEMANTIC_TYPE_MAPPINGS[semanticType]; | ||
| if (!mapping) { | ||
| throw new Error(`Unknown semantic type: ${semanticType}. Available types: ${Object.keys(SEMANTIC_TYPE_MAPPINGS).join(', ')}`); | ||
| } | ||
|
|
||
| const classNames = mapping[platform]; | ||
| if (!classNames) { | ||
| throw new Error(`Platform ${platform} not supported for semantic type ${semanticType}`); | ||
| } | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| return classNames; | ||
| } | ||
|
|
||
| /** | ||
| * Get all available semantic types | ||
| * @returns {string[]} Array of available semantic type names | ||
| */ | ||
| function getAvailableSemanticTypes() { | ||
| return Object.keys(SEMANTIC_TYPE_MAPPINGS); | ||
| } | ||
|
|
||
| module.exports = { | ||
| SEMANTIC_TYPE_MAPPINGS, | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| getClassNamesForSemanticType, | ||
markdevocht marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| getAvailableSemanticTypes | ||
| }; | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.