Skip to content

Commit

Permalink
move traits matcher to generated code
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielMSchmidt
DanielMSchmidt committed Oct 18, 2017
1 parent 00e622a commit da2619a
Show file tree
Hide file tree
Showing 9 changed files with 167 additions and 26 deletions.
27 changes: 27 additions & 0 deletions detox/src/ios/earlgreyapi/GREYActions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,33 @@ function sanitize_greyContentEdge(action) {
}
}

function sanitize_uiAccessibilityTraits(value) {
let traits = 0;
for (let i = 0; i < value.length; i++) {
switch (value[i]) {
case 'button': traits |= 1; break;
case 'link': traits |= 2; break;
case 'header': traits |= 4; break;
case 'search': traits |= 8; break;
case 'image': traits |= 16; break;
case 'selected': traits |= 32; break;
case 'plays': traits |= 64; break;
case 'key': traits |= 128; break;
case 'text': traits |= 256; break;
case 'summary': traits |= 512; break;
case 'disabled': traits |= 1024; break;
case 'frequentUpdates': traits |= 2048; break;
case 'startsMedia': traits |= 4096; break;
case 'adjustable': traits |= 8192; break;
case 'allowsDirectInteraction': traits |= 16384; break;
case 'pageTurn': traits |= 32768; break;
default: throw new Error(`Unknown trait '${value[i]}', see list in https://facebook.github.io/react-native/docs/accessibility.html#accessibilitytraits-ios`);
}
}

return traits;
}



class GREYActions {
Expand Down
27 changes: 27 additions & 0 deletions detox/src/ios/earlgreyapi/GREYMatchers+Detox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,33 @@ function sanitize_greyContentEdge(action) {
}
}

function sanitize_uiAccessibilityTraits(value) {
let traits = 0;
for (let i = 0; i < value.length; i++) {
switch (value[i]) {
case 'button': traits |= 1; break;
case 'link': traits |= 2; break;
case 'header': traits |= 4; break;
case 'search': traits |= 8; break;
case 'image': traits |= 16; break;
case 'selected': traits |= 32; break;
case 'plays': traits |= 64; break;
case 'key': traits |= 128; break;
case 'text': traits |= 256; break;
case 'summary': traits |= 512; break;
case 'disabled': traits |= 1024; break;
case 'frequentUpdates': traits |= 2048; break;
case 'startsMedia': traits |= 4096; break;
case 'adjustable': traits |= 8192; break;
case 'allowsDirectInteraction': traits |= 16384; break;
case 'pageTurn': traits |= 32768; break;
default: throw new Error(`Unknown trait '${value[i]}', see list in https://facebook.github.io/react-native/docs/accessibility.html#accessibilitytraits-ios`);
}
}

return traits;
}



class GREYMatchers {
Expand Down
51 changes: 51 additions & 0 deletions detox/src/ios/earlgreyapi/GREYMatchers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,33 @@ function sanitize_greyContentEdge(action) {
}
}

function sanitize_uiAccessibilityTraits(value) {
let traits = 0;
for (let i = 0; i < value.length; i++) {
switch (value[i]) {
case 'button': traits |= 1; break;
case 'link': traits |= 2; break;
case 'header': traits |= 4; break;
case 'search': traits |= 8; break;
case 'image': traits |= 16; break;
case 'selected': traits |= 32; break;
case 'plays': traits |= 64; break;
case 'key': traits |= 128; break;
case 'text': traits |= 256; break;
case 'summary': traits |= 512; break;
case 'disabled': traits |= 1024; break;
case 'frequentUpdates': traits |= 2048; break;
case 'startsMedia': traits |= 4096; break;
case 'adjustable': traits |= 8192; break;
case 'allowsDirectInteraction': traits |= 16384; break;
case 'pageTurn': traits |= 32768; break;
default: throw new Error(`Unknown trait '${value[i]}', see list in https://facebook.github.io/react-native/docs/accessibility.html#accessibilitytraits-ios`);
}
}

return traits;
}



class GREYMatchers {
Expand Down Expand Up @@ -116,6 +143,30 @@ class GREYMatchers {
};
}

/*Matcher for UI element with the provided accessibility @c traits.
@param traits The accessibility traits to be matched.
@return A matcher for the accessibility traits of an accessible element.
*/static matcherForAccessibilityTraits(traits) {
if (typeof traits !== 'object' || !traits instanceof Array) {
throw new Error('TraitsMatcher ctor argument must be an array, got ' + typeof traits);
}

return {
target: {
type: "Class",
value: "GREYMatchers"
},
method: "matcherForAccessibilityTraits:",
args: [{
type: "NSInteger",
value: sanitize_uiAccessibilityTraits(traits)
}]
};
}

