Skip to content

fix: Correct class imports when custom element filter uses containsElement #233

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.

Sign up for GitHub

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

Merged
jimevanssfdc merged 1 commit into from
Mar 19, 2025
Merged

fix: Correct class imports when custom element filter uses containsElement #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions utam-compiler/src/main/java/utam/compiler/representation/CustomElementMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ public Filtered(
parametersTracker.setMethodParameters(locatorParameters);
parametersTracker.setMethodParameters(applyParameters);
parametersTracker.setMethodParameters(matcherParameters);
parametersTracker
.getMethodParameters()
.forEach(param -> ParameterUtils.setImport(classImports, param.getType()));
String locationCode = getElementLocationCode(componentName, locatorParameters);
String predicate =
getPredicateCode(applyMethod, applyParameters, matcherType, matcherParameters);
Expand Down
22 changes: 22 additions & 0 deletions utam-compiler/src/test/java/utam/compiler/representation/ElementMethodTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,26 @@ public void testFilterWithContainsElementSelectorArgument() {
expected.addImpliedImportedTypes("utam.core.selenium.element.LocatorBy");
PageObjectValidationTestHelper.validateMethod(method, expected);
}

@Test
public void testFilterCustomElementWithContainsElementSelectorArgument() {
TranslationContext context =
new DeserializerUtilities().getContext("filter/customWithFilterContainsElement");
PageObjectMethod method = context.getMethod(ELEMENT_METHOD_NAME);
assertThat(method.getDeclaration().getCodeLine(), is(equalTo("Custom getTest(String value)")));
MethodInfo expected = new MethodInfo(ELEMENT_METHOD_NAME, "Custom");
expected.addParameter(new MethodParameterInfo("value", "String"));
expected.addParameter(
new MethodParameterInfo(
"LocatorBy.byCss(String.format(\"input[value='%s']\", value))", "LocatorBy"));
expected.addCodeLine("BasicElement root = this.getRootElement()");
expected.addCodeLine(
"return custom(root, this.test).build(Custom.class, elm ->"
+ " Boolean.TRUE.equals(elm.containsElement(LocatorBy.byCss(String.format(\"input[value='%s']\","
+ " value)))))");
expected.addImpliedImportedTypes("utam.custom.pageobjects.Custom");
expected.addImpliedImportedTypes("utam.core.element.BasicElement");
expected.addImpliedImportedTypes("utam.core.selenium.element.LocatorBy");
PageObjectValidationTestHelper.validateMethod(method, expected);
}
}
34 changes: 34 additions & 0 deletions utam-compiler/src/test/resources/filter/customWithFilterContainsElement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"elements": [
{
"name": "test",
"public": true,
"type": "utam-custom/pageObjects/custom",
"selector": {
"css": "my-custom-element[with-attribute='attr-value']",
"returnAll": true
},
"filter": {
"apply": "containsElement",
"args": [
{
"type": "locator",
"value": {
"css": "input[value='%s']",
"args": [
{
"name": "value",
"type": "string"
}
]
}
}
],
"findFirst": true,
"matcher": {
"type": "isTrue"
}
}
}
]
}
Loading