/*Matcher for UI element with the provided accessiblity @c hint.
@param hint The accessibility hint to be matched.
Expand Down
25 changes: 1 addition & 24 deletions detox/src/ios/matchers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,7 @@ class TypeMatcher extends Matcher {
class TraitsMatcher extends Matcher {
constructor(value) {
super();
if ((typeof value !== 'object') || (!value instanceof Array)) throw new Error(`TraitsMatcher ctor argument must be an array, got ${typeof value}`);
let traits = 0;
for (let i = 0; i < value.length; i++) {
switch (value[i]) {
case 'button': traits |= 1; break;
case 'link': traits |= 2; break;
case 'header': traits |= 4; break;
case 'search': traits |= 8; break;
case 'image': traits |= 16; break;
case 'selected': traits |= 32; break;
case 'plays': traits |= 64; break;
case 'key': traits |= 128; break;
case 'text': traits |= 256; break;
case 'summary': traits |= 512; break;
case 'disabled': traits |= 1024; break;
case 'frequentUpdates': traits |= 2048; break;
case 'startsMedia': traits |= 4096; break;
case 'adjustable': traits |= 8192; break;
case 'allowsDirectInteraction': traits |= 16384; break;
case 'pageTurn': traits |= 32768; break;
default: throw new Error(`Unknown trait '${value[i]}', see list in https://facebook.github.io/react-native/docs/accessibility.html#accessibilitytraits-ios`);
}
}
this._call = invoke.call(invoke.IOS.Class('GREYMatchers'), 'matcherForAccessibilityTraits:', invoke.IOS.NSInteger(traits));
this._call = invoke.callDirectly(GreyMatchers.matcherForAccessibilityTraits(value));
}
}

Expand Down
1 change: 1 addition & 0 deletions detox/test/e2e/b-matchers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ describe('Matchers', () => {
await expect(element(by.id('UniqueId345').and(by.text('ID')))).toExist();
await expect(element(by.id('UniqueId345').and(by.text('RandomJunk')))).toNotExist();
await expect(element(by.id('UniqueId345').and(by.label('RandomJunk')))).toNotExist();
await expect(element(by.id('UniqueId345').and(by.traits(['button'])))).toNotExist();
});

// waiting to upgrade EarlGrey version in order to test this (not supported in our current one)
Expand Down
2 changes: 2 additions & 0 deletions generation/__tests__/__snapshots__/global-functions.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
exports[`globals sanitize_greyContentEdge should fail with unknown value 1`] = `"GREYAction.GREYContentEdge must be a 'left'/'right'/'top'/'bottom', got kittens"`;

exports[`globals sanitize_greyDirection should fail with unknown value 1`] = `"GREYAction.GREYDirection must be a 'left'/'right'/'up'/'down', got kittens"`;

exports[`globals sanitize_uiAccessibilityTraits should throw if unknown trait is accessed 1`] = `"Unknown trait 'unknown', see list in https://facebook.github.io/react-native/docs/accessibility.html#accessibilitytraits-ios"`;
11 changes: 11 additions & 0 deletions generation/__tests__/global-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,15 @@ describe("globals", () => {
}).toThrowErrorMatchingSnapshot();
});
});

describe("sanitize_uiAccessibilityTraits", () => {
it("should return numbers for traits", () => {
expect(globals.sanitize_uiAccessibilityTraits(["button", "link"])).toBe(3);
expect(globals.sanitize_uiAccessibilityTraits(["summary", "allowsDirectInteraction"])).toBe(16896);
});

it("should throw if unknown trait is accessed", () => {
expect(() => globals.sanitize_uiAccessibilityTraits(["unknown"])).toThrowErrorMatchingSnapshot();
});
});
});
28 changes: 28 additions & 0 deletions generation/earl-grey/global-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,36 @@ function sanitize_greyContentEdge(action) {
}
}

function sanitize_uiAccessibilityTraits(value) {
let traits = 0;
for (let i = 0; i < value.length; i++) {
switch (value[i]) {
case 'button': traits |= 1; break;
case 'link': traits |= 2; break;
case 'header': traits |= 4; break;
case 'search': traits |= 8; break;
case 'image': traits |= 16; break;
case 'selected': traits |= 32; break;
case 'plays': traits |= 64; break;
case 'key': traits |= 128; break;
case 'text': traits |= 256; break;
case 'summary': traits |= 512; break;
case 'disabled': traits |= 1024; break;
case 'frequentUpdates': traits |= 2048; break;
case 'startsMedia': traits |= 4096; break;
case 'adjustable': traits |= 8192; break;
case 'allowsDirectInteraction': traits |= 16384; break;
case 'pageTurn': traits |= 32768; break;
default: throw new Error(`Unknown trait '${value[i]}', see list in https://facebook.github.io/react-native/docs/accessibility.html#accessibilitytraits-ios`);
}
}

return traits;
}


module.exports = {
sanitize_greyDirection,
sanitize_greyContentEdge,
sanitize_uiAccessibilityTraits,
};
21 changes: 19 additions & 2 deletions generation/earl-grey/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,18 @@ const isGreyMatcher = ({ name }) => template(`
}
`)({
ARG: t.identifier(name)
})
});
const isArray = ({ name }) => template(`
if (
(typeof ARG !== 'object') ||
(!ARG instanceof Array)
) {
throw new Error('TraitsMatcher ctor argument must be an array, got ' + typeof ARG);
}
`)({
ARG: t.identifier(name)
});


// Constants
const SUPPORTED_TYPES = [
Expand All @@ -44,7 +55,8 @@ const SUPPORTED_TYPES = [
"NSString *",
"NSString",
"NSUInteger",
"id<GREYMatcher>"
"id<GREYMatcher>",
"UIAccessibilityTraits"
];

/**
Expand Down Expand Up @@ -170,6 +182,10 @@ const supportedContentSanitizersMap = {
GREYContentEdge: {
type: "NSInteger",
value: callGlobal("sanitize_greyContentEdge")
},
UIAccessibilityTraits: {
type: "NSInteger",
value: callGlobal("sanitize_uiAccessibilityTraits")
}
};
function addArgumentContentSanitizerCall(json) {
Expand Down Expand Up @@ -236,6 +252,7 @@ function createTypeCheck(json) {
GREYContentEdge: isOneOf(["left", "right", "top", "bottom"]),
GREYPinchDirection: isOneOf(["outward", "inward"]),
"id<GREYMatcher>": isGreyMatcher,
UIAccessibilityTraits: isArray,
};

const typeCheckCreator = typeInterfaces[json.type];
Expand Down

0 comments on commit da2619a

Please sign in to comment.